X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=registryd%2Fdeviceeventcontroller.c;h=9171c5b0e6d1e4146d2f411c838739b9ed94018a;hb=345cb4da5a1c04d511fab3c6c287a9f0bcd3dad8;hp=16daff65131060c986e72aeee2f3db59b2281463;hpb=7297746ac2519774c006fb0630ad62ebe032a086;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c index 16daff6..9171c5b 100644 --- a/registryd/deviceeventcontroller.c +++ b/registryd/deviceeventcontroller.c @@ -1,8 +1,9 @@ -/* - * AT-SPI - Assistive Technology Service Provider Interface +/* 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 @@ -20,23 +21,31 @@ * Boston, MA 02111-1307, USA. */ -/* deviceeventcontroler.c: implement the DeviceEventController interface */ +/* deviceeventcontroller.c: implement the DeviceEventController interface */ #include -#undef SPI_DEBUG +#undef SPI_XKB_DEBUG +#undef SPI_DEBUG +#undef SPI_KEYEVENT_DEBUG -#ifdef SPI_DEBUG -# include -#endif +#include +#include +#include +#include +#include #include #include +#include #define XK_MISCELLANY #include +#include #include /* TODO: hide dependency (wrap in single porting file) */ +#include #include +#include "../libspi/spi-private.h" #include "deviceeventcontroller.h" /* Our parent Gtk object type */ @@ -44,10 +53,18 @@ /* A pointer to our parent object class */ static GObjectClass *spi_device_event_controller_parent_class; +static int spi_error_code = 0; +static GdkPoint last_mouse_pos_static = {0, 0}; +static GdkPoint *last_mouse_pos = &last_mouse_pos_static; +static unsigned int mouse_mask_state = 0; +static unsigned int mouse_button_mask = + Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask; +static unsigned int key_modifier_mask = + Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask | ShiftMask | LockMask | ControlMask; -static gboolean kbd_registered = FALSE; +static GQuark spi_dec_private_quark = 0; -static Window root_window; +int (*x_default_error_handler) (Display *display, XErrorEvent *error_event); typedef enum { SPI_DEVICE_TYPE_KBD, @@ -55,295 +72,970 @@ typedef enum { SPI_DEVICE_TYPE_LAST_DEFINED } SpiDeviceTypeCategory; -struct _DEControllerGrabMask { - Accessibility_ControllerEventMask modmask; - CORBA_unsigned_long keyval; - unsigned int refcount; -}; +typedef struct { + guint ref_count : 30; + guint pending_add : 1; + guint pending_remove : 1; -typedef struct _DEControllerGrabMask DEControllerGrabMask; + Accessibility_ControllerEventMask mod_mask; + CORBA_unsigned_long key_val; /* KeyCode */ +} DEControllerGrabMask; -struct _DEControllerListener { +typedef struct { CORBA_Object object; SpiDeviceTypeCategory type; -}; - -typedef struct _DEControllerListener DEControllerListener; + Accessibility_EventTypeSeq *typeseq; +} DEControllerListener; -struct _DEControllerKeyListener { +typedef struct { DEControllerListener listener; - Accessibility_KeySet *keys; + + Accessibility_KeySet *keys; Accessibility_ControllerEventMask mask; - Accessibility_KeyEventTypeSeq *typeseq; - Accessibility_EventListenerMode *mode; -}; + Accessibility_EventListenerMode *mode; +} DEControllerKeyListener; + +typedef struct { + unsigned int last_press_keycode; + unsigned int last_release_keycode; + struct timeval last_press_time; + struct timeval last_release_time; + int have_xkb; + int xkb_major_extension_opcode; + int xkb_base_event_code; + int xkb_base_error_code; + unsigned int xkb_latch_mask; + unsigned int pending_xkb_mod_relatch_mask; + XkbDescPtr xkb_desc; +} DEControllerPrivateData; + +static void spi_controller_register_with_devices (SpiDEController *controller); +static gboolean spi_controller_update_key_grabs (SpiDEController *controller, + Accessibility_DeviceEvent *recv); +static gboolean spi_controller_register_device_listener (SpiDEController *controller, + DEControllerListener *l, + CORBA_Environment *ev); +static void spi_device_event_controller_forward_key_event (SpiDEController *controller, + const XEvent *event); +static void spi_deregister_controller_device_listener (SpiDEController *controller, + DEControllerListener *listener, + CORBA_Environment *ev); +static void spi_deregister_controller_key_listener (SpiDEController *controller, + DEControllerKeyListener *key_listener, + CORBA_Environment *ev); +static gboolean spi_controller_notify_mouselisteners (SpiDEController *controller, + const Accessibility_DeviceEvent *event, + CORBA_Environment *ev); + +static gboolean spi_eventtype_seq_contains_event (Accessibility_EventTypeSeq *type_seq, + const Accessibility_DeviceEvent *event); +static gboolean spi_clear_error_state (void); +static gboolean spi_dec_poll_mouse_moved (gpointer data); +static gboolean spi_dec_poll_mouse_moving (gpointer data); +static gboolean spi_dec_poll_mouse_idle (gpointer data); + +#define spi_get_display() GDK_DISPLAY() + +/* Private methods */ + +static KeyCode +keycode_for_keysym (long keysym) +{ + return XKeysymToKeycode (spi_get_display (), (KeySym) keysym); +} -typedef struct _DEControllerKeyListener DEControllerKeyListener; +static DEControllerGrabMask * +spi_grab_mask_clone (DEControllerGrabMask *grab_mask) +{ + DEControllerGrabMask *clone = g_new (DEControllerGrabMask, 1); -static gboolean spi_controller_register_with_devices (SpiDeviceEventController *controller); -static gboolean spi_controller_grab_keyboard (SpiDeviceEventController *controller); + memcpy (clone, grab_mask, sizeof (DEControllerGrabMask)); -static void spi_controller_register_device_listener (SpiDeviceEventController *controller, - DEControllerListener *l, - CORBA_Environment *ev); + clone->ref_count = 1; + clone->pending_add = TRUE; + clone->pending_remove = FALSE; -/* - * Private methods - */ + return clone; +} -static Display * -spi_get_display (void ) +static void +spi_grab_mask_free (DEControllerGrabMask *grab_mask) +{ + g_free (grab_mask); +} + +static gint +spi_grab_mask_compare_values (gconstpointer p1, gconstpointer p2) +{ + DEControllerGrabMask *l1 = (DEControllerGrabMask *) p1; + DEControllerGrabMask *l2 = (DEControllerGrabMask *) p2; + + if (p1 == p2) + { + return 0; + } + else + { + return ((l1->mod_mask != l2->mod_mask) || (l1->key_val != l2->key_val)); + } +} + +static void +spi_dec_set_unlatch_pending (SpiDEController *controller, unsigned mask) { - static Display *display = NULL; - /* We must open a new connection to the server to avoid clashing with the GDK event loop */ - /* - * TODO: fixme, this makes the foolish assumption that registryd uses - * the same display as the apps, and the the DISPLAY environment variable is set. - */ + DEControllerPrivateData *priv = + g_object_get_qdata (G_OBJECT (controller), spi_dec_private_quark); +#ifdef SPI_XKB_DEBUG + if (priv->xkb_latch_mask) fprintf (stderr, "unlatch pending! %x\n", mask); +#endif + priv->pending_xkb_mod_relatch_mask |= priv->xkb_latch_mask; +} - if (!display) - { - display = XOpenDisplay (g_getenv ("DISPLAY")); - } - return display; +static gboolean +spi_dec_button_update_and_emit (SpiDEController *controller, + guint mask_return) +{ + CORBA_Environment ev; + Accessibility_Event e; + Accessibility_DeviceEvent mouse_e; + gchar event_name[24]; + gboolean is_consumed = FALSE; + + if ((mask_return & mouse_button_mask) != + (mouse_mask_state & mouse_button_mask)) + { + int button_number = 0; + gboolean is_down = False; + + if (!(mask_return & Button1Mask) && + (mouse_mask_state & Button1Mask)) + { + mouse_mask_state &= ~Button1Mask; + button_number = 1; + } + else if ((mask_return & Button1Mask) && + !(mouse_mask_state & Button1Mask)) + { + mouse_mask_state |= Button1Mask; + button_number = 1; + is_down = True; + } + else if (!(mask_return & Button2Mask) && + (mouse_mask_state & Button2Mask)) + { + mouse_mask_state &= ~Button2Mask; + button_number = 2; + } + else if ((mask_return & Button2Mask) && + !(mouse_mask_state & Button2Mask)) + { + mouse_mask_state |= Button2Mask; + button_number = 2; + is_down = True; + } + else if (!(mask_return & Button3Mask) && + (mouse_mask_state & Button3Mask)) + { + mouse_mask_state &= ~Button3Mask; + button_number = 3; + } + else if ((mask_return & Button3Mask) && + !(mouse_mask_state & Button3Mask)) + { + mouse_mask_state |= Button3Mask; + button_number = 3; + is_down = True; + } + else if (!(mask_return & Button4Mask) && + (mouse_mask_state & Button4Mask)) + { + mouse_mask_state &= ~Button4Mask; + button_number = 4; + } + else if ((mask_return & Button4Mask) && + !(mouse_mask_state & Button4Mask)) + { + mouse_mask_state |= Button4Mask; + button_number = 4; + is_down = True; + } + else if (!(mask_return & Button5Mask) && + (mouse_mask_state & Button5Mask)) + { + mouse_mask_state &= ~Button5Mask; + button_number = 5; + } + else if ((mask_return & Button5Mask) && + !(mouse_mask_state & Button5Mask)) + { + mouse_mask_state |= Button5Mask; + button_number = 5; + is_down = True; + } + if (button_number) { +#ifdef SPI_DEBUG + fprintf (stderr, "Button %d %s\n", + button_number, (is_down) ? "Pressed" : "Released"); +#endif + snprintf (event_name, 22, "mouse:button:%d%c", button_number, + (is_down) ? 'p' : 'r'); + /* TODO: distinguish between physical and + * logical buttons + */ + mouse_e.type = (is_down) ? + Accessibility_BUTTON_PRESSED_EVENT : + Accessibility_BUTTON_RELEASED_EVENT; + mouse_e.id = button_number; + mouse_e.hw_code = button_number; + mouse_e.modifiers = (CORBA_unsigned_short) mouse_mask_state; + mouse_e.timestamp = 0; + mouse_e.event_string = ""; + mouse_e.is_text = CORBA_FALSE; + is_consumed = + spi_controller_notify_mouselisteners (controller, + &mouse_e, + &ev); + e.type = event_name; + e.source = BONOBO_OBJREF (controller->registry->desktop); + e.detail1 = last_mouse_pos->x; + e.detail2 = last_mouse_pos->y; + spi_init_any_nil (&e.any_data); + CORBA_exception_init (&ev); + if (!is_consumed) + { + Accessibility_Registry_notifyEvent (BONOBO_OBJREF (controller->registry), + &e, + &ev); + } + else + spi_dec_set_unlatch_pending (controller, mask_return); + } + return TRUE; + } + else + { + return FALSE; + } } -static DEControllerGrabMask * -spi_grabmask_clone (DEControllerGrabMask *grabmask) + +static guint +spi_dec_mouse_check (SpiDEController *controller, + int *x, int *y, gboolean *moved) { - DEControllerGrabMask *clone = g_new0 (DEControllerGrabMask, 1); - memcpy (clone, grabmask, sizeof (DEControllerGrabMask)); - return clone; + Accessibility_Event e; + CORBA_Environment ev; + int win_x_return,win_y_return; + unsigned int mask_return; + Window root_return, child_return; + Display *display = spi_get_display (); + + if (display != NULL) + XQueryPointer(display, DefaultRootWindow (display), + &root_return, &child_return, + x, y, + &win_x_return, &win_y_return, &mask_return); + /* + * Since many clients grab the pointer, and X goes an automatic + * pointer grab on mouse-down, we often must detect mouse button events + * by polling rather than via a button grab. + * The while loop (rather than if) is used since it's possible that + * multiple buttons have changed state since we last checked. + */ + if (mask_return != mouse_mask_state) + { + while (spi_dec_button_update_and_emit (controller, mask_return)); + } + + if (*x != last_mouse_pos->x || *y != last_mouse_pos->y) + { + e.type = "mouse:abs"; + e.source = BONOBO_OBJREF (controller->registry->desktop); + e.detail1 = *x; + e.detail2 = *y; + spi_init_any_nil (&e.any_data); + CORBA_exception_init (&ev); + Accessibility_Registry_notifyEvent (BONOBO_OBJREF (controller->registry), + &e, + &ev); + e.type = "mouse:rel"; + e.source = BONOBO_OBJREF (controller->registry->desktop); + e.detail1 = *x - last_mouse_pos->x; + e.detail2 = *y - last_mouse_pos->y; + spi_init_any_nil (&e.any_data); + CORBA_exception_init (&ev); + last_mouse_pos->x = *x; + last_mouse_pos->y = *y; + Accessibility_Registry_notifyEvent (BONOBO_OBJREF (controller->registry), + &e, + &ev); + *moved = True; + } + else + { + *moved = False; + } + + return mask_return; } -static gint -spi_compare_corba_objects (gconstpointer p1, gconstpointer p2) +static void +spi_dec_emit_modifier_event (SpiDEController *controller, guint prev_mask, + guint current_mask) { + Accessibility_Event e; CORBA_Environment ev; - gint retval; - retval = !CORBA_Object_is_equivalent ((CORBA_Object) p1, (CORBA_Object) p2, &ev); -#ifdef SPI_DEBUG - fprintf (stderr, "comparing %p to %p; result %d\n", - p1, p2, - retval); +#ifdef SPI_XKB_DEBUG + fprintf (stderr, "MODIFIER CHANGE EVENT! %x to %x\n", + prev_mask, current_mask); #endif - return retval; + e.type = "keyboard:modifiers"; + e.source = BONOBO_OBJREF (controller->registry->desktop); + e.detail1 = prev_mask & key_modifier_mask; + e.detail2 = current_mask & key_modifier_mask; + spi_init_any_nil (&e.any_data); + CORBA_exception_init (&ev); + Accessibility_Registry_notifyEvent (BONOBO_OBJREF (controller->registry), + &e, + &ev); } -static gint -spi_compare_listeners (gconstpointer p1, gconstpointer p2) +static gboolean +spi_dec_poll_mouse_moved (gpointer data) { - DEControllerListener *l1 = (DEControllerListener *) p1; - DEControllerListener *l2 = (DEControllerListener *) p2; - return spi_compare_corba_objects (l1->object, l2->object); + SpiRegistry *registry = SPI_REGISTRY (data); + SpiDEController *controller = registry->de_controller; + int x, y; + gboolean moved; + guint mask_return; + + mask_return = spi_dec_mouse_check (controller, &x, &y, &moved); + + if ((mask_return & key_modifier_mask) != + (mouse_mask_state & key_modifier_mask)) + { + spi_dec_emit_modifier_event (controller, mouse_mask_state, mask_return); + mouse_mask_state = mask_return; + } + + return moved; } -static gint -spi_grabmask_compare_values (gconstpointer p1, gconstpointer p2) +static gboolean +spi_dec_poll_mouse_idle (gpointer data) { - DEControllerGrabMask *l1; - DEControllerGrabMask *l2; - if (p1 == p2) + if (! spi_dec_poll_mouse_moved (data)) + return TRUE; + else { - return 0; + g_timeout_add (20, spi_dec_poll_mouse_moving, data); + return FALSE; } +} + +static gboolean +spi_dec_poll_mouse_moving (gpointer data) +{ + if (spi_dec_poll_mouse_moved (data)) + return TRUE; else - { - l1 = (DEControllerGrabMask *) p1; - l2 = (DEControllerGrabMask *) p2; - return ((l1->modmask != l2->modmask) || (l1->keyval != l2->keyval)); + { + g_timeout_add (100, spi_dec_poll_mouse_idle, data); + return FALSE; + } +} + +static int +spi_dec_ungrab_mouse (gpointer data) +{ + Display *display = spi_get_display (); + if (display) + { + XUngrabButton (spi_get_display (), AnyButton, AnyModifier, + XDefaultRootWindow (spi_get_display ())); + } + return FALSE; +} + +static void +spi_dec_init_mouse_listener (SpiRegistry *registry) +{ + Display *display = spi_get_display (); + g_timeout_add (100, spi_dec_poll_mouse_idle, registry); + + if (display) + { + XGrabButton (display, AnyButton, AnyModifier, + gdk_x11_get_default_root_xwindow (), + True, ButtonPressMask | ButtonReleaseMask, + GrabModeSync, GrabModeAsync, None, None); + XSync (display, False); +#ifdef SPI_DEBUG + fprintf (stderr, "mouse buttons grabbed\n"); +#endif } } static DEControllerKeyListener * -spi_dec_key_listener_new (CORBA_Object l, - const Accessibility_KeySet *keys, +spi_dec_key_listener_new (CORBA_Object l, + const Accessibility_KeySet *keys, const Accessibility_ControllerEventMask mask, - const Accessibility_KeyEventTypeSeq *typeseq, - const Accessibility_EventListenerMode *mode, - CORBA_Environment *ev) + const Accessibility_EventTypeSeq *typeseq, + const Accessibility_EventListenerMode *mode, + CORBA_Environment *ev) { DEControllerKeyListener *key_listener = g_new0 (DEControllerKeyListener, 1); key_listener->listener.object = bonobo_object_dup_ref (l, ev); key_listener->listener.type = SPI_DEVICE_TYPE_KBD; key_listener->keys = ORBit_copy_value (keys, TC_Accessibility_KeySet); key_listener->mask = mask; - key_listener->typeseq = ORBit_copy_value (typeseq, TC_Accessibility_KeyEventTypeSeq); + key_listener->listener.typeseq = ORBit_copy_value (typeseq, TC_Accessibility_EventTypeSeq); if (mode) key_listener->mode = ORBit_copy_value (mode, TC_Accessibility_EventListenerMode); else key_listener->mode = NULL; #ifdef SPI_DEBUG - g_print ("new listener, with mask %x, is_global %d, keys %p\n", + g_print ("new listener, with mask %x, is_global %d, keys %p (%d)\n", (unsigned int) key_listener->mask, - (int) mode->global, - (void *) key_listener->keys); + (int) (mode ? mode->global : 0), + (void *) key_listener->keys, + (int) (key_listener->keys ? key_listener->keys->_length : 0)); #endif + return key_listener; } +static DEControllerListener * +spi_dec_listener_new (CORBA_Object l, + const Accessibility_EventTypeSeq *typeseq, + CORBA_Environment *ev) +{ + DEControllerListener *listener = g_new0 (DEControllerListener, 1); + listener->object = bonobo_object_dup_ref (l, ev); + listener->type = SPI_DEVICE_TYPE_MOUSE; + listener->typeseq = ORBit_copy_value (typeseq, TC_Accessibility_EventTypeSeq); + return listener; +} + +static DEControllerListener * +spi_listener_clone (DEControllerListener *listener, CORBA_Environment *ev) +{ + DEControllerListener *clone = g_new0 (DEControllerListener, 1); + clone->object = + CORBA_Object_duplicate (listener->object, ev); + clone->type = listener->type; + clone->typeseq = ORBit_copy_value (listener->typeseq, TC_Accessibility_EventTypeSeq); + return clone; +} + +static DEControllerKeyListener * +spi_key_listener_clone (DEControllerKeyListener *key_listener, CORBA_Environment *ev) +{ + DEControllerKeyListener *clone = g_new0 (DEControllerKeyListener, 1); + clone->listener.object = + CORBA_Object_duplicate (key_listener->listener.object, ev); + clone->listener.type = SPI_DEVICE_TYPE_KBD; + clone->keys = ORBit_copy_value (key_listener->keys, TC_Accessibility_KeySet); + clone->mask = key_listener->mask; + clone->listener.typeseq = ORBit_copy_value (key_listener->listener.typeseq, TC_Accessibility_EventTypeSeq); + if (key_listener->mode) + clone->mode = ORBit_copy_value (key_listener->mode, TC_Accessibility_EventListenerMode); + else + clone->mode = NULL; + return clone; +} + static void -spi_dec_key_listener_free (DEControllerKeyListener *key_listener, CORBA_Environment *ev) +spi_key_listener_data_free (DEControllerKeyListener *key_listener, CORBA_Environment *ev) { - bonobo_object_release_unref (key_listener->listener.object, ev); - CORBA_free (key_listener->typeseq); + CORBA_free (key_listener->listener.typeseq); CORBA_free (key_listener->keys); g_free (key_listener); } static void -spi_controller_deregister_global_keygrabs (SpiDeviceEventController *controller, - DEControllerKeyListener *key_listener) +spi_key_listener_clone_free (DEControllerKeyListener *clone, CORBA_Environment *ev) { - GList *list_ptr; - DEControllerGrabMask *mask_ptr; - /* TODO: implement this! Also remember to release any keygrabs still held */ - ; + CORBA_Object_release (clone->listener.object, ev); + spi_key_listener_data_free (clone, ev); } static void -spi_controller_register_global_keygrabs (SpiDeviceEventController *controller, - DEControllerKeyListener *key_listener) +spi_listener_clone_free (DEControllerListener *clone, CORBA_Environment *ev) { - DEControllerGrabMask grabmask, *grabmask_ptr; - GList *list_ptr; - gint i; - /* TODO: deregistration version of this function */ - - grabmask.modmask = key_listener->mask; - if (key_listener->keys->_length == 0) /* special case means AnyKey/AllKeys */ + CORBA_Object_release (clone->object, ev); + CORBA_free (clone->typeseq); + g_free (clone); +} + +static void +spi_dec_listener_free (DEControllerListener *listener, + CORBA_Environment *ev) +{ + bonobo_object_release_unref (listener->object, ev); + if (listener->type == SPI_DEVICE_TYPE_KBD) + spi_key_listener_data_free ((DEControllerKeyListener *) listener, ev); +} + +static void +_register_keygrab (SpiDEController *controller, + DEControllerGrabMask *grab_mask) +{ + GList *l; + + l = g_list_find_custom (controller->keygrabs_list, grab_mask, + spi_grab_mask_compare_values); + if (l) { - grabmask.keyval = AnyKey; - list_ptr = g_list_find_custom (controller->keygrabs_list, &grabmask, - spi_grabmask_compare_values); - if (list_ptr) + DEControllerGrabMask *cur_mask = l->data; + + cur_mask->ref_count++; + if (cur_mask->pending_remove) { - grabmask_ptr = (DEControllerGrabMask *) list_ptr->data; - grabmask_ptr->refcount++; - } - else + cur_mask->pending_remove = FALSE; + } + } + else + { + controller->keygrabs_list = + g_list_prepend (controller->keygrabs_list, + spi_grab_mask_clone (grab_mask)); + } +} + +static void +_deregister_keygrab (SpiDEController *controller, + DEControllerGrabMask *grab_mask) +{ + GList *l; + + l = g_list_find_custom (controller->keygrabs_list, grab_mask, + spi_grab_mask_compare_values); + + if (l) + { + DEControllerGrabMask *cur_mask = l->data; + + cur_mask->ref_count--; + if (cur_mask->ref_count <= 0) { - controller->keygrabs_list = - g_list_prepend (controller->keygrabs_list, - spi_grabmask_clone (&grabmask)); - } + cur_mask->pending_remove = TRUE; + } } else { + DBG (1, g_warning ("De-registering non-existant grab")); + } +} + +static void +handle_keygrab (SpiDEController *controller, + DEControllerKeyListener *key_listener, + void (*process_cb) (SpiDEController *controller, + DEControllerGrabMask *grab_mask)) +{ + DEControllerGrabMask grab_mask = { 0 }; + + grab_mask.mod_mask = key_listener->mask; + if (key_listener->keys->_length == 0) /* special case means AnyKey/AllKeys */ + { + grab_mask.key_val = AnyKey; +#ifdef SPI_DEBUG + fprintf (stderr, "AnyKey grab!"); +#endif + process_cb (controller, &grab_mask); + } + else + { + int i; + for (i = 0; i < key_listener->keys->_length; ++i) { - long int keyval = key_listener->keys->_buffer[i]; + Accessibility_KeyDefinition keydef = key_listener->keys->_buffer[i]; + long int key_val = keydef.keysym; /* X Grabs require keycodes, not keysyms */ - if (keyval >= 0) + if (keydef.keystring && keydef.keystring[0]) { - keyval = XKeysymToKeycode(spi_get_display (), (KeySym) keyval); + key_val = XStringToKeysym(keydef.keystring); } - grabmask.keyval = keyval; - list_ptr = g_list_find_custom (controller->keygrabs_list, &grabmask, - spi_grabmask_compare_values); - if (list_ptr) - { - grabmask_ptr = (DEControllerGrabMask *) list_ptr->data; - grabmask_ptr->refcount++; - } - else - { - controller->keygrabs_list = - g_list_prepend (controller->keygrabs_list, - spi_grabmask_clone (&grabmask)); - fprintf (stderr, "appending mask with val=%lu\n", - (unsigned long) grabmask.modmask); - } - } + if (key_val > 0) + { + key_val = XKeysymToKeycode (spi_get_display (), (KeySym) key_val); + } + else + { + key_val = keydef.keycode; + } + grab_mask.key_val = key_val; + process_cb (controller, &grab_mask); + } } } +static gboolean +spi_controller_register_global_keygrabs (SpiDEController *controller, + DEControllerKeyListener *key_listener) +{ + handle_keygrab (controller, key_listener, _register_keygrab); + return spi_controller_update_key_grabs (controller, NULL); +} + static void -spi_controller_register_device_listener (SpiDeviceEventController *controller, +spi_controller_deregister_global_keygrabs (SpiDEController *controller, + DEControllerKeyListener *key_listener) +{ + handle_keygrab (controller, key_listener, _deregister_keygrab); + spi_controller_update_key_grabs (controller, NULL); +} + +static gboolean +spi_controller_register_device_listener (SpiDEController *controller, DEControllerListener *listener, - CORBA_Environment *ev) + CORBA_Environment *ev) { DEControllerKeyListener *key_listener; switch (listener->type) { case SPI_DEVICE_TYPE_KBD: - key_listener = (DEControllerKeyListener *) listener; - controller->key_listeners = g_list_prepend (controller->key_listeners, key_listener); + key_listener = (DEControllerKeyListener *) listener; + + controller->key_listeners = g_list_prepend (controller->key_listeners, + key_listener); if (key_listener->mode->global) { - spi_controller_register_global_keygrabs (controller, key_listener); + return spi_controller_register_global_keygrabs (controller, key_listener); } + else + return TRUE; break; case SPI_DEVICE_TYPE_MOUSE: -/* controller->mouse_listeners = g_list_append (controller->mouse_listeners, - CORBA_Object_duplicate (l, ev));*/ - -/* this interface should only be used for mouse motion events, not mouse clicks events */ + controller->mouse_listeners = g_list_prepend (controller->mouse_listeners, listener); + break; + default: + DBG (1, g_warning ("listener registration for unknown device type.\n")); break; } + return FALSE; +} + +static gboolean +spi_controller_notify_mouselisteners (SpiDEController *controller, + const Accessibility_DeviceEvent *event, + CORBA_Environment *ev) +{ + GList *l; + GSList *notify = NULL, *l2; + GList **listeners = &controller->mouse_listeners; + gboolean is_consumed; + + if (!listeners) + { + return FALSE; + } + + for (l = *listeners; l; l = l->next) + { + DEControllerListener *listener = l->data; + + if (spi_eventtype_seq_contains_event (listener->typeseq, event)) + { + Accessibility_DeviceEventListener ls = listener->object; + + if (ls != CORBA_OBJECT_NIL) + { + /* we clone (don't dup) the listener, to avoid refcount inc. */ + notify = g_slist_prepend (notify, + spi_listener_clone (listener, ev)); + } + } + } + +#ifdef SPI_KEYEVENT_DEBUG + if (!notify) + { + g_print ("no match for event\n"); + } +#endif + + is_consumed = FALSE; + for (l2 = notify; l2 && !is_consumed; l2 = l2->next) + { + DEControllerListener *listener = l2->data; + Accessibility_DeviceEventListener ls = listener->object; + + CORBA_exception_init (ev); + is_consumed = Accessibility_DeviceEventListener_notifyEvent (ls, event, ev); + if (BONOBO_EX (ev)) + { + is_consumed = FALSE; + DBG (2, g_warning ("error notifying listener, removing it\n")); + spi_deregister_controller_device_listener (controller, listener, + ev); + CORBA_exception_free (ev); + } + + spi_listener_clone_free ((DEControllerListener *) l2->data, ev); + } + + for (; l2; l2 = l2->next) + { + DEControllerListener *listener = l2->data; + spi_listener_clone_free (listener, ev); + /* clone doesn't have its own ref, so don't use spi_device_listener_free */ + } + + g_slist_free (notify); + +#ifdef SPI_DEBUG + if (is_consumed) g_message ("consumed\n"); +#endif + return is_consumed; } static void -spi_controller_deregister_device_listener (SpiDeviceEventController *controller, - DEControllerListener *listener, - CORBA_Environment *ev) +spi_device_event_controller_forward_mouse_event (SpiDEController *controller, + XEvent *xevent) { - Accessibility_ControllerEventMask *mask_ptr; - DEControllerListener *dec_listener; - GList *list_ptr; - switch (listener->type) + Accessibility_Event e; + Accessibility_DeviceEvent mouse_e; + CORBA_Environment ev; + gchar event_name[24]; + gboolean is_consumed = FALSE; + gboolean xkb_mod_unlatch_occurred; + XButtonEvent *xbutton_event = (XButtonEvent *) xevent; + + int button = xbutton_event->button; + + unsigned int mouse_button_state = xbutton_event->state; + + switch (button) { - case SPI_DEVICE_TYPE_KBD: - spi_controller_deregister_global_keygrabs (controller, - (DEControllerKeyListener *) listener); + case 1: + mouse_button_state |= Button1Mask; + break; + case 2: + mouse_button_state |= Button2Mask; + break; + case 3: + mouse_button_state |= Button3Mask; + break; + case 4: + mouse_button_state |= Button4Mask; + break; + case 5: + mouse_button_state |= Button5Mask; + break; + } - /* now, remove this listener from the keylistener list */ - list_ptr = g_list_find_custom (controller->key_listeners, listener, spi_compare_listeners); - if (list_ptr) - { - dec_listener = (DEControllerListener *) list_ptr->data; -#ifdef SPI_DEBUG - g_print ("removing keylistener %p\n", dec_listener->object); + last_mouse_pos->x = ((XButtonEvent *) xevent)->x_root; + last_mouse_pos->y = ((XButtonEvent *) xevent)->y_root; + +#ifdef SPI_DEBUG + fprintf (stderr, "mouse button %d %s (%x)\n", + xbutton_event->button, + (xevent->type == ButtonPress) ? "Press" : "Release", + mouse_button_state); #endif - controller->key_listeners = g_list_remove_link (controller->key_listeners, - list_ptr); - spi_dec_key_listener_free ((DEControllerKeyListener *) dec_listener, ev); - } - break; - case SPI_DEVICE_TYPE_MOUSE: /* TODO: implement */ - break; + snprintf (event_name, 22, "mouse:button:%d%c", button, + (xevent->type == ButtonPress) ? 'p' : 'r'); + + /* TODO: distinguish between physical and logical buttons */ + mouse_e.type = (xevent->type == ButtonPress) ? + Accessibility_BUTTON_PRESSED_EVENT : + Accessibility_BUTTON_RELEASED_EVENT; + mouse_e.id = button; + mouse_e.hw_code = button; + mouse_e.modifiers = (CORBA_unsigned_short) xbutton_event->state; + mouse_e.timestamp = (CORBA_unsigned_long) xbutton_event->time; + mouse_e.event_string = ""; + mouse_e.is_text = CORBA_FALSE; + if ((mouse_button_state & mouse_button_mask) != + (mouse_mask_state & mouse_button_mask)) + { + if ((mouse_mask_state & key_modifier_mask) != + (mouse_button_state & key_modifier_mask)) + spi_dec_emit_modifier_event (controller, + mouse_mask_state, mouse_button_state); + mouse_mask_state = mouse_button_state; + is_consumed = + spi_controller_notify_mouselisteners (controller, &mouse_e, &ev); + e.type = CORBA_string_dup (event_name); + e.source = BONOBO_OBJREF (controller->registry->desktop); + e.detail1 = last_mouse_pos->x; + e.detail2 = last_mouse_pos->y; + spi_init_any_nil (&e.any_data); + CORBA_exception_init (&ev); + + Accessibility_Registry_notifyEvent (BONOBO_OBJREF (controller->registry), + &e, + &ev); } + + xkb_mod_unlatch_occurred = (xevent->type == ButtonPress || + xevent->type == ButtonRelease); + + /* if client wants to consume this event, and XKB latch state was + * unset by this button event, we reset it + */ + if (is_consumed && (xkb_mod_unlatch_occurred)) + spi_dec_set_unlatch_pending (controller, mouse_mask_state); + + XAllowEvents (spi_get_display (), + (is_consumed) ? SyncPointer : ReplayPointer, + CurrentTime); } -static gboolean -spi_controller_register_with_devices (SpiDeviceEventController *controller) +static GdkFilterReturn +global_filter_fn (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data) +{ + XEvent *xevent = gdk_xevent; + SpiDEController *controller; + DEControllerPrivateData *priv; + Display *display = spi_get_display (); + controller = SPI_DEVICE_EVENT_CONTROLLER (data); + priv = (DEControllerPrivateData *) + g_object_get_qdata (G_OBJECT (controller), spi_dec_private_quark); + + if (xevent->type == KeyPress || xevent->type == KeyRelease) + { + spi_device_event_controller_forward_key_event (controller, xevent); + return GDK_FILTER_CONTINUE; + } + if (xevent->type == ButtonPress || xevent->type == ButtonRelease) + { + spi_device_event_controller_forward_mouse_event (controller, xevent); + } + if (xevent->type == priv->xkb_base_event_code) + { + XkbAnyEvent * xkb_ev = (XkbAnyEvent *) xevent; + /* ugly but probably necessary...*/ + XSynchronize (spi_get_display (), TRUE); + + if (xkb_ev->xkb_type == XkbStateNotify) + { + XkbStateNotifyEvent *xkb_snev = + (XkbStateNotifyEvent *) xkb_ev; + /* check the mouse, to catch mouse events grabbed by + * another client; in case we should revert this XKB delatch + */ + if (!priv->pending_xkb_mod_relatch_mask) + { + int x, y; + gboolean moved; + spi_dec_mouse_check (controller, &x, &y, &moved); + } + /* we check again, since the previous call may have + changed this flag */ + if (priv->pending_xkb_mod_relatch_mask) + { + unsigned int feedback_mask; +#ifdef SPI_XKB_DEBUG + fprintf (stderr, "relatching %x\n", + priv->pending_xkb_mod_relatch_mask); +#endif + /* temporarily turn off the latch bell, if it's on */ + XkbGetControls (display, + XkbAccessXFeedbackMask, + priv->xkb_desc); + feedback_mask = priv->xkb_desc->ctrls->ax_options; + if (feedback_mask & XkbAX_StickyKeysFBMask) + { + XkbControlsChangesRec changes = {XkbAccessXFeedbackMask, + 0, False}; + priv->xkb_desc->ctrls->ax_options + &= ~(XkbAX_StickyKeysFBMask); + XkbChangeControls (display, priv->xkb_desc, &changes); + } + XkbLatchModifiers (display, + XkbUseCoreKbd, + priv->pending_xkb_mod_relatch_mask, + priv->pending_xkb_mod_relatch_mask); + if (feedback_mask & XkbAX_StickyKeysFBMask) + { + XkbControlsChangesRec changes = {XkbAccessXFeedbackMask, + 0, False}; + priv->xkb_desc->ctrls->ax_options = feedback_mask; + XkbChangeControls (display, priv->xkb_desc, &changes); + } +#ifdef SPI_XKB_DEBUG + fprintf (stderr, "relatched %x\n", + priv->pending_xkb_mod_relatch_mask); +#endif + priv->pending_xkb_mod_relatch_mask = 0; + } + else + { + priv->xkb_latch_mask = xkb_snev->latched_mods; + } + } + else + DBG (2, g_warning ("XKB event %d\n", xkb_ev->xkb_type)); + XSynchronize (spi_get_display (), FALSE); + } + + return GDK_FILTER_CONTINUE; +} + +int +_spi_controller_device_error_handler (Display *display, XErrorEvent *error) { - gboolean retval = FALSE; + if (error->error_code == BadAccess) + { + g_message ("Could not complete key grab: grab already in use.\n"); + spi_error_code = BadAccess; + return 0; + } + else + { + return (*x_default_error_handler) (display, error); + } +} + +static void +spi_controller_register_with_devices (SpiDEController *controller) +{ + DEControllerPrivateData *priv = (DEControllerPrivateData *) + g_object_get_qdata (G_OBJECT (controller), spi_dec_private_quark); + /* FIXME: should check for extension first! */ + XTestGrabControl (spi_get_display (), True); + priv->xkb_desc = XkbGetMap (spi_get_display (), 0, XkbUseCoreKbd); /* calls to device-specific implementations and routines go here */ /* register with: keyboard hardware code handler */ /* register with: (translated) keystroke handler */ - /* We must open a new connection to the server to avoid clashing with the GDK event loop */ - root_window = DefaultRootWindow (spi_get_display ()); - XSelectInput (spi_get_display (), - root_window, - KeyPressMask | KeyReleaseMask); - /* register with: mouse hardware device handler? */ - /* register with: mouse event handler */ - return retval; + priv->have_xkb = XkbQueryExtension (spi_get_display (), + &priv->xkb_major_extension_opcode, + &priv->xkb_base_event_code, + &priv->xkb_base_error_code, NULL, NULL); + if (priv->have_xkb) + { + XkbSelectEvents (spi_get_display (), + XkbUseCoreKbd, + XkbStateNotifyMask, XkbStateNotifyMask); + } + gdk_window_add_filter (NULL, global_filter_fn, controller); + + gdk_window_set_events (gdk_get_default_root_window (), + GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK); + + x_default_error_handler = XSetErrorHandler (_spi_controller_device_error_handler); } static gboolean -spi_key_set_contains_key (Accessibility_KeySet *key_set, const Accessibility_DeviceEvent *key_event) +spi_key_set_contains_key (Accessibility_KeySet *key_set, + const Accessibility_DeviceEvent *key_event) { gint i; gint len; - /* g_assert (key_set); */ - if (!key_set) { g_print ("null key set!"); return TRUE; } + if (!key_set) + { + g_print ("null key set!"); + return TRUE; + } len = key_set->_length; @@ -353,31 +1045,45 @@ spi_key_set_contains_key (Accessibility_KeySet *key_set, const Accessibility_Dev return TRUE; } - for (i=0; i_buffer[i], - (int) key_event->id, - (int) key_event->hw_code); + 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, + key_event->event_string); #endif - if (key_set->_buffer[i] == (CORBA_long) key_event->id) return TRUE; - if (key_set->_buffer[i] == (CORBA_long) -key_event->hw_code) return TRUE; + if (key_set->_buffer[i].keysym == (CORBA_long) key_event->id) + { + return TRUE; + } + if (key_set->_buffer[i].keycode == (CORBA_long) key_event->hw_code) + { + return TRUE; + } + if (key_event->event_string && key_event->event_string[0] && + !strcmp (key_set->_buffer[i].keystring, key_event->event_string)) + { + return TRUE; + } } return FALSE; } static gboolean -spi_key_eventtype_seq_contains_event (Accessibility_KeyEventTypeSeq *type_seq, - const Accessibility_DeviceEvent *key_event) +spi_eventtype_seq_contains_event (Accessibility_EventTypeSeq *type_seq, + const Accessibility_DeviceEvent *event) { gint i; gint len; - /* g_assert (type_seq); */ - if (!type_seq) { g_print ("null type seq!"); return TRUE; } + + if (!type_seq) + { + g_print ("null type seq!"); + return TRUE; + } len = type_seq->_length; @@ -386,13 +1092,16 @@ spi_key_eventtype_seq_contains_event (Accessibility_KeyEventTypeSeq *type_seq, return TRUE; } - for (i=0; i_buffer[i], - (int) key_event->type); + g_print ("type_seq[%d] = %d; event type = %d\n", i, + (int) type_seq->_buffer[i], (int) event->type); #endif - if (type_seq->_buffer[i] == (CORBA_long) key_event->type) return TRUE; + if (type_seq->_buffer[i] == (CORBA_long) event->type) + { + return TRUE; + } } return FALSE; @@ -400,54 +1109,104 @@ spi_key_eventtype_seq_contains_event (Accessibility_KeyEventTypeSeq *type_seq, static gboolean spi_key_event_matches_listener (const Accessibility_DeviceEvent *key_event, - DEControllerKeyListener *listener, - CORBA_boolean is_system_global) + DEControllerKeyListener *listener, + CORBA_boolean is_system_global) { - g_print ("checking keycode %d\n", (int) key_event->hw_code); if ((key_event->modifiers == (CORBA_unsigned_short) (listener->mask & 0xFFFF)) && spi_key_set_contains_key (listener->keys, key_event) && - spi_key_eventtype_seq_contains_event (listener->typeseq, key_event) && + spi_eventtype_seq_contains_event (listener->listener.typeseq, key_event) && (is_system_global == listener->mode->global)) { return TRUE; } else - return FALSE; + { + return FALSE; + } } static gboolean -spi_notify_keylisteners (GList *key_listeners, - const Accessibility_DeviceEvent *key_event, - CORBA_boolean is_system_global, - CORBA_Environment *ev) +spi_controller_notify_keylisteners (SpiDEController *controller, + const Accessibility_DeviceEvent *key_event, + CORBA_boolean is_system_global, + CORBA_Environment *ev) { - int i, n_listeners = g_list_length (key_listeners); - gboolean is_consumed = FALSE; + GList *l; + GSList *notify = NULL, *l2; + GList **key_listeners = &controller->key_listeners; + gboolean is_consumed; - for (i=0; ilistener.object; - if (spi_key_event_matches_listener (key_event, key_listener, is_system_global)) - { - if (!CORBA_Object_is_nil(ls, ev)) - { - is_consumed = Accessibility_DeviceEventListener_notifyEvent (ls, key_event, ev); - } - } - else - { + return FALSE; + } + + for (l = *key_listeners; l; l = l->next) + { + DEControllerKeyListener *key_listener = l->data; + + if (spi_key_event_matches_listener (key_event, key_listener, is_system_global)) + { + Accessibility_DeviceEventListener ls = key_listener->listener.object; + + if (ls != CORBA_OBJECT_NIL) + { + /* we clone (don't dup) the listener, to avoid refcount inc. */ + notify = g_slist_prepend (notify, + spi_key_listener_clone (key_listener, ev)); + } + } + } + #ifdef SPI_KEYEVENT_DEBUG - g_print ("no match for listener %d\n", i); + if (!notify) + { + g_print ("no match for event\n"); + } #endif - ; - } + + is_consumed = FALSE; + for (l2 = notify; l2 && !is_consumed; l2 = l2->next) + { + DEControllerKeyListener *key_listener = l2->data; + Accessibility_DeviceEventListener ls = key_listener->listener.object; + + is_consumed = Accessibility_DeviceEventListener_notifyEvent (ls, key_event, ev); + + if (BONOBO_EX (ev)) + { + is_consumed = FALSE; + spi_deregister_controller_key_listener (controller, key_listener, + ev); + CORBA_exception_free (ev); + } + + spi_key_listener_clone_free (key_listener, ev); + } + + for (; l2; l2 = l2->next) + { + DEControllerKeyListener *key_listener = l2->data; + spi_key_listener_clone_free (key_listener, ev); + /* clone doesn't have its own ref, so don't use spi_dec_listener_free */ } + + g_slist_free (notify); + +#ifdef SPI_DEBUG + if (is_consumed) g_message ("consumed\n"); +#endif return is_consumed; } +static gboolean +spi_clear_error_state () +{ + gboolean retval = spi_error_code != 0; + spi_error_code = 0; + return retval; +} + static Accessibility_DeviceEvent spi_keystroke_from_x_key_event (XKeyEvent *x_key_event) { @@ -475,6 +1234,9 @@ spi_keystroke_from_x_key_event (XKeyEvent *x_key_event) key_event.event_string = CORBA_string_dup ("space"); break; case XK_Tab: +#ifdef SPI_KEYEVENT_DEBUG + fprintf(stderr, "Tab\n"); +#endif key_event.event_string = CORBA_string_dup ("Tab"); break; case XK_BackSpace: @@ -483,6 +1245,69 @@ spi_keystroke_from_x_key_event (XKeyEvent *x_key_event) case XK_Return: key_event.event_string = CORBA_string_dup ("Return"); break; + case XK_Home: + key_event.event_string = CORBA_string_dup ("Home"); + break; + case XK_Page_Down: + key_event.event_string = CORBA_string_dup ("Page_Down"); + break; + case XK_Page_Up: + key_event.event_string = CORBA_string_dup ("Page_Up"); + break; + case XK_F1: + key_event.event_string = CORBA_string_dup ("F1"); + break; + case XK_F2: + key_event.event_string = CORBA_string_dup ("F2"); + break; + case XK_F3: + key_event.event_string = CORBA_string_dup ("F3"); + break; + case XK_F4: + key_event.event_string = CORBA_string_dup ("F4"); + break; + case XK_F5: + key_event.event_string = CORBA_string_dup ("F5"); + break; + case XK_F6: + key_event.event_string = CORBA_string_dup ("F6"); + break; + case XK_F7: + key_event.event_string = CORBA_string_dup ("F7"); + break; + case XK_F8: + key_event.event_string = CORBA_string_dup ("F8"); + break; + case XK_F9: + key_event.event_string = CORBA_string_dup ("F9"); + break; + case XK_F10: + key_event.event_string = CORBA_string_dup ("F10"); + break; + case XK_F11: + key_event.event_string = CORBA_string_dup ("F11"); + break; + case XK_F12: + key_event.event_string = CORBA_string_dup ("F12"); + break; + case XK_End: + key_event.event_string = CORBA_string_dup ("End"); + break; + case XK_Escape: + key_event.event_string = CORBA_string_dup ("Escape"); + break; + case XK_Up: + key_event.event_string = CORBA_string_dup ("Up"); + break; + case XK_Down: + key_event.event_string = CORBA_string_dup ("Down"); + break; + case XK_Left: + key_event.event_string = CORBA_string_dup ("Left"); + break; + case XK_Right: + key_event.event_string = CORBA_string_dup ("Right"); + break; default: if (XLookupString (x_key_event, cbuf, cbuf_bytes, &keysym, NULL) > 0) { @@ -515,96 +1340,101 @@ spi_keystroke_from_x_key_event (XKeyEvent *x_key_event) return key_event; } - static gboolean -spi_check_key_event (SpiDeviceEventController *controller) +spi_controller_update_key_grabs (SpiDEController *controller, + Accessibility_DeviceEvent *recv) { - static gboolean initialized = FALSE; - XEvent *x_event = g_new0 (XEvent, 1); - XKeyEvent *x_key_event; - gboolean is_consumed = FALSE; - Accessibility_DeviceEvent key_event; - static CORBA_Environment ev; + GList *l, *next; + gboolean update_failed = FALSE; + + g_return_val_if_fail (controller != NULL, FALSE); - if (!initialized) - { - initialized = TRUE; - CORBA_exception_init (&ev); - } + /* + * masks known to work with default RH 7.1+: + * 0 (no mods), LockMask, Mod1Mask, Mod2Mask, ShiftMask, + * ShiftMask|LockMask, Mod1Mask|LockMask, Mod2Mask|LockMask, + * ShiftMask|Mod1Mask, ShiftMask|Mod2Mask, Mod1Mask|Mod2Mask, + * ShiftMask|LockMask|Mod1Mask, ShiftMask|LockMask|Mod2Mask, + * + * ControlMask grabs are broken, must be in use already + */ + for (l = controller->keygrabs_list; l; l = next) + { + gboolean do_remove; + gboolean re_issue_grab; + DEControllerGrabMask *grab_mask = l->data; - while (XPending(spi_get_display ())) - { - XNextEvent (spi_get_display (), x_event); - if (XFilterEvent (x_event, None)) continue; - if (x_event->type == KeyPress || x_event->type == KeyRelease) - { - key_event = spi_keystroke_from_x_key_event ((XKeyEvent *) x_event); - /* relay to listeners, and decide whether to consume it or not */ - is_consumed = spi_notify_keylisteners (controller->key_listeners, &key_event, CORBA_TRUE, &ev); - } - else - { -#ifdef SPI_KEYEVENT_DEBUG - fprintf (stderr, "other event, type %d\n", (int) x_event->type); -#endif - } + next = l->next; - if (is_consumed) - { - XAllowEvents (spi_get_display (), AsyncKeyboard, CurrentTime); - } - else - { - XAllowEvents (spi_get_display (), ReplayKeyboard, CurrentTime); - } - } - XUngrabKey (spi_get_display (), AnyKey, AnyModifier, root_window); + re_issue_grab = recv && +/* (recv->type == Accessibility_KEY_RELEASED) && - (?) */ + (recv->modifiers & grab_mask->mod_mask) && + (grab_mask->key_val == keycode_for_keysym (recv->id)); - return spi_controller_grab_keyboard (controller); -} +#ifdef SPI_DEBUG + fprintf (stderr, "mask=%lx %lx (%c%c) %s\n", + (long int) grab_mask->key_val, + (long int) grab_mask->mod_mask, + grab_mask->pending_add ? '+' : '.', + grab_mask->pending_remove ? '-' : '.', + re_issue_grab ? "re-issue": ""); +#endif -static gboolean -spi_controller_grab_keyboard (SpiDeviceEventController *controller) -{ - GList *maskList = controller->keygrabs_list; - int i; - int last_mask; - last_mask = g_list_length (maskList); + do_remove = FALSE; -/* - * masks known to work with default RH 7.1: - * 0 (no mods), LockMask, Mod1Mask, Mod2Mask, ShiftMask, - * ShiftMask|LockMask, Mod1Mask|LockMask, Mod2Mask|LockMask, - * ShiftMask|Mod1Mask, ShiftMask|Mod2Mask, Mod1Mask|Mod2Mask, - * ShiftMask|LockMask|Mod1Mask, ShiftMask|LockMask|Mod2Mask, - * - * ControlMask grabs are broken, must be in use already - */ - - for (i=0; i < last_mask; ++i) - { - DEControllerGrabMask * grab_mask - = (DEControllerGrabMask *) g_list_nth_data (maskList, i); - unsigned long maskVal = 0xFFFFFFFF; - int keyVal = AnyKey; - if (grab_mask) + if (grab_mask->pending_add && grab_mask->pending_remove) { - maskVal = (unsigned long) grab_mask->modmask; - keyVal = grab_mask->keyval; - } + do_remove = TRUE; + } + else if (grab_mask->pending_remove) + { +#ifdef SPI_DEBUG + fprintf (stderr, "ungrabbing, mask=%x\n", grab_mask->mod_mask); +#endif + XUngrabKey (spi_get_display (), + grab_mask->key_val, + grab_mask->mod_mask, + gdk_x11_get_default_root_xwindow ()); + + do_remove = TRUE; + } + else if (grab_mask->pending_add || re_issue_grab) + { + #ifdef SPI_DEBUG - fprintf (stderr, "mask=%lx\n", maskVal); -#endif - XGrabKey (spi_get_display (), - keyVal, - maskVal, - root_window, - True, - GrabModeAsync, - GrabModeAsync); - /* TODO: check call for errors and return FALSE if error occurs */ + fprintf (stderr, "grab %d with mask %x\n", grab_mask->key_val, grab_mask->mod_mask); +#endif + XGrabKey (spi_get_display (), + grab_mask->key_val, + grab_mask->mod_mask, + gdk_x11_get_default_root_xwindow (), + True, + GrabModeSync, + GrabModeSync); + XSync (spi_get_display (), False); + update_failed = spi_clear_error_state (); + if (update_failed) { + while (grab_mask->ref_count > 0) --grab_mask->ref_count; + do_remove = TRUE; + } + } + + grab_mask->pending_add = FALSE; + grab_mask->pending_remove = FALSE; + + if (do_remove) + { + g_assert (grab_mask->ref_count <= 0); + + controller->keygrabs_list = g_list_delete_link ( + controller->keygrabs_list, l); + + spi_grab_mask_free (grab_mask); + } + } - return TRUE; + + return ! update_failed; } /* @@ -613,29 +1443,37 @@ spi_controller_grab_keyboard (SpiDeviceEventController *controller) static void spi_device_event_controller_object_finalize (GObject *object) { + SpiDEController *controller; + DEControllerPrivateData *private; + controller = SPI_DEVICE_EVENT_CONTROLLER (object); #ifdef SPI_DEBUG fprintf(stderr, "spi_device_event_controller_object_finalize called\n"); #endif /* disconnect any special listeners, get rid of outstanding keygrabs */ - + XUngrabKey (spi_get_display (), AnyKey, AnyModifier, DefaultRootWindow (spi_get_display ())); + + private = g_object_get_data (G_OBJECT (controller), "spi-dec-private"); + if (private->xkb_desc) + XkbFreeKeyboard (private->xkb_desc, 0, True); + g_free (private); spi_device_event_controller_parent_class->finalize (object); } /* - * CORBA Accessibility::DeviceEventController::registerKeystrokeListener + * CORBA Accessibility::DEController::registerKeystrokeListener * method implementation */ -static void -impl_register_keystroke_listener (PortableServer_Servant servant, +static CORBA_boolean +impl_register_keystroke_listener (PortableServer_Servant servant, const Accessibility_DeviceEventListener l, - const Accessibility_KeySet *keys, + const Accessibility_KeySet *keys, const Accessibility_ControllerEventMask mask, - const Accessibility_KeyEventTypeSeq *type, - const Accessibility_EventListenerMode *mode, - CORBA_Environment *ev) + const Accessibility_EventTypeSeq *type, + const Accessibility_EventListenerMode *mode, + CORBA_Environment *ev) { - SpiDeviceEventController *controller = SPI_DEVICE_EVENT_CONTROLLER ( + SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER ( bonobo_object_from_servant (servant)); DEControllerKeyListener *dec_listener; #ifdef SPI_DEBUG @@ -643,111 +1481,365 @@ impl_register_keystroke_listener (PortableServer_Servant servant, (void *) l, (unsigned long) mask); #endif dec_listener = spi_dec_key_listener_new (l, keys, mask, type, mode, ev); - spi_controller_register_device_listener (controller, (DEControllerListener *) dec_listener, ev); + return spi_controller_register_device_listener ( + controller, (DEControllerListener *) dec_listener, ev); +} + + +/* + * CORBA Accessibility::DEController::registerDeviceEventListener + * method implementation + */ +static CORBA_boolean +impl_register_device_listener (PortableServer_Servant servant, + const Accessibility_DeviceEventListener l, + const Accessibility_EventTypeSeq *event_types, + CORBA_Environment *ev) +{ + SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER ( + bonobo_object_from_servant (servant)); + DEControllerListener *dec_listener; + + dec_listener = spi_dec_listener_new (l, event_types, ev); + return spi_controller_register_device_listener ( + controller, (DEControllerListener *) dec_listener, ev); +} + +typedef struct { + CORBA_Environment *ev; + DEControllerListener *listener; +} RemoveListenerClosure; + +static SpiReEntrantContinue +remove_listener_cb (GList * const *list, + gpointer user_data) +{ + DEControllerListener *listener = (*list)->data; + RemoveListenerClosure *ctx = user_data; + + if (CORBA_Object_is_equivalent (ctx->listener->object, + listener->object, ctx->ev)) + { + spi_re_entrant_list_delete_link (list); + spi_dec_listener_free (listener, ctx->ev); + } + + return SPI_RE_ENTRANT_CONTINUE; +} + +static SpiReEntrantContinue +copy_key_listener_cb (GList * const *list, + gpointer user_data) +{ + DEControllerKeyListener *key_listener = (*list)->data; + RemoveListenerClosure *ctx = user_data; + + if (CORBA_Object_is_equivalent (ctx->listener->object, + key_listener->listener.object, ctx->ev)) + { + /* TODO: FIXME aggregate keys in case the listener is registered twice */ + DEControllerKeyListener *ctx_key_listener = + (DEControllerKeyListener *) ctx->listener; + CORBA_free (ctx_key_listener->keys); + ctx_key_listener->keys = ORBit_copy_value (key_listener->keys, TC_Accessibility_KeySet); + } + + return SPI_RE_ENTRANT_CONTINUE; +} + +static void +spi_deregister_controller_device_listener (SpiDEController *controller, + DEControllerListener *listener, + CORBA_Environment *ev) +{ + RemoveListenerClosure ctx; + + ctx.ev = ev; + ctx.listener = listener; + + spi_re_entrant_list_foreach (&controller->mouse_listeners, + remove_listener_cb, &ctx); +} + +static void +spi_deregister_controller_key_listener (SpiDEController *controller, + DEControllerKeyListener *key_listener, + CORBA_Environment *ev) +{ + RemoveListenerClosure ctx; + + ctx.ev = ev; + ctx.listener = (DEControllerListener *) key_listener; + + /* special case, copy keyset from existing controller list entry */ + if (key_listener->keys->_length == 0) + { + spi_re_entrant_list_foreach (&controller->key_listeners, + copy_key_listener_cb, &ctx); + } + + spi_controller_deregister_global_keygrabs (controller, key_listener); + + spi_re_entrant_list_foreach (&controller->key_listeners, + remove_listener_cb, &ctx); + } /* - * CORBA Accessibility::DeviceEventController::deregisterKeystrokeListener + * CORBA Accessibility::DEController::deregisterKeystrokeListener * method implementation */ static void -impl_deregister_keystroke_listener (PortableServer_Servant servant, +impl_deregister_keystroke_listener (PortableServer_Servant servant, const Accessibility_DeviceEventListener l, - const Accessibility_KeySet *keys, + const Accessibility_KeySet *keys, const Accessibility_ControllerEventMask mask, - const Accessibility_KeyEventTypeSeq *type, - CORBA_Environment *ev) -{ - SpiDeviceEventController *controller = SPI_DEVICE_EVENT_CONTROLLER ( - bonobo_object_from_servant (servant)); - DEControllerKeyListener *key_listener = spi_dec_key_listener_new (l, - keys, - mask, - type, - NULL, - ev); + const Accessibility_EventTypeSeq *type, + CORBA_Environment *ev) +{ + DEControllerKeyListener *key_listener; + SpiDEController *controller; + + controller = SPI_DEVICE_EVENT_CONTROLLER (bonobo_object (servant)); + + key_listener = spi_dec_key_listener_new (l, keys, mask, type, NULL, ev); + #ifdef SPI_DEREGISTER_DEBUG - fprintf (stderr, "deregistering keystroke listener %p with maskVal %lu\n", - (void *) l, (unsigned long) mask->value); + fprintf (stderr, "deregistering keystroke listener %p with maskVal %lu\n", + (void *) l, (unsigned long) mask->value); #endif - spi_controller_deregister_device_listener(controller, - (DEControllerListener *) key_listener, - ev); - spi_dec_key_listener_free (key_listener, ev); + + spi_deregister_controller_key_listener (controller, key_listener, ev); + + spi_dec_listener_free ((DEControllerListener *) key_listener, ev); } /* - * CORBA Accessibility::DeviceEventController::registerMouseListener + * CORBA Accessibility::DEController::deregisterDeviceEventListener * method implementation */ -/* static void -impl_register_mouse_listener (PortableServer_Servant servant, - const Accessibility_MouseListener *l, - CORBA_Environment *ev) +impl_deregister_device_listener (PortableServer_Servant servant, + const Accessibility_DeviceEventListener l, + const Accessibility_EventTypeSeq *event_types, + CORBA_Environment *ev) { - SpiDeviceEventController *controller = SPI_DEVICE_EVENT_CONTROLLER ( - bonobo_object_from_servant (servant)); -#ifdef SPI_DEBUG - fprintf (stderr, "registering mouse listener %p\n", l); + SpiDEController *controller; + DEControllerListener *listener = + spi_dec_listener_new (l, event_types, ev); + + controller = SPI_DEVICE_EVENT_CONTROLLER (bonobo_object (servant)); + + spi_deregister_controller_device_listener (controller, listener, ev); + + spi_dec_listener_free (listener, ev); +} + +static unsigned int dec_xkb_get_slowkeys_delay (SpiDEController *controller) +{ + unsigned int retval = 0; + DEControllerPrivateData *priv = (DEControllerPrivateData *) + g_object_get_qdata (G_OBJECT (controller), spi_dec_private_quark); +#ifdef HAVE_XKB +#ifdef XKB_HAS_GET_SLOW_KEYS_DELAY + retval = XkbGetSlowKeysDelay (spi_get_display (), + XkbUseCoreKbd, &bounce_delay); +#else + if (!(priv->xkb_desc == (XkbDescPtr) BadAlloc || priv->xkb_desc == NULL)) + { + Status s = XkbGetControls (spi_get_display (), + XkbAllControlsMask, priv->xkb_desc); + if (s == Success) + { + if (priv->xkb_desc->ctrls->enabled_ctrls & XkbSlowKeysMask) + retval = priv->xkb_desc->ctrls->slow_keys_delay; + } + } +#endif #endif - spi_controller_register_device_listener(controller, DEVICE_TYPE_MOUSE, l, keys, mask, ev); +#ifdef SPI_XKB_DEBUG + fprintf (stderr, "SlowKeys delay: %d\n", (int) retval); +#endif + return retval; } -*/ -static KeyCode -keycode_for_keysym (long keysym) +static unsigned int dec_xkb_get_bouncekeys_delay (SpiDEController *controller) { - return XKeysymToKeycode (spi_get_display (), (KeySym) keysym); + unsigned int retval = 0; + DEControllerPrivateData *priv = (DEControllerPrivateData *) + g_object_get_qdata (G_OBJECT (controller), spi_dec_private_quark); +#ifdef HAVE_XKB +#ifdef XKB_HAS_GET_BOUNCE_KEYS_DELAY + retval = XkbGetBounceKeysDelay (spi_get_display (), + XkbUseCoreKbd, &bounce_delay); +#else + if (!(priv->xkb_desc == (XkbDescPtr) BadAlloc || priv->xkb_desc == NULL)) + { + Status s = XkbGetControls (spi_get_display (), + XkbAllControlsMask, priv->xkb_desc); + if (s == Success) + { + if (priv->xkb_desc->ctrls->enabled_ctrls & XkbBounceKeysMask) + retval = priv->xkb_desc->ctrls->debounce_delay; + } + } +#endif +#endif +#ifdef SPI_XKB_DEBUG + fprintf (stderr, "BounceKeys delay: %d\n", (int) retval); +#endif + return retval; +} + +static gboolean +dec_synth_keycode_press (SpiDEController *controller, + unsigned int keycode) +{ + unsigned int time = CurrentTime; + unsigned int bounce_delay; + unsigned int elapsed_msec; + struct timeval tv; + DEControllerPrivateData *priv = + (DEControllerPrivateData *) g_object_get_qdata (G_OBJECT (controller), + spi_dec_private_quark); + if (keycode == priv->last_release_keycode) + { + bounce_delay = dec_xkb_get_bouncekeys_delay (controller); + if (bounce_delay) + { + gettimeofday (&tv, NULL); + elapsed_msec = + (tv.tv_sec - priv->last_release_time.tv_sec) * 1000 + + (tv.tv_usec - priv->last_release_time.tv_usec) / 1000; +#ifdef SPI_XKB_DEBUG + fprintf (stderr, "%d ms elapsed (%ld usec)\n", elapsed_msec, + (long) (tv.tv_usec - priv->last_release_time.tv_usec)); +#endif +#ifdef THIS_IS_BROKEN + if (elapsed_msec < bounce_delay) + time = bounce_delay - elapsed_msec + 1; +#else + time = bounce_delay + 10; + /* fudge for broken XTest */ +#endif +#ifdef SPI_XKB_DEBUG + fprintf (stderr, "waiting %d ms\n", time); +#endif + } + } + XTestFakeKeyEvent (spi_get_display (), keycode, True, time); + priv->last_press_keycode = keycode; + XSync (spi_get_display (), False); + gettimeofday (&priv->last_press_time, NULL); + return TRUE; } -#define SPI_DEBUG +static gboolean +dec_synth_keycode_release (SpiDEController *controller, + unsigned int keycode) +{ + unsigned int time = CurrentTime; + unsigned int slow_delay; + unsigned int elapsed_msec; + struct timeval tv; + DEControllerPrivateData *priv = + (DEControllerPrivateData *) g_object_get_qdata (G_OBJECT (controller), + spi_dec_private_quark); + if (keycode == priv->last_press_keycode) + { + slow_delay = dec_xkb_get_slowkeys_delay (controller); + if (slow_delay) + { + gettimeofday (&tv, NULL); + elapsed_msec = + (tv.tv_sec - priv->last_press_time.tv_sec) * 1000 + + (tv.tv_usec - priv->last_press_time.tv_usec) / 1000; +#ifdef SPI_XKB_DEBUG + fprintf (stderr, "%d ms elapsed (%ld usec)\n", elapsed_msec, + (long) (tv.tv_usec - priv->last_press_time.tv_usec)); +#endif +#ifdef THIS_IS_BROKEN_DUNNO_WHY + if (elapsed_msec < slow_delay) + time = slow_delay - elapsed_msec + 1; +#else + time = slow_delay + 10; + /* our XTest seems broken, we have to add slop as above */ +#endif +#ifdef SPI_XKB_DEBUG + fprintf (stderr, "waiting %d ms\n", time); +#endif + } + } + XTestFakeKeyEvent (spi_get_display (), keycode, False, time); + priv->last_release_keycode = keycode; + XSync (spi_get_display (), False); + gettimeofday (&priv->last_release_time, NULL); + return TRUE; +} /* - * CORBA Accessibility::DeviceEventController::registerKeystrokeListener + * CORBA Accessibility::DEController::registerKeystrokeListener * method implementation */ static void -impl_generate_keyboard_event (PortableServer_Servant servant, - const CORBA_long keycode, - const CORBA_char *keystring, +impl_generate_keyboard_event (PortableServer_Servant servant, + const CORBA_long keycode, + const CORBA_char *keystring, const Accessibility_KeySynthType synth_type, - CORBA_Environment *ev) + CORBA_Environment *ev) { + SpiDEController *controller = + SPI_DEVICE_EVENT_CONTROLLER (bonobo_object (servant)); + DEControllerPrivateData *priv; long key_synth_code; + unsigned int slow_keys_delay; + unsigned int press_time; + unsigned int release_time; + #ifdef SPI_DEBUG - fprintf (stderr, "synthesizing keystroke %ld, type %d\n", (long) keycode, (int) synth_type); + fprintf (stderr, "synthesizing keystroke %ld, type %d\n", + (long) keycode, (int) synth_type); #endif /* TODO: hide/wrap/remove X dependency */ - /* TODO: be accessX-savvy so that keyrelease occurs after sufficient timeout */ - /* * TODO: when initializing, query for XTest extension before using, * and fall back to XSendEvent() if XTest is not available. */ /* TODO: implement keystring mode also */ - + gdk_error_trap_push (); + key_synth_code = keycode; + switch (synth_type) { case Accessibility_KEY_PRESS: - XTestFakeKeyEvent (spi_get_display (), (unsigned int) keycode, True, CurrentTime); - break; + dec_synth_keycode_press (controller, keycode); + break; case Accessibility_KEY_PRESSRELEASE: - XTestFakeKeyEvent (spi_get_display (), (unsigned int) keycode, True, CurrentTime); + dec_synth_keycode_press (controller, keycode); case Accessibility_KEY_RELEASE: - XTestFakeKeyEvent (spi_get_display (), (unsigned int) keycode, False, CurrentTime); - break; + dec_synth_keycode_release (controller, keycode); + break; case Accessibility_KEY_SYM: - key_synth_code = keycode_for_keysym (keycode); - XTestFakeKeyEvent (spi_get_display (), (unsigned int) key_synth_code, True, CurrentTime); - XTestFakeKeyEvent (spi_get_display (), (unsigned int) key_synth_code, False, CurrentTime); - break; - } +#ifdef SPI_XKB_DEBUG + fprintf (stderr, "KeySym synthesis\n"); +#endif + key_synth_code = keycode_for_keysym (keycode); + dec_synth_keycode_press (controller, key_synth_code); + dec_synth_keycode_release (controller, key_synth_code); + break; + case Accessibility_KEY_STRING: + fprintf (stderr, "Not yet implemented\n"); + break; + } + if (gdk_error_trap_pop ()) + { + DBG (-1, g_warning ("Error emitting keystroke")); + } } -/* Accessibility::DeviceEventController::generateMouseEvent */ +/* Accessibility::DEController::generateMouseEvent */ static void impl_generate_mouse_event (PortableServer_Servant servant, const CORBA_long x, @@ -755,91 +1847,175 @@ impl_generate_mouse_event (PortableServer_Servant servant, const CORBA_char *eventName, CORBA_Environment *ev) { + int button; + gboolean error = FALSE; + Display *display = spi_get_display (); #ifdef SPI_DEBUG - fprintf (stderr, "generating mouse %s event at %ld, %ld\n", eventName, x, y); + fprintf (stderr, "generating mouse %s event at %ld, %ld\n", + eventName, (long int) x, (long int) y); #endif + switch (eventName[0]) + { + case 'b': + switch (eventName[1]) + { + /* TODO: check number of buttons before parsing */ + case '1': + button = 1; + break; + case '2': + button = 2; + break; + case '3': + button = 3; + break; + default: + error = TRUE; + } + if (!error) + { + if (x != -1 && y != -1) + { + XTestFakeMotionEvent (display, DefaultScreen (display), + x, y, 0); + } + XTestFakeButtonEvent (display, button, !(eventName[2] == 'r'), 0); + if (eventName[2] == 'c') + XTestFakeButtonEvent (display, button, FALSE, 1); + else if (eventName[2] == 'd') + { + XTestFakeButtonEvent (display, button, FALSE, 1); + XTestFakeButtonEvent (display, button, TRUE, 2); + XTestFakeButtonEvent (display, button, FALSE, 3); + } + } + break; + case 'r': /* relative motion */ + XTestFakeRelativeMotionEvent (display, x, y, 0); + break; + case 'a': /* absolute motion */ + XTestFakeMotionEvent (display, DefaultScreen (display), + x, y, 0); + break; + } } -/* Accessibility::DeviceEventController::notifyListenersSync */ +/* Accessibility::DEController::notifyListenersSync */ static CORBA_boolean -impl_notify_listeners_sync(PortableServer_Servant servant, - const Accessibility_DeviceEvent *event, - CORBA_Environment *ev) +impl_notify_listeners_sync (PortableServer_Servant servant, + const Accessibility_DeviceEvent *event, + CORBA_Environment *ev) { - SpiDeviceEventController *controller = SPI_DEVICE_EVENT_CONTROLLER ( - bonobo_object_from_servant (servant)); + SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER ( + bonobo_object_from_servant (servant)); #ifdef SPI_DEBUG - g_print ("notifylistening listeners synchronously: controller %x, event id %d\n", - (void *) controller, (int) event->id); + g_print ("notifylistening listeners synchronously: controller %p, event id %d\n", + controller, (int) event->id); #endif - return (spi_notify_keylisteners (controller->key_listeners, event, CORBA_FALSE, ev) ? - CORBA_TRUE : CORBA_FALSE); + return spi_controller_notify_keylisteners (controller, event, CORBA_FALSE, ev) ? + CORBA_TRUE : CORBA_FALSE; } -/* Accessibility::DeviceEventController::notifyListenersAsync */ +/* Accessibility::DEController::notifyListenersAsync */ static void -impl_notify_listeners_async (PortableServer_Servant servant, +impl_notify_listeners_async (PortableServer_Servant servant, const Accessibility_DeviceEvent *event, - CORBA_Environment *ev) + CORBA_Environment *ev) { - SpiDeviceEventController *controller = SPI_DEVICE_EVENT_CONTROLLER( - bonobo_object_from_servant (servant)); + SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER ( + bonobo_object_from_servant (servant)); #ifdef SPI_DEBUG fprintf (stderr, "notifying listeners asynchronously\n"); #endif - spi_notify_keylisteners (controller->key_listeners, event, CORBA_FALSE, ev); + spi_controller_notify_keylisteners (controller, event, CORBA_FALSE, ev); } static void -spi_device_event_controller_class_init (SpiDeviceEventControllerClass *klass) +spi_device_event_controller_class_init (SpiDEControllerClass *klass) { - GObjectClass * object_class = (GObjectClass *) klass; - POA_Accessibility_DeviceEventController__epv *epv = &klass->epv; - spi_device_event_controller_parent_class = g_type_class_peek_parent (klass); + GObjectClass * object_class = (GObjectClass *) klass; + POA_Accessibility_DeviceEventController__epv *epv = &klass->epv; - object_class->finalize = spi_device_event_controller_object_finalize; - - epv->registerKeystrokeListener = impl_register_keystroke_listener; - epv->deregisterKeystrokeListener = impl_deregister_keystroke_listener; -/* epv->registerMouseListener = impl_register_mouse_listener; */ - epv->generateKeyboardEvent = impl_generate_keyboard_event; - epv->generateMouseEvent = impl_generate_mouse_event; - epv->notifyListenersSync = impl_notify_listeners_sync; - epv->notifyListenersAsync = impl_notify_listeners_async; - klass->check_key_event = spi_check_key_event; + spi_device_event_controller_parent_class = g_type_class_peek_parent (klass); + + object_class->finalize = spi_device_event_controller_object_finalize; + + epv->registerKeystrokeListener = impl_register_keystroke_listener; + epv->deregisterKeystrokeListener = impl_deregister_keystroke_listener; + epv->registerDeviceEventListener = impl_register_device_listener; + epv->deregisterDeviceEventListener = impl_deregister_device_listener; + epv->generateKeyboardEvent = impl_generate_keyboard_event; + epv->generateMouseEvent = impl_generate_mouse_event; + epv->notifyListenersSync = impl_notify_listeners_sync; + epv->notifyListenersAsync = impl_notify_listeners_async; + + if (!spi_dec_private_quark) + spi_dec_private_quark = g_quark_from_static_string ("spi-dec-private"); } static void -spi_device_event_controller_init (SpiDeviceEventController *device_event_controller) +spi_device_event_controller_init (SpiDEController *device_event_controller) { - device_event_controller->key_listeners = NULL; + DEControllerPrivateData *private; + device_event_controller->key_listeners = NULL; device_event_controller->mouse_listeners = NULL; - device_event_controller->keygrabs_list = NULL; - kbd_registered = spi_controller_register_with_devices (device_event_controller); + device_event_controller->keygrabs_list = NULL; + + private = g_new0 (DEControllerPrivateData, 1); + gettimeofday (&private->last_press_time, NULL); + gettimeofday (&private->last_release_time, NULL); + g_object_set_qdata (G_OBJECT (device_event_controller), + spi_dec_private_quark, + private); + spi_controller_register_with_devices (device_event_controller); } -gboolean -spi_device_event_controller_check_key_event (SpiDeviceEventController *controller) +static void +spi_device_event_controller_forward_key_event (SpiDEController *controller, + const XEvent *event) { - SpiDeviceEventControllerClass *klass = SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS (controller); - if (klass->check_key_event) - return (klass->check_key_event) (controller); - return FALSE; + gboolean is_consumed = FALSE; + CORBA_Environment ev; + Accessibility_DeviceEvent key_event; + + g_assert (event->type == KeyPress || event->type == KeyRelease); + + CORBA_exception_init (&ev); + + key_event = spi_keystroke_from_x_key_event ((XKeyEvent *) event); + + spi_controller_update_key_grabs (controller, &key_event); + + /* relay to listeners, and decide whether to consume it or not */ + is_consumed = spi_controller_notify_keylisteners ( + controller, &key_event, CORBA_TRUE, &ev); + + if (is_consumed) + { + XAllowEvents (spi_get_display (), AsyncKeyboard, CurrentTime); + } + else + { + XAllowEvents (spi_get_display (), ReplayKeyboard, CurrentTime); + } } -SpiDeviceEventController * -spi_device_event_controller_new (void *registryp) +SpiDEController * +spi_device_event_controller_new (SpiRegistry *registry) { - BonoboObject *registry = (BonoboObject *) registryp; - SpiDeviceEventController *retval = g_object_new ( - SPI_DEVICE_EVENT_CONTROLLER_TYPE, NULL); - retval->registry = registry; - bonobo_object_ref (registry); + SpiDEController *retval = g_object_new ( + SPI_DEVICE_EVENT_CONTROLLER_TYPE, NULL); + DEControllerPrivateData *private; + + retval->registry = SPI_REGISTRY (bonobo_object_ref ( + BONOBO_OBJECT (registry))); + + spi_dec_init_mouse_listener (registry); + /* TODO: kill mouse listener on finalize */ return retval; } -BONOBO_TYPE_FUNC_FULL (SpiDeviceEventController, +BONOBO_TYPE_FUNC_FULL (SpiDEController, Accessibility_DeviceEventController, PARENT_TYPE, spi_device_event_controller); -