From 5e9de4f03f0c4406e3479d50a012901e87642210 Mon Sep 17 00:00:00 2001 From: padraigo Date: Thu, 24 Apr 2003 07:55:14 +0000 Subject: [PATCH] 2003-04-24 Padraig O'Briain * 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 --- ChangeLog | 12 ++++++++++++ atk-bridge/bridge.c | 8 +++++++- cspi/bonobo/cspi-bonobo-listener.c | 1 + registryd/deviceeventcontroller.c | 2 +- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 62ff5cc..d577be4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2003-04-24 Padraig O'Briain + + * 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 * cspi/accessible.c: diff --git a/atk-bridge/bridge.c b/atk-bridge/bridge.c index 76e4e0b..e5266a0 100644 --- 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 8011cfb..6b7316f 100644 --- 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 7e84ebc..609deea 100644 --- 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 #include -- 2.7.4