#include "../util/mag_client.h"
#include "../cspi/spi-private.h" /* A hack for now */
-static void report_focus_event (AccessibleEvent *event, void *user_data);
-static void report_generic_event (AccessibleEvent *event, void *user_data);
-static void report_button_press (AccessibleEvent *event, void *user_data);
-static void check_property_change (AccessibleEvent *event, void *user_data);
-static SPIBoolean report_command_key_event (AccessibleKeystroke *stroke, void *user_data);
-static SPIBoolean report_ordinary_key_event (AccessibleKeystroke *stroke, void *user_data);
+static void report_focus_event (const AccessibleEvent *event, void *user_data);
+static void report_generic_event (const AccessibleEvent *event, void *user_data);
+static void report_button_press (const AccessibleEvent *event, void *user_data);
+static void check_property_change (const AccessibleEvent *event, void *user_data);
+static SPIBoolean report_command_key_event (const AccessibleKeystroke *stroke, void *user_data);
+static SPIBoolean report_ordinary_key_event (const AccessibleKeystroke *stroke, void *user_data);
static void get_environment_vars (void);
static int _festival_init ();
modules = g_getenv ("GTK_MODULES");
if (!modules || modules [0] == '\0')
{
- putenv ("GTK_MODULES=gail:at-bridge");
+ putenv ("GTK_MODULES=gail:atk-bridge");
}
modules = NULL;
SPI_init ();
- focus_listener = createAccessibleEventListener (report_focus_event, NULL);
- property_listener = createAccessibleEventListener (check_property_change, NULL);
- generic_listener = createAccessibleEventListener (report_generic_event, NULL);
- button_listener = createAccessibleEventListener (report_button_press, NULL);
- registerGlobalEventListener (focus_listener, "focus:");
- registerGlobalEventListener (property_listener, "object:property-change:accessible-selection");
- registerGlobalEventListener (generic_listener, "object:selection-changed");
- registerGlobalEventListener (generic_listener, "object:children-changed");
- registerGlobalEventListener (generic_listener, "object:visible-data-changed");
- registerGlobalEventListener (generic_listener, "object:text-selection-changed");
- registerGlobalEventListener (generic_listener, "object:text-caret-moved");
- registerGlobalEventListener (generic_listener, "object:text-changed");
- registerGlobalEventListener (button_listener, "Gtk:GtkWidget:button-press-event");
- n_desktops = getDesktopCount ();
+ focus_listener = SPI_createAccessibleEventListener (report_focus_event, NULL);
+ property_listener = SPI_createAccessibleEventListener (check_property_change, NULL);
+ generic_listener = SPI_createAccessibleEventListener (report_generic_event, NULL);
+ button_listener = SPI_createAccessibleEventListener (report_button_press, NULL);
+ SPI_registerGlobalEventListener (focus_listener, "focus:");
+ SPI_registerGlobalEventListener (property_listener, "object:property-change:accessible-selection");
+ SPI_registerGlobalEventListener (generic_listener, "object:selection-changed");
+ SPI_registerGlobalEventListener (generic_listener, "object:children-changed");
+ SPI_registerGlobalEventListener (generic_listener, "object:visible-data-changed");
+ SPI_registerGlobalEventListener (generic_listener, "object:text-selection-changed");
+ SPI_registerGlobalEventListener (generic_listener, "object:text-caret-moved");
+ SPI_registerGlobalEventListener (generic_listener, "object:text-changed");
+ SPI_registerGlobalEventListener (button_listener, "Gtk:GtkWidget:button-press-event");
+ n_desktops = SPI_getDesktopCount ();
for (i=0; i<n_desktops; ++i)
{
- desktop = getDesktop (i);
+ desktop = SPI_getDesktop (i);
s = Accessible_getName (desktop);
fprintf (stderr, "desktop %d name: %s\n", i, s);
SPI_freeString (s);
}
/* prepare the keyboard snoopers */
- command_key_listener = createAccessibleKeystrokeListener (report_command_key_event, NULL);
- ordinary_key_listener = createAccessibleKeystrokeListener (report_ordinary_key_event, NULL);
+ command_key_listener = SPI_createAccessibleKeystrokeListener (report_command_key_event, NULL);
+ ordinary_key_listener = SPI_createAccessibleKeystrokeListener (report_ordinary_key_event, NULL);
- /* will listen only to Alt-key combinations, and only to KeyPress events */
- registerAccessibleKeystrokeListener(command_key_listener,
- (AccessibleKeySet *) SPI_KEYSET_ALL_KEYS,
- SPI_KEYMASK_ALT,
- (unsigned long) ( KeyPress ),
- SPI_KEYLISTENER_ALL_WINDOWS);
+ /* will listen only to Control-Alt-key combinations, and only to KeyPress events */
+ SPI_registerAccessibleKeystrokeListener(command_key_listener,
+ (AccessibleKeySet *) SPI_KEYSET_ALL_KEYS,
+ SPI_KEYMASK_ALT | SPI_KEYMASK_CONTROL,
+ (unsigned long) ( SPI_KEY_PRESSED ),
+ SPI_KEYLISTENER_ALL_WINDOWS);
+
+ /* will listen only to CAPSLOCK-Alt-key combinations, and only to KeyPress events */
+ SPI_registerAccessibleKeystrokeListener(command_key_listener,
+ (AccessibleKeySet *) SPI_KEYSET_ALL_KEYS,
+ SPI_KEYMASK_ALT | SPI_KEYMASK_SHIFTLOCK,
+ (unsigned long) ( SPI_KEY_PRESSED ),
+ SPI_KEYLISTENER_ALL_WINDOWS);
- /* will listen only to unshifted key events, both press and release */
- registerAccessibleKeystrokeListener(ordinary_key_listener,
- (AccessibleKeySet *) SPI_KEYSET_ALL_KEYS,
- SPI_KEYMASK_UNMODIFIED,
- (unsigned long) ( KeyPress | KeyRelease),
- SPI_KEYLISTENER_NOSYNC);
-
- /* will listen only to shifted key events, both press and release */
- registerAccessibleKeystrokeListener(ordinary_key_listener,
- (AccessibleKeySet *) SPI_KEYSET_ALL_KEYS,
- SPI_KEYMASK_SHIFT,
- (unsigned long) ( KeyPress | KeyRelease),
- SPI_KEYLISTENER_NOSYNC);
+ /* will listen only to CAPSLOCK key events, both press and release */
+ SPI_registerAccessibleKeystrokeListener(ordinary_key_listener,
+ (AccessibleKeySet *) SPI_KEYSET_ALL_KEYS,
+ SPI_KEYMASK_SHIFTLOCK,
+ (unsigned long) ( SPI_KEY_PRESSED | SPI_KEY_RELEASED ),
+ SPI_KEYLISTENER_NOSYNC);
get_environment_vars ();
SPI_event_main ();
- setenv ("AT_BRIDGE_SHUTDOWN", "1", TRUE);
+ putenv ("AT_BRIDGE_SHUTDOWN=1");
return SPI_exit ();
}
{
if (festival_chatty)
{
- _festival_say (Accessible_getRole (obj), "voice_don_diphone", shutup_previous_speech);
+ s = Accessible_getRoleName (obj);
+ _festival_say (s, "voice_don_diphone", shutup_previous_speech);
+ SPI_freeString (s);
}
fprintf (stderr, "getting Name\n");
s = Accessible_getName (obj);
}
void
-report_focus_event (AccessibleEvent *event, void *user_data)
+report_focus_event (const AccessibleEvent *event, void *user_data)
{
char *s;
}
void
-report_generic_event (AccessibleEvent *event, void *user_data)
+report_generic_event (const AccessibleEvent *event, void *user_data)
{
fprintf (stderr, "%s event received\n", event->type);
}
void
-report_button_press (AccessibleEvent *event, void *user_data)
+report_button_press (const AccessibleEvent *event, void *user_data)
{
char *s;
}
void
-check_property_change (AccessibleEvent *event, void *user_data)
+check_property_change (const AccessibleEvent *event, void *user_data)
{
AccessibleSelection *selection = Accessible_getSelection (event->source);
int n_selections;
static void
simple_at_exit ()
{
- deregisterGlobalEventListenerAll (focus_listener);
- AccessibleEventListener_unref (focus_listener);
+ SPI_deregisterGlobalEventListenerAll (focus_listener);
+ AccessibleEventListener_unref (focus_listener);
- deregisterGlobalEventListenerAll (property_listener);
- AccessibleEventListener_unref (property_listener);
+ SPI_deregisterGlobalEventListenerAll (property_listener);
+ AccessibleEventListener_unref (property_listener);
- deregisterGlobalEventListenerAll (generic_listener);
- AccessibleEventListener_unref (generic_listener);
+ SPI_deregisterGlobalEventListenerAll (generic_listener);
+ AccessibleEventListener_unref (generic_listener);
- deregisterGlobalEventListenerAll (button_listener);
- AccessibleEventListener_unref (button_listener);
+ SPI_deregisterGlobalEventListenerAll (button_listener);
+ AccessibleEventListener_unref (button_listener);
- deregisterAccessibleKeystrokeListener (command_key_listener, SPI_KEYMASK_ALT);
- AccessibleKeystrokeListener_unref (command_key_listener);
+ SPI_deregisterAccessibleKeystrokeListener (command_key_listener, SPI_KEYMASK_ALT | SPI_KEYMASK_CONTROL);
+ SPI_deregisterAccessibleKeystrokeListener (command_key_listener, SPI_KEYMASK_ALT | SPI_KEYMASK_SHIFTLOCK);
+ AccessibleKeystrokeListener_unref (command_key_listener);
+
+ SPI_deregisterAccessibleKeystrokeListener (ordinary_key_listener, SPI_KEYMASK_UNMODIFIED);
+ SPI_deregisterAccessibleKeystrokeListener (ordinary_key_listener, SPI_KEYMASK_SHIFTLOCK);
+ AccessibleKeystrokeListener_unref (ordinary_key_listener);
- deregisterAccessibleKeystrokeListener (ordinary_key_listener, SPI_KEYMASK_UNMODIFIED);
- deregisterAccessibleKeystrokeListener (ordinary_key_listener, SPI_KEYMASK_SHIFT);
- AccessibleKeystrokeListener_unref (ordinary_key_listener);
-
SPI_event_quit ();
}
static SPIBoolean
-is_command_key (AccessibleKeystroke *key)
+is_command_key (const AccessibleKeystroke *key)
{
switch (key->keyID)
{
case 'M':
case 'm':
use_magnifier = ! use_magnifier;
+ fprintf (stderr, "%ssing magnifier\n", use_magnifier ? "U" : "Not u");
return TRUE;
case 'F':
case 'f':
use_festival = ! use_festival;
+ fprintf (stderr, "%speech output\n", use_festival ? "S" : "No s");
return TRUE;
default:
return FALSE;
}
static SPIBoolean
-report_command_key_event (AccessibleKeystroke *key, void *user_data)
+report_command_key_event (const AccessibleKeystroke *key, void *user_data)
{
- fprintf (stderr, "Command KeyEvent %s%c (keycode %d)\n",
+ fprintf (stderr, "Command KeyEvent %s%c (keycode %d); string=%s; time=%lx\n",
(key->modifiers & SPI_KEYMASK_ALT)?"Alt-":"",
((key->modifiers & SPI_KEYMASK_SHIFT)^(key->modifiers & SPI_KEYMASK_SHIFTLOCK))?
(char) toupper((int) key->keyID) : (char) tolower((int) key->keyID),
- (int) key->keycode);
+ (int) key->keycode,
+ key->keystring,
+ (long int) key->timestamp);
return is_command_key (key);
}
static SPIBoolean
-report_ordinary_key_event (AccessibleKeystroke *key, void *user_data)
+report_ordinary_key_event (const AccessibleKeystroke *key, void *user_data)
{
- fprintf (stderr, "Received key event:\tsym %ld\n\tmods %x\n\tcode %d\n\ttime %ld\n",
+ fprintf (stderr, "Received key event:\tsym %ld\n\tmods %x\n\tcode %d\n\tstring=\'%s\'\n\ttime %lx\n",
(long) key->keyID,
(unsigned int) key->modifiers,
(int) key->keycode,
+ key->keystring,
(long int) key->timestamp);
return FALSE;
}
projects / platform / core / uifw / at-spi2-atk.git / blobdiff