2003-04-24 Padraig O'Briain <padraig.obriain@sun.com>

	* atk-bridge/bridge.c (spi_init_keystroke_from_atk_key_event):
	Set is_text field of Accessibility_DeviceEvent data structure.

	* cspi/bonobo/cspi-bonobo-listener.c (cspi_device_event): Set
	is-text field of AccessibleDeviceEvent data structure.

	This addresses part of bug #108666.

	* registryd/devcideeventcontroller.c: Unset debug option.

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

diff --git a/ChangeLog b/ChangeLog
index 62ff5cc3d67bebe0a2ff550e50ffa142691e5171..d577be4819d722050ede1dff9e06adb6740cca26 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-04-24  Padraig O'Briain <padraig.obriain@sun.com>
+
+       * atk-bridge/bridge.c (spi_init_keystroke_from_atk_key_event):
+       Set is_text field of Accessibility_DeviceEvent data structure.
+
+       * cspi/bonobo/cspi-bonobo-listener.c (cspi_device_event): Set
+       is-text field of AccessibleDeviceEvent data structure.
+
+       This addresses part of bug #108666.
+
+       * registryd/devcideeventcontroller.c: Unset debug option.
+
 2003-04-14  Padraig O'Briain <padraig.obriain@sun.com>
 
        * cspi/accessible.c:

diff --git a/atk-bridge/bridge.c b/atk-bridge/bridge.c
index 76e4e0bed059bcd79f7fa5431d90a8a441df92ea..e5266a09c7012c519e2b069fe3636b6e278b1c38 100644 (file)
--- a/atk-bridge/bridge.c
+++ b/atk-bridge/bridge.c
@@ -741,8 +741,14 @@ spi_init_keystroke_from_atk_key_event (Accessibility_DeviceEvent  *keystroke,
   keystroke->modifiers = (CORBA_unsigned_short) (event->state & 0xFFFF);
   if (event->string)
     {
+      gunichar c;
+
       keystroke->event_string = CORBA_string_dup (event->string);
-      keystroke->is_text = CORBA_TRUE;
+      c = g_utf8_get_char_validated (event->string, -1);
+      if (c > 0 && g_unichar_isprint (c))
+        keystroke->is_text = CORBA_TRUE;
+      else
+        keystroke->is_text = CORBA_FALSE;
     }
   else
     {

diff --git a/cspi/bonobo/cspi-bonobo-listener.c b/cspi/bonobo/cspi-bonobo-listener.c
index 8011cfb57d76604bd560aa0e5ca7213e8867fdca..6b7316f4452e1787c4dd7ee80669b593672fb11a 100644 (file)
--- a/cspi/bonobo/cspi-bonobo-listener.c
+++ b/cspi/bonobo/cspi-bonobo-listener.c
@@ -217,6 +217,7 @@ cspi_device_event (SpiDeviceListener               *listener,
   anevent.timestamp = event->timestamp;
   anevent.keystring = g_strdup (event->event_string);
   anevent.modifiers = event->modifiers;
+  anevent.is_text = event->is_text;
 
   /* FIXME: re-enterancy hazard on this list */
   for (l = clistener->callbacks; l; l = l->next)

diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
index 7e84ebc6fd01ba3f8f3c591d46b89a1fd76cefe6..609deeac759a3a41476bc5a481a911d03d77c655 100644 (file)
--- a/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@ -27,7 +27,7 @@
 
 #undef  SPI_XKB_DEBUG
 #undef  SPI_DEBUG
-#define  SPI_KEYEVENT_DEBUG
+#undef  SPI_KEYEVENT_DEBUG
 
 #include <string.h>
 #include <ctype.h>