API revisions: tweaks to key event API, added some reserved slots for

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

diff --git a/test/keysynth-demo.c b/test/keysynth-demo.c
index ebf00c1..20d2a88 100644 (file)
--- a/test/keysynth-demo.c
+++ b/test/keysynth-demo.c
@@ -338,14 +338,14 @@ switch_callback (AccessibleKeystroke *key, void *user_data)
 
   if (key->type == SPI_KEY_RELEASED)
     {
-      g_print ("spacebar up\n");
+      g_print ("switch up\n");
       is_down = FALSE;
       scan_stop (key->timestamp);
     }
   else 
   if (!is_down)
     {
-      g_print ("spacebar down\n");
+      g_print ("switch down\n");
       is_down = TRUE;
       scan_start (key->timestamp);
     }
@@ -359,6 +359,7 @@ synth_keycode (GtkButton *button, KeyCode *keycode)
   static KeyCode shift_keycode = 0;
   if (!shift_keycode) shift_keycode = XKeysymToKeycode(GDK_DISPLAY(), (KeySym) 0xFFE1);
   /* Note: in a real onscreen keyboard shift keycode should not be hard-coded! */
+  
   if (*keycode)
     {
       if (*keycode == CAPSLOCK_KEYCODE)
@@ -367,13 +368,14 @@ synth_keycode (GtkButton *button, KeyCode *keycode)
           label_buttons (caps_lock || shift_latched);
         }
       if (shift_latched)
-             SPI_generateKeyEvent (shift_keycode, SPI_KEY_PRESS);
-      
-      SPI_generateKeyEvent ((long) *keycode, SPI_KEY_PRESSRELEASE);
+             SPI_generateKeyboardEvent (shift_keycode, NULL, SPI_KEY_PRESS);
+
+      g_print ("generating key %d\n", (int) *keycode);
+      SPI_generateKeyboardEvent ((long) *keycode, NULL, SPI_KEY_PRESSRELEASE);
 
       if (shift_latched)
         {
-         SPI_generateKeyEvent (shift_keycode, SPI_KEY_RELEASE);
+         SPI_generateKeyboardEvent (shift_keycode, NULL, SPI_KEY_RELEASE);
          toggle_shift_latch (button);
        }
     }
@@ -491,15 +493,17 @@ main (int argc, char **argv)
    */
   switch_set.keysyms = g_new0 (unsigned long, 1);
   switch_set.keycodes = g_new0 (unsigned short, 1);
+  switch_set.keystrings = g_new0 (char *, 1);
   switch_set.len = 1;
   switch_set.keysyms[0] = (unsigned long) 0;
   switch_set.keycodes[0] = (unsigned short) 0;
+  switch_set.keystrings[0] = "";
   switch_listener = SPI_createAccessibleKeystrokeListener (switch_callback, NULL);
   SPI_registerAccessibleKeystrokeListener (switch_listener,
                                           &switch_set,
                                           SPI_KEYMASK_UNMODIFIED,
                                           (unsigned long) ( SPI_KEY_PRESSED | SPI_KEY_RELEASED ),
-                                          SPI_KEYLISTENER_CANCONSUME);
+                                          SPI_KEYLISTENER_NOSYNC);
   
   SPI_event_main ();