Bugfix for keycode key listeners.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@293 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index a567314..562acd8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-05-10  Bill Haneman <bill.haneman@sun.com>
+
+       * registryd/deviceeventcontroller.c:
+       Fixed bug in grab key conversion which was causing keycode grabs
+       to be converted to AnyKey grabs.
+
+       * NEWS:
+       updated NEWS file to reflect recent spin-off of gnome-mag.
+
 2002-05-09  Bill Haneman <bill.haneman@sun.com>
 
        * cspi/spi_registry.c:

diff --git a/NEWS b/NEWS
index fc23ee7..c129fe2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+(top)
+What's new in at-spi-0.13.1:
+
+(note: 0.13.1 is not binary compatible with 0.12.1, clients will need
+ to recompile )
+
+* fix for bugzilla bug 80616
+* IDL change which will affect direct CORBA users of the keystroke
+  listener API
+* added a new test harness, event-listener-test, which also
+  has a simple tree traversal timing benchmark. event-listener-test
+  attaches listeners to all currently supported events (and a few
+  events which are not fully implemented yet); it thus serves
+  as useful event listener sample code as well as being a diagnostic
+  tool. 
+
 What's new in at-spi-0.12.1:
 
 * fixes for bugzilla bugs 78249,68929,76615,71686,72300,78247,72300,78249

diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
index e1c2a25..bad5705 100644 (file)
--- a/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@ -25,7 +25,7 @@
 #include <config.h>
 
 #undef  SPI_DEBUG
-#define  SPI_KEYEVENT_DEBUG
+#undef  SPI_KEYEVENT_DEBUG
 
 #include <string.h>
 #include <ctype.h>
@@ -250,7 +250,7 @@ handle_keygrab (SpiDEController         *controller,
          Accessibility_KeyDefinition keydef = key_listener->keys->_buffer[i];  
          long int key_val = keydef.keysym;
          /* X Grabs require keycodes, not keysyms */
-         if (keydef.keystring)
+         if (keydef.keystring && keydef.keystring[0])
            {
              key_val = XStringToKeysym(keydef.keystring);                  
            }
@@ -263,7 +263,6 @@ handle_keygrab (SpiDEController         *controller,
              key_val = keydef.keycode;
            }
          grab_mask.key_val = key_val;
-
          process_cb (controller, &grab_mask);
        }
     }
@@ -380,9 +379,10 @@ spi_key_set_contains_key (Accessibility_KeySet            *key_set,
   for (i = 0; i < len; ++i)
     {
 #ifdef SPI_KEYEVENT_DEBUG          
-      g_print ("key_set[%d] = %d; key_event %d, code %d\n",
+      g_print ("key_set[%d] = %d; key_event %d, code %d, string %s\n",
                i, (int) key_set->_buffer[i].keycode,
-              (int) key_event->id, (int) key_event->hw_code); 
+              (int) key_event->id, (int) key_event->hw_code,
+              key_event->event_string); 
 #endif
       if (key_set->_buffer[i].keysym == (CORBA_long) key_event->id)
         {
@@ -392,8 +392,8 @@ spi_key_set_contains_key (Accessibility_KeySet            *key_set,
         {
           return TRUE;
        }
-      if (key_event->event_string && key_event->event_string[0] && !strcmp
-         (key_set->_buffer[i].keystring, key_event->event_string))
+      if (key_event->event_string && key_event->event_string[0] &&
+         !strcmp (key_set->_buffer[i].keystring, key_event->event_string))
         {
           return TRUE;
        }