Added support for key event strings, and renamespaced some of the at-bridge.

[platform/core/uifw/at-spi2-atk.git] / test / simple-at.c

diff --git a/test/simple-at.c b/test/simple-at.c
index 54ca155..35ffec3 100644 (file)
--- a/test/simple-at.c
+++ b/test/simple-at.c
@@ -50,6 +50,7 @@ static AccessibleEventListener *generic_listener;
 static AccessibleEventListener *button_listener;
 static AccessibleKeystrokeListener *command_key_listener;
 static AccessibleKeystrokeListener *ordinary_key_listener;
+static AccessibleKeySet *spacebar_key_set;
 
 int
 main (int argc, char **argv)
@@ -78,24 +79,24 @@ main (int argc, char **argv)
 
   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);
@@ -112,30 +113,40 @@ main (int argc, char **argv)
     }
 
   /* 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);
+  SPI_registerAccessibleKeystrokeListener(command_key_listener,
+                                         (AccessibleKeySet *) SPI_KEYSET_ALL_KEYS,
+                                         SPI_KEYMASK_ALT,
+                                         (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);
+  SPI_registerAccessibleKeystrokeListener(ordinary_key_listener,
+                                         (AccessibleKeySet *) SPI_KEYSET_ALL_KEYS,
+                                         SPI_KEYMASK_UNMODIFIED,
+                                         (unsigned long) ( SPI_KEY_PRESSED | SPI_KEY_RELEASED ),
+                                         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);
+  SPI_registerAccessibleKeystrokeListener(ordinary_key_listener,
+                                         (AccessibleKeySet *) SPI_KEYSET_ALL_KEYS,
+                                         SPI_KEYMASK_SHIFT,
+                                         (unsigned long) ( SPI_KEY_PRESSED | SPI_KEY_RELEASED ),
+                                         SPI_KEYLISTENER_NOSYNC);
 
+  spacebar_key_set = SPI_createAccessibleKeySet (1, " ", NULL, NULL);
+  
+  /* will listen only to shift-spacebar events, on release, globally */
+  SPI_registerAccessibleKeystrokeListener(command_key_listener,
+                                         spacebar_key_set,
+                                         SPI_KEYMASK_SHIFT,
+                                         (unsigned long) ( SPI_KEY_RELEASED ),
+                                         SPI_KEYLISTENER_ALL_WINDOWS);
+
+  
   get_environment_vars ();
 
   SPI_event_main ();
@@ -306,24 +317,26 @@ check_property_change (AccessibleEvent *event, void *user_data)
 static void
 simple_at_exit ()
 {
-  deregisterGlobalEventListenerAll (focus_listener);
-  AccessibleEventListener_unref    (focus_listener);
+  SPI_deregisterGlobalEventListenerAll (focus_listener);
+  AccessibleEventListener_unref        (focus_listener);
+
+  SPI_deregisterGlobalEventListenerAll (property_listener);
+  AccessibleEventListener_unref        (property_listener);
 
-  deregisterGlobalEventListenerAll (property_listener);
-  AccessibleEventListener_unref    (property_listener);
+  SPI_deregisterGlobalEventListenerAll (generic_listener);
+  AccessibleEventListener_unref        (generic_listener);
 
-  deregisterGlobalEventListenerAll (generic_listener);
-  AccessibleEventListener_unref    (generic_listener);
+  SPI_deregisterGlobalEventListenerAll (button_listener);
+  AccessibleEventListener_unref        (button_listener);
 
-  deregisterGlobalEventListenerAll (button_listener);
-  AccessibleEventListener_unref    (button_listener);
+  SPI_deregisterAccessibleKeystrokeListener (command_key_listener, SPI_KEYMASK_ALT);
+  AccessibleKeystrokeListener_unref         (command_key_listener);
 
-  deregisterAccessibleKeystrokeListener (command_key_listener, SPI_KEYMASK_ALT);
-  AccessibleKeystrokeListener_unref (command_key_listener);
+  SPI_deregisterAccessibleKeystrokeListener (ordinary_key_listener, SPI_KEYMASK_UNMODIFIED);
+  SPI_deregisterAccessibleKeystrokeListener (ordinary_key_listener, SPI_KEYMASK_SHIFT);
+  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_freeAccessibleKeySet (spacebar_key_set);
   
   SPI_event_quit ();
 }
@@ -353,11 +366,13 @@ is_command_key (AccessibleKeystroke *key)
 static SPIBoolean
 report_command_key_event (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);
 }
 
@@ -365,10 +380,11 @@ report_command_key_event (AccessibleKeystroke *key, void *user_data)
 static SPIBoolean
 report_ordinary_key_event (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;
 }