*** empty log message ***

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

diff --git a/test/keysynth-demo.c b/test/keysynth-demo.c
index c6cb1ee..9e7bb6a 100644 (file)
--- a/test/keysynth-demo.c
+++ b/test/keysynth-demo.c
@@ -2,7 +2,8 @@
  * AT-SPI - Assistive Technology Service Provider Interface
  * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
  *
- * Copyright 2001 Sun Microsystems Inc.
+ * Copyright 2001, 2002 Sun Microsystems Inc.,
+ * Copyright 2001, 2002 Ximian, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -25,7 +26,7 @@
 #include <stdlib.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
-#include "spi.h"
+#include <cspi/spi.h>
 
 #define LABELMAXLEN 20
 #define MIN_KEYCODE 9
@@ -170,7 +171,6 @@ increment_scan (gpointer data)
       case SCAN_LINES_DONE:
       case SCAN_KEYS_DONE:
          return FALSE;
-      default:
     }
   return TRUE;
 }
@@ -243,7 +243,7 @@ label_buttons(SPIBoolean shifted)
           /* Note: these routines are not i18n-savvy,  we need to use XIM, other methods here */
          if (keysym && g_ascii_isprint((int)keysym))
            {
-             snprintf (label, 2, "%c", (int) keysym); 
+             g_snprintf (label, 2, "%c", (int) keysym); 
            }
          else
            {
@@ -319,7 +319,7 @@ button_exit (GtkButton *notused, void *alsonotused)
 }
 
 static SPIBoolean
-is_command_key (AccessibleKeystroke *key, void *user_data)
+is_command_key (const AccessibleKeystroke *key, void *user_data)
 {
   switch (key->keyID)
     {
@@ -332,20 +332,20 @@ is_command_key (AccessibleKeystroke *key, void *user_data)
 }
 
 static SPIBoolean
-switch_callback (AccessibleKeystroke *key, void *user_data)
+switch_callback (const AccessibleKeystroke *key, void *user_data)
 {
   static SPIBoolean is_down = FALSE;
 
   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);
        }
     }
@@ -478,7 +480,7 @@ main (int argc, char **argv)
   /* will listen only to Alt-key combinations */
   SPI_registerAccessibleKeystrokeListener (key_listener,
                                           (AccessibleKeySet *) SPI_KEYSET_ALL_KEYS,
-                                          SPI_KEYMASK_ALT,
+                                          SPI_KEYMASK_ALT | SPI_KEYMASK_CONTROL,
                                           (unsigned long) ( KeyPress | KeyRelease),
                                           SPI_KEYLISTENER_CANCONSUME | SPI_KEYLISTENER_ALL_WINDOWS);
   create_vkbd ();  
@@ -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) ( KeyPress | KeyRelease),
-                                          SPI_KEYLISTENER_CANCONSUME);
+                                          (unsigned long) ( SPI_KEY_PRESSED | SPI_KEY_RELEASED ),
+                                          SPI_KEYLISTENER_NOSYNC);
   
   SPI_event_main ();