X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=registryd%2Fdeviceeventcontroller.c;h=fedf92798c9b241f0b530aa76371277623e999c8;hb=60048931e054a39120edba1cb6531d72e803be60;hp=0f3e15850c7eb127f8e6fbdff59ae23bb43ae2b8;hpb=325fd7f97234337f29be68c1c3af18c70f8775d9;p=platform%2Fupstream%2Fat-spi2-core.git diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c index 0f3e158..fedf927 100644 --- a/registryd/deviceeventcontroller.c +++ b/registryd/deviceeventcontroller.c @@ -34,70 +34,51 @@ #include #include -#include -#include -#include -#define XK_MISCELLANY -#define XK_LATIN1 -#include - -#ifdef HAVE_XEVIE -#include -#include -#include -#endif /* HAVE_XEVIE */ - #include -#include -#include /* TODO: hide dependency (wrap in single porting file) */ -#include -#include -#include -#include +#include -#include +#include "paths.h" +#include "keymasks.h" +#include "de-types.h" +#include "de-marshaller.h" +#ifdef HAVE_X11 +#include "display.h" +#include "event-source.h" +#endif #include "deviceeventcontroller.h" #include "reentrant-list.h" -KeySym ucs2keysym (long ucs); -long keysym2ucs(KeySym keysym); +#include "introspection.h" #define CHECK_RELEASE_DELAY 20 #define BIT(c, x) (c[x/8]&(1<<(x%8))) -static guint check_release_handler = 0; -static Accessibility_DeviceEvent pressed_event; -static SpiDEController *saved_controller; -static void wait_for_release_event (XEvent *event, SpiDEController *controller); +static SpiDEController *saved_controller; /* Our parent Gtk object type */ #define PARENT_TYPE G_TYPE_OBJECT /* A pointer to our parent object class */ static int spi_error_code = 0; -static GdkPoint last_mouse_pos_static = {0, 0}; -static GdkPoint *last_mouse_pos = &last_mouse_pos_static; +struct _SpiPoint { + gint x; + gint y; +}; +typedef struct _SpiPoint SpiPoint; static unsigned int mouse_mask_state = 0; -static unsigned int mouse_button_mask = - Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask; +#ifdef HAVE_X11 static unsigned int key_modifier_mask = Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask | ShiftMask | LockMask | ControlMask | SPI_KEYMASK_NUMLOCK; static unsigned int _numlock_physical_mask = Mod2Mask; /* a guess, will be reset */ - -static GQuark spi_dec_private_quark = 0; -static XModifierKeymap* xmkeymap = NULL; +#else +static unsigned int key_modifier_mask = 255; +static unsigned int _numlock_physical_mask = (1<<4); +#endif static gboolean have_mouse_listener = FALSE; static gboolean have_mouse_event_listener = FALSE; -static int (*x_default_error_handler) (Display *display, XErrorEvent *error_event); - -typedef enum { - SPI_DEVICE_TYPE_KBD, - SPI_DEVICE_TYPE_MOUSE, - SPI_DEVICE_TYPE_LAST_DEFINED -} SpiDeviceTypeCategory; typedef struct { guint ref_count : 30; @@ -108,63 +89,161 @@ typedef struct { dbus_uint32_t key_val; /* KeyCode */ } DEControllerGrabMask; -typedef struct { - char *bus_name; - char *path; - SpiDeviceTypeCategory type; - gulong types; -} DEControllerListener; - -typedef struct { - DEControllerListener listener; - - GSList *keys; - Accessibility_ControllerEventMask mask; - 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; - KeyCode reserved_keycode; - KeySym reserved_keysym; - guint reserved_reset_timeout; -} DEControllerPrivateData; - -static void spi_controller_register_with_devices (SpiDEController *controller); -static gboolean spi_controller_update_key_grabs (SpiDEController *controller, +gboolean spi_controller_update_key_grabs (SpiDEController *controller, Accessibility_DeviceEvent *recv); -static gboolean spi_controller_register_device_listener (SpiDEController *controller, - DEControllerListener *l); -static gboolean spi_device_event_controller_forward_key_event (SpiDEController *controller, - const XEvent *event); -static void spi_controller_deregister_device_listener (SpiDEController *controller, - DEControllerListener *listener); -static void spi_deregister_controller_key_listener (SpiDEController *controller, - DEControllerKeyListener *key_listener); -static gboolean spi_controller_notify_mouselisteners (SpiDEController *controller, - const Accessibility_DeviceEvent *event); - -static gboolean spi_eventtype_seq_contains_event (dbus_uint32_t types, - const Accessibility_DeviceEvent *event); -static gboolean spi_clear_error_state (void); -static gboolean spi_dec_poll_mouse_moved (gpointer data); + +static gboolean eventtype_seq_contains_event (dbus_uint32_t types, + const Accessibility_DeviceEvent *event); static gboolean spi_dec_poll_mouse_moving (gpointer data); static gboolean spi_dec_poll_mouse_idle (gpointer data); -#define spi_get_display() GDK_DISPLAY() - G_DEFINE_TYPE(SpiDEController, spi_device_event_controller, G_TYPE_OBJECT) +static gint +spi_dec_plat_get_keycode (SpiDEController *controller, + gint keysym, + gchar *key_str, + gboolean fix, + guint *modmask) +{ + SpiDEControllerClass *klass; + klass = SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS (controller); + if (klass->plat.get_keycode) + return klass->plat.get_keycode (controller, keysym, key_str, fix, modmask); + else + return keysym; +} + +static guint +spi_dec_plat_mouse_check (SpiDEController *controller, + int *x, int *y, gboolean *moved) +{ + SpiDEControllerClass *klass; + klass = SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS (controller); + if (klass->plat.mouse_check) + return klass->plat.mouse_check (controller, x, y, moved); + else + return 0; +} + +static gboolean +spi_dec_plat_grab_key (SpiDEController *controller, guint key_val, Accessibility_ControllerEventMask mod_mask) +{ + SpiDEControllerClass *klass; + klass = SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS (controller); + if (klass->plat.grab_key) + return klass->plat.grab_key (controller, key_val, mod_mask); + else + return FALSE; +} + +static void +spi_dec_plat_ungrab_key (SpiDEController *controller, guint key_val, Accessibility_ControllerEventMask mod_mask) +{ + SpiDEControllerClass *klass; + klass = SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS (controller); + if (klass->plat.ungrab_key) + klass->plat.ungrab_key (controller, key_val, mod_mask); +} + +static gboolean +spi_dec_plat_synth_keycode_press (SpiDEController *controller, + unsigned int keycode) +{ + SpiDEControllerClass *klass; + klass = SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS (controller); + if (klass->plat.synth_keycode_press) + return klass->plat.synth_keycode_press (controller, keycode); + else + return FALSE; +} + +static gboolean +spi_dec_plat_synth_keycode_release (SpiDEController *controller, + unsigned int keycode) +{ + SpiDEControllerClass *klass; + klass = SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS (controller); + if (klass->plat.synth_keycode_release) + return klass->plat.synth_keycode_release (controller, keycode); + else + return FALSE; +} + +static gboolean +spi_dec_plat_lock_modifiers (SpiDEController *controller, unsigned modifiers) +{ + SpiDEControllerClass *klass; + klass = SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS (controller); + if (klass->plat.lock_modifiers) + return klass->plat.lock_modifiers (controller, modifiers); + else + return FALSE; +} + +static gboolean +spi_dec_plat_unlock_modifiers (SpiDEController *controller, unsigned modifiers) +{ + SpiDEControllerClass *klass; + klass = SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS (controller); + if (klass->plat.unlock_modifiers) + return klass->plat.unlock_modifiers (controller, modifiers); + else + return FALSE; +} + +static gboolean +spi_dec_plat_synth_keystring (SpiDEController *controller, guint synth_type, gint keycode, const char *keystring) +{ + SpiDEControllerClass *klass; + klass = SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS (controller); + if (klass->plat.synth_keystring) + return klass->plat.synth_keystring (controller, synth_type, keycode, keystring); + else + return FALSE; +} + +static void +spi_dec_plat_emit_modifier_event (SpiDEController *controller, guint prev_mask, + guint current_mask) +{ + SpiDEControllerClass *klass; + klass = SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS (controller); + if (klass->plat.emit_modifier_event) + return klass->plat.emit_modifier_event (controller, prev_mask, current_mask); +} + +static void +spi_dec_plat_generate_mouse_event (SpiDEController *controller, + gint x, + gint y, + const char *eventName) +{ + SpiDEControllerClass *klass; + klass = SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS (controller); + if (klass->plat.generate_mouse_event) + return klass->plat.generate_mouse_event (controller, x, y, eventName); +} + +DBusMessage * +invalid_arguments_error (DBusMessage *message) +{ + DBusMessage *reply; + gchar *errmsg; + + errmsg= g_strdup_printf ( + "Method \"%s\" with signature \"%s\" on interface \"%s\" was supplied with invalid arguments\n", + dbus_message_get_member (message), + dbus_message_get_signature (message), + dbus_message_get_interface (message)); + reply = dbus_message_new_error (message, + DBUS_ERROR_INVALID_ARGS, + errmsg); + g_free (errmsg); + return reply; +} + /* Private methods */ static dbus_bool_t spi_dbus_add_disconnect_match (DBusConnection *bus, const char *name) @@ -176,7 +255,15 @@ spi_dbus_add_disconnect_match (DBusConnection *bus, const char *name) dbus_error_init (&error); dbus_bus_add_match (bus, match, &error); g_free (match); - return !dbus_error_is_set (&error); + if (dbus_error_is_set (&error)) + { + dbus_error_free (&error); + return FALSE; + } + else + { + return TRUE; + } } else return FALSE; } @@ -191,132 +278,19 @@ spi_dbus_remove_disconnect_match (DBusConnection *bus, const char *name) dbus_error_init (&error); dbus_bus_remove_match (bus, match, &error); g_free (match); - return !dbus_error_is_set (&error); + if (dbus_error_is_set (&error)) + { + dbus_error_free (&error); + return FALSE; + } + else + { + return TRUE; + } } else return FALSE; } -static unsigned int -keysym_mod_mask (KeySym keysym, KeyCode keycode) -{ - /* we really should use XKB and look directly at the keymap */ - /* this is very inelegant */ - Display *display = spi_get_display (); - unsigned int mods_rtn = 0; - unsigned int retval = 0; - KeySym sym_rtn; - - if (XkbLookupKeySym (display, keycode, 0, &mods_rtn, &sym_rtn) && - (sym_rtn == keysym)) { - retval = 0; - } - else if (XkbLookupKeySym (display, keycode, ShiftMask, &mods_rtn, &sym_rtn) && - (sym_rtn == keysym)) { - retval = ShiftMask; - } - else if (XkbLookupKeySym (display, keycode, Mod2Mask, &mods_rtn, &sym_rtn) && - (sym_rtn == keysym)) { - retval = Mod2Mask; - } - else if (XkbLookupKeySym (display, keycode, Mod3Mask, &mods_rtn, &sym_rtn) && - (sym_rtn == keysym)) { - retval = Mod3Mask; - } - else if (XkbLookupKeySym (display, keycode, - ShiftMask | Mod2Mask, &mods_rtn, &sym_rtn) && - (sym_rtn == keysym)) { - retval = (Mod2Mask | ShiftMask); - } - else if (XkbLookupKeySym (display, keycode, - ShiftMask | Mod3Mask, &mods_rtn, &sym_rtn) && - (sym_rtn == keysym)) { - retval = (Mod3Mask | ShiftMask); - } - else if (XkbLookupKeySym (display, keycode, - ShiftMask | Mod4Mask, &mods_rtn, &sym_rtn) && - (sym_rtn == keysym)) { - retval = (Mod4Mask | ShiftMask); - } - else - retval = 0xFFFF; - return retval; -} - -static gboolean -spi_dec_replace_map_keysym (DEControllerPrivateData *priv, KeyCode keycode, KeySym keysym) -{ -#ifdef HAVE_XKB - Display *dpy = spi_get_display (); - XkbDescPtr desc; - if (!(desc = XkbGetMap (dpy, XkbAllMapComponentsMask, XkbUseCoreKbd))) - { - fprintf (stderr, "ERROR getting map\n"); - } - XFlush (dpy); - XSync (dpy, False); - if (desc && desc->map) - { - gint offset = desc->map->key_sym_map[keycode].offset; - desc->map->syms[offset] = keysym; - } - else - { - fprintf (stderr, "Error changing key map: empty server structure\n"); - } - XkbSetMap (dpy, XkbAllMapComponentsMask, desc); - /** - * FIXME: the use of XkbChangeMap, and the reuse of the priv->xkb_desc structure, - * would be far preferable. - * HOWEVER it does not seem to work using XFree 4.3. - **/ - /* XkbChangeMap (dpy, priv->xkb_desc, priv->changes); */ - XFlush (dpy); - XSync (dpy, False); - XkbFreeKeyboard (desc, 0, TRUE); - - return TRUE; -#else - return FALSE; -#endif -} - -static gboolean -spi_dec_reset_reserved (gpointer data) -{ - DEControllerPrivateData *priv = data; - spi_dec_replace_map_keysym (priv, priv->reserved_keycode, priv->reserved_keysym); - priv->reserved_reset_timeout = 0; - return FALSE; -} - -static KeyCode -keycode_for_keysym (SpiDEController *controller, long keysym, unsigned int *modmask) -{ - KeyCode keycode = 0; - keycode = XKeysymToKeycode (spi_get_display (), (KeySym) keysym); - if (!keycode) - { - DEControllerPrivateData *priv = (DEControllerPrivateData *) - g_object_get_qdata (G_OBJECT (controller), spi_dec_private_quark); - /* if there's no keycode available, fix it */ - if (spi_dec_replace_map_keysym (priv, priv->reserved_keycode, keysym)) - { - keycode = priv->reserved_keycode; - /* - * queue a timer to restore the old keycode. Ugly, but required - * due to races / asynchronous X delivery. - * Long-term fix is to extend the X keymap here instead of replace entries. - */ - priv->reserved_reset_timeout = g_timeout_add (500, spi_dec_reset_reserved, priv); - } - *modmask = 0; - return keycode; - } - if (modmask) - *modmask = keysym_mod_mask (keysym, keycode); - return keycode; -} - static DEControllerGrabMask * spi_grab_mask_clone (DEControllerGrabMask *grab_mask) { @@ -353,232 +327,35 @@ spi_grab_mask_compare_values (gconstpointer p1, gconstpointer p2) } } -static void -spi_dec_set_unlatch_pending (SpiDEController *controller, unsigned mask) -{ - 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", - priv->xkb_latch_mask); -#endif - priv->pending_xkb_mod_relatch_mask |= priv->xkb_latch_mask; -} - -static void -spi_dec_clear_unlatch_pending (SpiDEController *controller) -{ - DEControllerPrivateData *priv = - g_object_get_qdata (G_OBJECT (controller), spi_dec_private_quark); - priv->xkb_latch_mask = 0; -} - -static void emit(SpiDEController *controller, const char *interface, const char *name, int a1, int a2) +void +spi_dec_dbus_emit (SpiDEController *controller, const char *interface, + const char *name, const char *minor, int a1, int a2) { DBusMessage *signal = NULL; - DBusMessageIter iter, iter_variant; + DBusMessageIter iter, iter_struct, iter_variant; int nil = 0; - const char *minor = ""; - const char *path = SPI_DBUS_PATH_DESKTOP; + const char *path = SPI_DBUS_PATH_ROOT; + const char *bus_name = dbus_bus_get_unique_name (controller->bus); signal = dbus_message_new_signal (path, interface, name); dbus_message_iter_init_append (signal, &iter); dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &minor); - dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &a1); - dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &a2); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &a1); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &a2); dbus_message_iter_open_container (&iter, DBUS_TYPE_VARIANT, "i", &iter_variant); dbus_message_iter_append_basic (&iter_variant, DBUS_TYPE_INT32, &nil); dbus_message_iter_close_container (&iter, &iter_variant); - dbus_connection_send (controller->bus, signal, NULL); -} + dbus_message_iter_open_container (&iter, DBUS_TYPE_STRUCT, NULL, + &iter_struct); + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &bus_name); + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, &path); + dbus_message_iter_close_container (&iter, &iter_struct); -static gboolean -spi_dec_button_update_and_emit (SpiDEController *controller, - guint mask_return) -{ - Accessibility_DeviceEvent mouse_e; - gchar event_detail[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_detail, 22, "%d%c", button_number, - (is_down) ? 'p' : 'r'); - /* TODO: FIXME 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 = (dbus_uint16_t) mouse_mask_state; - mouse_e.timestamp = 0; - mouse_e.event_string = ""; - mouse_e.is_text = FALSE; - is_consumed = - spi_controller_notify_mouselisteners (controller, - &mouse_e); - if (!is_consumed) - { - dbus_uint32_t x = last_mouse_pos->x, y = last_mouse_pos->y; - emit(controller, SPI_DBUS_INTERFACE_EVENT_MOUSE, "button", x, y); - } - else - spi_dec_set_unlatch_pending (controller, mask_return); - } - return TRUE; - } - else - { - return FALSE; - } -} - - -static guint -spi_dec_mouse_check (SpiDEController *controller, - int *x, int *y, gboolean *moved) -{ - 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) - { - // TODO: combine these two signals? - dbus_uint32_t ix = *x, iy = *y; - emit(controller, SPI_DBUS_INTERFACE_EVENT_MOUSE, "abs", ix, iy); - ix -= last_mouse_pos->x; - iy -= last_mouse_pos->y; - emit(controller, SPI_DBUS_INTERFACE_EVENT_MOUSE, "rel", ix, iy); - last_mouse_pos->x = *x; - last_mouse_pos->y = *y; - *moved = True; - } - else - { - *moved = False; - } - - return mask_return; -} - -static void -spi_dec_emit_modifier_event (SpiDEController *controller, guint prev_mask, - guint current_mask) -{ - dbus_uint32_t d1, d2; - -#ifdef SPI_XKB_DEBUG - fprintf (stderr, "MODIFIER CHANGE EVENT! %x to %x\n", - prev_mask, current_mask); -#endif - - /* set bits for the virtual modifiers like NUMLOCK */ - if (prev_mask & _numlock_physical_mask) - prev_mask |= SPI_KEYMASK_NUMLOCK; - if (current_mask & _numlock_physical_mask) - current_mask |= SPI_KEYMASK_NUMLOCK; - - d1 = prev_mask & key_modifier_mask; - d2 = current_mask & key_modifier_mask; - emit(controller, SPI_DBUS_INTERFACE_EVENT_KEYBOARD, "modifiers", d1, d2); + dbus_connection_send (controller->bus, signal, NULL); + dbus_message_unref (signal); } static gboolean @@ -589,12 +366,12 @@ spi_dec_poll_mouse_moved (gpointer data) gboolean moved; guint mask_return; - mask_return = spi_dec_mouse_check (controller, &x, &y, &moved); + mask_return = spi_dec_plat_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); + spi_dec_plat_emit_modifier_event (controller, mouse_mask_state, mask_return); mouse_mask_state = mask_return; } @@ -610,7 +387,9 @@ spi_dec_poll_mouse_idle (gpointer data) return TRUE; else { - g_timeout_add (20, spi_dec_poll_mouse_moving, data); + guint id; + id = g_timeout_add (20, spi_dec_poll_mouse_moving, data); + g_source_set_name_by_id (id, "[at-spi2-core] spi_dec_poll_mouse_moving"); return FALSE; } } @@ -624,50 +403,13 @@ spi_dec_poll_mouse_moving (gpointer data) return TRUE; else { - g_timeout_add (100, spi_dec_poll_mouse_idle, data); + guint id; + id = g_timeout_add (100, spi_dec_poll_mouse_idle, data); + g_source_set_name_by_id (id, "[at-spi2-core] check_release"); return FALSE; } } -#ifdef WE_NEED_UGRAB_MOUSE -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; -} -#endif - -static void -spi_dec_init_mouse_listener (SpiDEController *dec) -{ -#ifdef GRAB_BUTTON - Display *display = spi_get_display (); - - if (display) - { - if (XGrabButton (display, AnyButton, AnyModifier, - gdk_x11_get_default_root_xwindow (), - True, ButtonPressMask | ButtonReleaseMask, - GrabModeSync, GrabModeAsync, None, None) != Success) { -#ifdef SPI_DEBUG - fprintf (stderr, "WARNING: could not grab mouse buttons!\n"); -#endif - ; - } - XSync (display, False); -#ifdef SPI_DEBUG - fprintf (stderr, "mouse buttons grabbed\n"); -#endif - } -#endif -} - /** * Eventually we can use this to make the marshalling of mask types * more sane, but for now we just use this to detect @@ -808,6 +550,8 @@ spi_key_listener_data_free (DEControllerKeyListener *key_listener) { keylist_free(key_listener->keys); if (key_listener->mode) g_free(key_listener->mode); + g_free (key_listener->listener.bus_name); + g_free (key_listener->listener.path); g_free (key_listener); } @@ -828,10 +572,13 @@ spi_listener_clone_free (DEControllerListener *clone) static void spi_dec_listener_free (DEControllerListener *listener) { - g_free (listener->bus_name); - g_free (listener->path); if (listener->type == SPI_DEVICE_TYPE_KBD) spi_key_listener_data_free ((DEControllerKeyListener *) listener); + else + { + g_free (listener->bus_name); + g_free (listener->path); + } } static void @@ -892,7 +639,12 @@ handle_keygrab (SpiDEController *controller, grab_mask.mod_mask = key_listener->mask; if (g_slist_length (key_listener->keys) == 0) /* special case means AnyKey/AllKeys */ { +#ifdef HAVE_X11 grab_mask.key_val = AnyKey; +#else + grab_mask.key_val = 0L; +#endif + #ifdef SPI_DEBUG fprintf (stderr, "AnyKey grab!"); #endif @@ -905,20 +657,10 @@ handle_keygrab (SpiDEController *controller, for (l = key_listener->keys; l; l = g_slist_next(l)) { Accessibility_KeyDefinition *keydef = l->data; - long int key_val = keydef->keysym; - /* X Grabs require keycodes, not keysyms */ - if (keydef->keystring && keydef->keystring[0]) - { - key_val = XStringToKeysym(keydef->keystring); - } - if (key_val > 0) - { - key_val = XKeysymToKeycode (spi_get_display (), (KeySym) key_val); - } - else - { - key_val = keydef->keycode; - } + long key_val; + key_val = spi_dec_plat_get_keycode (controller, keydef->keysym, keydef->keystring, FALSE, NULL); + if (!key_val) + key_val = keydef->keycode; grab_mask.key_val = key_val; process_cb (controller, &grab_mask); } @@ -930,10 +672,7 @@ spi_controller_register_global_keygrabs (SpiDEController *controller, DEControllerKeyListener *key_listener) { handle_keygrab (controller, key_listener, _register_keygrab); - if (controller->xevie_display == NULL) - return spi_controller_update_key_grabs (controller, NULL); - else - return TRUE; + return spi_controller_update_key_grabs (controller, NULL); } static void @@ -941,8 +680,136 @@ spi_controller_deregister_global_keygrabs (SpiDEController *controller, DEControllerKeyListener *key_listener) { handle_keygrab (controller, key_listener, _deregister_keygrab); - if (controller->xevie_display == NULL) - spi_controller_update_key_grabs (controller, NULL); + spi_controller_update_key_grabs (controller, NULL); +} + +static void +append_keystroke_listener (DBusMessageIter *iter, DEControllerKeyListener *listener) +{ + dbus_uint32_t d_uint; + DBusMessageIter iter_struct, iter_subarray, iter_substruct; + GSList *kl; + + if (!dbus_message_iter_open_container (iter, DBUS_TYPE_STRUCT, NULL, + &iter_struct)) + return; + + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, + &listener->listener.bus_name); + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, + &listener->listener.path); + d_uint = listener->listener.type; + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_UINT32, &d_uint); + d_uint = listener->listener.types; + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_UINT32, &d_uint); + if (!dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, + "(iisi)", &iter_subarray)) + { + dbus_message_iter_close_container (iter, &iter_struct); + return; + } + for (kl = listener->keys; kl; kl = kl->next) + { + Accessibility_KeyDefinition *kd = kl->data; + if (!dbus_message_iter_open_container (&iter_subarray, DBUS_TYPE_STRUCT, + NULL, &iter_substruct)) + break; + dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_INT32, &kd->keycode); + dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_INT32, &kd->keysym); + dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_STRING, &kd->keystring); + dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_INT32, &kd->unused); + dbus_message_iter_close_container (&iter_subarray, &iter_substruct); + } + dbus_message_iter_close_container (&iter_struct, &iter_subarray); + d_uint = listener->mask; + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_UINT32, &d_uint); + if (dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_STRUCT, + NULL, &iter_substruct)) + { + if (listener->mode) + { + dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_BOOLEAN, + &listener->mode->synchronous); + dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_BOOLEAN, + &listener->mode->preemptive); + dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_BOOLEAN, + &listener->mode->global); + } + else + { + dbus_bool_t dummy_val = FALSE; + dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_BOOLEAN, + &dummy_val); + dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_BOOLEAN, + &dummy_val); + dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_BOOLEAN, + &dummy_val); + } + dbus_message_iter_close_container (&iter_struct, &iter_substruct); + } + dbus_message_iter_close_container (iter, &iter_struct); +} + +static void +notify_keystroke_listener (SpiDEController *controller, + DEControllerKeyListener *listener, + gboolean enable) +{ + const char *path = SPI_DBUS_PATH_DEC; + const char *interface = SPI_DBUS_INTERFACE_DEVICE_EVENT_LISTENER; + const char *name = (enable + ? "KeystrokeListenerRegistered" + : "KeystrokeListenerDeregistered"); + DBusMessage *signal; + DBusMessageIter iter; + + signal = dbus_message_new_signal (path, interface, name); + if (!signal) + return; + dbus_message_iter_init_append (signal, &iter); + append_keystroke_listener (&iter, listener); + dbus_connection_send (controller->bus, signal, NULL); + dbus_message_unref (signal); +} + +static void +append_mouse_listener (DBusMessageIter *iter, DEControllerListener *listener) +{ + DBusMessageIter iter_struct; + dbus_uint32_t d_uint; + + if (!dbus_message_iter_open_container (iter, DBUS_TYPE_STRUCT, NULL, + &iter_struct)) + return; + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, + &listener->bus_name); + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, + &listener->path); + d_uint = listener->types; + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_UINT32, &d_uint); + dbus_message_iter_close_container (iter, &iter_struct); +} + +static void +notify_mouse_listener (SpiDEController *controller, + DEControllerListener *listener, + gboolean enable) +{ + const char *path = SPI_DBUS_PATH_DEC; + const char *interface = SPI_DBUS_INTERFACE_DEVICE_EVENT_LISTENER; + const char *name = (enable + ? "DeviceListenerRegistered" + : "DeviceListenerDeregistered"); + DBusMessage *signal; + DBusMessageIter iter; + + signal = dbus_message_new_signal (path, interface, name); + if (!signal) + return; + dbus_message_iter_init_append (signal, &iter); + append_mouse_listener (&iter, listener); + dbus_connection_send (controller->bus, signal, NULL); + dbus_message_unref (signal); } static gboolean @@ -950,6 +817,7 @@ spi_controller_register_device_listener (SpiDEController *controller, DEControllerListener *listener) { DEControllerKeyListener *key_listener; + gboolean retval; switch (listener->type) { case SPI_DEVICE_TYPE_KBD: @@ -960,20 +828,26 @@ spi_controller_register_device_listener (SpiDEController *controller, spi_dbus_add_disconnect_match (controller->bus, key_listener->listener.bus_name); if (key_listener->mode->global) { - return spi_controller_register_global_keygrabs (controller, key_listener); + retval = spi_controller_register_global_keygrabs (controller, key_listener); } else - return TRUE; + retval = TRUE; + if (retval) + notify_keystroke_listener (controller, key_listener, TRUE); break; case SPI_DEVICE_TYPE_MOUSE: controller->mouse_listeners = g_list_prepend (controller->mouse_listeners, listener); if (!have_mouse_listener) { have_mouse_listener = TRUE; - if (!have_mouse_event_listener) - g_timeout_add (100, spi_dec_poll_mouse_idle, controller->registry); + if (!have_mouse_event_listener) { + guint id; + id = g_timeout_add (100, spi_dec_poll_mouse_idle, controller); + g_source_set_name_by_id (id, "[at-spi2-core] spi_dec_poll_mouse_idle"); + } } spi_dbus_add_disconnect_match (controller->bus, listener->bus_name); + notify_mouse_listener (controller, listener, TRUE); break; default: break; @@ -981,414 +855,222 @@ spi_controller_register_device_listener (SpiDEController *controller, return FALSE; } -static gboolean -Accessibility_DeviceEventListener_notifyEvent(SpiDEController *controller, - SpiRegistry *registry, - DEControllerListener *listener, - const Accessibility_DeviceEvent *key_event) +static void +set_reply (DBusPendingCall *pending, void *user_data) { - DBusMessage *message = dbus_message_new_method_call(listener->bus_name, - listener->path, - SPI_DBUS_INTERFACE_DEVICE_EVENT_LISTENER, - "notifyEvent"); - DBusError error; - dbus_bool_t consumed = FALSE; + void **replyptr = (void **)user_data; - dbus_error_init(&error); - if (spi_dbus_marshal_deviceEvent(message, key_event)) + *replyptr = dbus_pending_call_steal_reply (pending); +} + +static GSList *hung_processes = NULL; + +static void +reset_hung_process (DBusPendingCall *pending, void *data) +{ + DBusMessage *message = data; + const char *dest = dbus_message_get_destination (message); + GSList *l; + + /* At this point we don't care about the result */ + dbus_pending_call_unref (pending); + + for (l = hung_processes; l; l = l->next) { - // TODO: Evaluate performance: perhaps rework this whole architecture - // to avoid blocking calls - DBusMessage *reply = dbus_connection_send_with_reply_and_block(controller->bus, message, 1000, &error); - if (reply) + if (!strcmp (l->data, dest)) { - DBusError error; - dbus_error_init(&error); - dbus_message_get_args(reply, &error, DBUS_TYPE_BOOLEAN, &consumed, DBUS_TYPE_INVALID); - dbus_message_unref(reply); + g_free (l->data); + hung_processes = g_slist_remove (hung_processes, l->data); + break; } } - dbus_message_unref(message); - return consumed; } -static gboolean -spi_controller_notify_mouselisteners (SpiDEController *controller, - const Accessibility_DeviceEvent *event) +static gint +time_elapsed (struct timeval *origin) { - GList *l; - GSList *notify = NULL, *l2; - GList **listeners = &controller->mouse_listeners; - gboolean is_consumed; -#ifdef SPI_KEYEVENT_DEBUG - gboolean found = FALSE; -#endif - if (!listeners) - { - return FALSE; - } + struct timeval tv; - for (l = *listeners; l; l = l->next) - { - DEControllerListener *listener = l->data; + gettimeofday (&tv, NULL); + return (tv.tv_sec - origin->tv_sec) * 1000 + (tv.tv_usec - origin->tv_usec) / 1000; +} - if (spi_eventtype_seq_contains_event (listener->types, event)) - { - /* we clone (don't dup) the listener, to avoid refcount inc. */ - notify = g_slist_prepend (notify, - spi_listener_clone (listener)); -#ifdef SPI_KEYEVENT_DEBUG - found = TRUE; -#endif - } - } +static void +reset_hung_process_from_ping (DBusPendingCall *pending, void *data) +{ + GSList *l; -#ifdef SPI_KEYEVENT_DEBUG - if (!found) + for (l = hung_processes; l; l = l->next) + { + if (!strcmp (l->data, data)) { - g_print ("no match for event\n"); + g_free (l->data); + hung_processes = g_slist_remove (hung_processes, l->data); + break; } -#endif - - is_consumed = FALSE; - for (l2 = notify; l2 && !is_consumed; l2 = l2->next) - { - DEControllerListener *listener = l2->data; + } + g_free (data); + dbus_pending_call_unref (pending); +} - is_consumed = Accessibility_DeviceEventListener_notifyEvent (controller, controller->registry, listener, event); +static DBusMessage * +send_and_allow_reentry (DBusConnection *bus, DBusMessage *message, int timeout, DBusError *error) +{ + DBusPendingCall *pending; + DBusMessage *reply = NULL; + struct timeval tv; - spi_listener_clone_free ((DEControllerListener *) l2->data); + if (!dbus_connection_send_with_reply (bus, message, &pending, -1)) + { + return NULL; } - - for (; l2; l2 = l2->next) + dbus_pending_call_set_notify (pending, set_reply, (void *)&reply, NULL); + gettimeofday (&tv, NULL); + while (!reply) { - DEControllerListener *listener = l2->data; - spi_listener_clone_free (listener); - /* clone doesn't have its own ref, so don't use spi_device_listener_free */ + if (!dbus_connection_read_write_dispatch (bus, timeout) || + time_elapsed (&tv) > timeout) + { + const char *dest = dbus_message_get_destination (message); + GSList *l; + dbus_bool_t result; + gchar *bus_name_dup; + dbus_message_ref (message); + dbus_pending_call_set_notify (pending, reset_hung_process, message, + (DBusFreeFunction) dbus_message_unref); + message = dbus_message_new_method_call (dest, "/", + "org.freedesktop.DBus.Peer", + "Ping"); + if (!message) + return NULL; + result = dbus_connection_send_with_reply (bus, message, &pending, -1); + dbus_message_unref (message); + if (!result || !pending) + return NULL; + bus_name_dup = g_strdup (dest); + dbus_pending_call_set_notify (pending, reset_hung_process_from_ping, + bus_name_dup, NULL); + for (l = hung_processes; l; l = l->next) + if (!strcmp (l->data, dest)) + return NULL; + hung_processes = g_slist_prepend (hung_processes, g_strdup (dest)); + return NULL; + } } - - g_slist_free (notify); - -#ifdef SPI_DEBUG - if (is_consumed) g_message ("consumed\n"); -#endif - return is_consumed; + dbus_pending_call_unref (pending); + return reply; } - -static void -spi_device_event_controller_forward_mouse_event (SpiDEController *controller, - XEvent *xevent) +static gboolean +Accessibility_DeviceEventListener_NotifyEvent(SpiDEController *controller, + SpiRegistry *registry, + DEControllerListener *listener, + const Accessibility_DeviceEvent *key_event) { - Accessibility_DeviceEvent mouse_e; - gchar event_detail[24]; - gboolean is_consumed = FALSE; - gboolean xkb_mod_unlatch_occurred; - XButtonEvent *xbutton_event = (XButtonEvent *) xevent; - dbus_uint32_t ix, iy; - - int button = xbutton_event->button; - - unsigned int mouse_button_state = xbutton_event->state; + DBusMessage *message = dbus_message_new_method_call(listener->bus_name, + listener->path, + SPI_DBUS_INTERFACE_DEVICE_EVENT_LISTENER, + "NotifyEvent"); + dbus_bool_t consumed = FALSE; + GSList *l; + gboolean hung = FALSE; - switch (button) + for (l = hung_processes; l; l = l->next) + { + if (!strcmp (l->data, listener->bus_name)) { - 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; + dbus_message_set_no_reply (message, TRUE); + hung = TRUE; + break; } + } - last_mouse_pos->x = ((XButtonEvent *) xevent)->x_root; - last_mouse_pos->y = ((XButtonEvent *) xevent)->y_root; + if (spi_dbus_marshal_deviceEvent(message, key_event)) + { + DBusMessage *reply; -#ifdef SPI_DEBUG - fprintf (stderr, "mouse button %d %s (%x)\n", - xbutton_event->button, - (xevent->type == ButtonPress) ? "Press" : "Release", - mouse_button_state); -#endif - snprintf (event_detail, 22, "%d%c", button, - (xevent->type == ButtonPress) ? 'p' : 'r'); - - /* TODO: FIXME 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 = (dbus_uint16_t) xbutton_event->state; - mouse_e.timestamp = (dbus_uint32_t) xbutton_event->time; - mouse_e.event_string = ""; - mouse_e.is_text = 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); - ix = last_mouse_pos->x; - iy = last_mouse_pos->y; - /* TODO - Work out which part of the spec this emit is fulfilling */ - //emit(controller, SPI_DBUS_INTERFACE_EVENT_MOUSE, "button", event_detail, ix, iy); + if (hung) + { + dbus_connection_send (controller->bus, message, NULL); + dbus_message_unref (message); + return FALSE; } - 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); + reply = send_and_allow_reentry (controller->bus, message, 3000, NULL); + if (reply) + { + dbus_message_get_args(reply, NULL, DBUS_TYPE_BOOLEAN, &consumed, DBUS_TYPE_INVALID); + dbus_message_unref(reply); + } + } + dbus_message_unref(message); + return consumed; } -static GdkFilterReturn -global_filter_fn (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data) +gboolean +spi_controller_notify_mouselisteners (SpiDEController *controller, + const Accessibility_DeviceEvent *event) { - 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 == MappingNotify) - xmkeymap = NULL; - - if (xevent->type == KeyPress || xevent->type == KeyRelease) - { - if (controller->xevie_display == NULL) - { - gboolean is_consumed; - - is_consumed = - spi_device_event_controller_forward_key_event (controller, xevent); - - if (is_consumed) - { - int n_events; - int i; - XEvent next_event; - n_events = XPending (display); - + GList *l; + GSList *notify = NULL, *l2; + GList **listeners = &controller->mouse_listeners; + gboolean is_consumed; #ifdef SPI_KEYEVENT_DEBUG - g_print ("Number of events pending: %d\n", n_events); + gboolean found = FALSE; #endif - for (i = 0; i < n_events; i++) - { - XNextEvent (display, &next_event); - if (next_event.type != KeyPress && - next_event.type != KeyRelease) - g_warning ("Unexpected event type %d in queue", next_event.type); - } - - XAllowEvents (display, AsyncKeyboard, CurrentTime); - if (n_events) - XUngrabKeyboard (display, CurrentTime); - } - else - { - if (xevent->type == KeyPress) - wait_for_release_event (xevent, controller); - XAllowEvents (display, ReplayKeyboard, CurrentTime); - } - } - - return GDK_FILTER_CONTINUE; - } - if (xevent->type == ButtonPress || xevent->type == ButtonRelease) + if (!listeners) { - spi_device_event_controller_forward_mouse_event (controller, xevent); + return FALSE; } - if (xevent->type == priv->xkb_base_event_code) + + for (l = *listeners; l; l = l->next) { - XkbAnyEvent * xkb_ev = (XkbAnyEvent *) xevent; - /* ugly but probably necessary...*/ - XSynchronize (display, TRUE); + DEControllerListener *listener = l->data; - 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); - } - /* TODO: account for lock as well as latch */ - 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); + if (eventtype_seq_contains_event (listener->types, event)) + { + /* we clone (don't dup) the listener, to avoid refcount inc. */ + notify = g_slist_prepend (notify, + spi_listener_clone (listener)); +#ifdef SPI_KEYEVENT_DEBUG + found = TRUE; #endif - priv->pending_xkb_mod_relatch_mask = 0; - } - else - { - priv->xkb_latch_mask = xkb_snev->latched_mods; - } - } - XSynchronize (display, FALSE); + } } - - return GDK_FILTER_CONTINUE; -} -static int -_spi_controller_device_error_handler (Display *display, XErrorEvent *error) -{ - if (error->error_code == BadAccess) - { - g_message ("Could not complete key grab: grab already in use.\n"); - spi_error_code = BadAccess; - return 0; - } - else +#ifdef SPI_KEYEVENT_DEBUG + if (!found) { - return (*x_default_error_handler) (display, error); + g_print ("no match for event\n"); } -} - -static void -spi_controller_register_with_devices (SpiDEController *controller) -{ - DEControllerPrivateData *priv; - int event_base, error_base, major_version, minor_version; +#endif - priv = (DEControllerPrivateData *) g_object_get_qdata (G_OBJECT (controller), spi_dec_private_quark); - if (XTestQueryExtension (spi_get_display(), &event_base, &error_base, &major_version, &minor_version)) + is_consumed = FALSE; + for (l2 = notify; l2 && !is_consumed; l2 = l2->next) { - XTestGrabControl (spi_get_display (), True); - } + DEControllerListener *listener = l2->data; - /* calls to device-specific implementations and routines go here */ - /* register with: keyboard hardware code handler */ - /* register with: (translated) keystroke handler */ + is_consumed = Accessibility_DeviceEventListener_NotifyEvent (controller, controller->registry, listener, event); - 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) - { - gint i; - guint64 reserved = 0; - priv->xkb_desc = XkbGetMap (spi_get_display (), XkbKeySymsMask, XkbUseCoreKbd); - XkbSelectEvents (spi_get_display (), - XkbUseCoreKbd, - XkbStateNotifyMask, XkbStateNotifyMask); - _numlock_physical_mask = XkbKeysymToModifiers (spi_get_display (), - XK_Num_Lock); - for (i = priv->xkb_desc->max_key_code; i >= priv->xkb_desc->min_key_code; --i) - { - if (priv->xkb_desc->map->key_sym_map[i].kt_index[0] == XkbOneLevelIndex) - { - if (XKeycodeToKeysym (spi_get_display (), i, 0) != 0) - { - /* don't use this one if there's a grab client! */ - gdk_error_trap_push (); - XGrabKey (spi_get_display (), i, 0, - gdk_x11_get_default_root_xwindow (), - TRUE, - GrabModeSync, GrabModeSync); - XSync (spi_get_display (), TRUE); - XUngrabKey (spi_get_display (), i, 0, - gdk_x11_get_default_root_xwindow ()); - if (!gdk_error_trap_pop ()) - { - reserved = i; - break; - } - } - } - } - if (reserved) - { - priv->reserved_keycode = reserved; - priv->reserved_keysym = XKeycodeToKeysym (spi_get_display (), reserved, 0); - } - else - { - priv->reserved_keycode = XKeysymToKeycode (spi_get_display (), XK_numbersign); - priv->reserved_keysym = XK_numbersign; - } -#ifdef SPI_RESERVED_DEBUG - unsigned sym = 0; - sym = XKeycodeToKeysym (spi_get_display (), reserved, 0); - fprintf (stderr, "%x\n", sym); - fprintf (stderr, "setting the reserved keycode to %d (%s)\n", - reserved, - XKeysymToString (XKeycodeToKeysym (spi_get_display (), - reserved, 0))); -#endif - } + spi_listener_clone_free ((DEControllerListener *) l2->data); + } - gdk_window_add_filter (NULL, global_filter_fn, controller); + for (; l2; l2 = l2->next) + { + DEControllerListener *listener = l2->data; + spi_listener_clone_free (listener); + /* clone doesn't have its own ref, so don't use spi_device_listener_free */ + } - gdk_window_set_events (gdk_get_default_root_window (), - GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK); + g_slist_free (notify); - x_default_error_handler = XSetErrorHandler (_spi_controller_device_error_handler); +#ifdef SPI_DEBUG + if (is_consumed) g_message ("consumed\n"); +#endif + return is_consumed; } static gboolean -spi_key_set_contains_key (GSList *key_set, +key_set_contains_key (GSList *key_set, const Accessibility_DeviceEvent *key_event) { gint i; @@ -1444,7 +1126,7 @@ spi_key_set_contains_key (GSList *key_set, } static gboolean -spi_eventtype_seq_contains_event (dbus_uint32_t types, +eventtype_seq_contains_event (dbus_uint32_t types, const Accessibility_DeviceEvent *event) { if (types == 0) /* special case, means "all events/any event" */ @@ -1461,8 +1143,8 @@ spi_key_event_matches_listener (const Accessibility_DeviceEvent *key_event, dbus_bool_t is_system_global) { if (((key_event->modifiers & 0xFF) == (dbus_uint16_t) (listener->mask & 0xFF)) && - spi_key_set_contains_key (listener->keys, key_event) && - spi_eventtype_seq_contains_event (listener->listener.types, key_event) && + key_set_contains_key (listener->keys, key_event) && + eventtype_seq_contains_event (listener->listener.types, key_event) && (is_system_global == listener->mode->global)) { return TRUE; @@ -1473,7 +1155,7 @@ spi_key_event_matches_listener (const Accessibility_DeviceEvent *key_event, } } -static gboolean +gboolean spi_controller_notify_keylisteners (SpiDEController *controller, Accessibility_DeviceEvent *key_event, dbus_bool_t is_system_global) @@ -1516,7 +1198,7 @@ spi_controller_notify_keylisteners (SpiDEController *controller, { DEControllerKeyListener *key_listener = l2->data; - is_consumed = Accessibility_DeviceEventListener_notifyEvent (controller, controller->registry, &key_listener->listener, key_event) && + is_consumed = Accessibility_DeviceEventListener_NotifyEvent (controller, controller->registry, &key_listener->listener, key_event) && key_listener->mode->preemptive; spi_key_listener_clone_free (key_listener); @@ -1537,7 +1219,7 @@ spi_controller_notify_keylisteners (SpiDEController *controller, return is_consumed; } -static gboolean +gboolean spi_clear_error_state (void) { gboolean retval = spi_error_code != 0; @@ -1545,164 +1227,13 @@ spi_clear_error_state (void) return retval; } -static Accessibility_DeviceEvent -spi_keystroke_from_x_key_event (XKeyEvent *x_key_event) -{ - Accessibility_DeviceEvent key_event; - KeySym keysym; - const int cbuf_bytes = 20; - char cbuf [21]; - int nbytes; - - nbytes = XLookupString (x_key_event, cbuf, cbuf_bytes, &keysym, NULL); - key_event.id = (dbus_int32_t)(keysym); - key_event.hw_code = (dbus_int16_t) x_key_event->keycode; - if (((XEvent *) x_key_event)->type == KeyPress) - { - key_event.type = Accessibility_KEY_PRESSED_EVENT; - } - else - { - key_event.type = Accessibility_KEY_RELEASED_EVENT; - } - key_event.modifiers = (dbus_uint16_t)(x_key_event->state); - key_event.is_text = FALSE; - switch (keysym) - { - case ' ': - key_event.event_string = g_strdup ("space"); - break; - case XK_Tab: - key_event.event_string = g_strdup ("Tab"); - break; - case XK_BackSpace: - key_event.event_string = g_strdup ("Backspace"); - break; - case XK_Return: - key_event.event_string = g_strdup ("Return"); - break; - case XK_Home: - key_event.event_string = g_strdup ("Home"); - break; - case XK_Page_Down: - key_event.event_string = g_strdup ("Page_Down"); - break; - case XK_Page_Up: - key_event.event_string = g_strdup ("Page_Up"); - break; - case XK_F1: - key_event.event_string = g_strdup ("F1"); - break; - case XK_F2: - key_event.event_string = g_strdup ("F2"); - break; - case XK_F3: - key_event.event_string = g_strdup ("F3"); - break; - case XK_F4: - key_event.event_string = g_strdup ("F4"); - break; - case XK_F5: - key_event.event_string = g_strdup ("F5"); - break; - case XK_F6: - key_event.event_string = g_strdup ("F6"); - break; - case XK_F7: - key_event.event_string = g_strdup ("F7"); - break; - case XK_F8: - key_event.event_string = g_strdup ("F8"); - break; - case XK_F9: - key_event.event_string = g_strdup ("F9"); - break; - case XK_F10: - key_event.event_string = g_strdup ("F10"); - break; - case XK_F11: - key_event.event_string = g_strdup ("F11"); - break; - case XK_F12: - key_event.event_string = g_strdup ("F12"); - break; - case XK_End: - key_event.event_string = g_strdup ("End"); - break; - case XK_Escape: - key_event.event_string = g_strdup ("Escape"); - break; - case XK_Up: - key_event.event_string = g_strdup ("Up"); - break; - case XK_Down: - key_event.event_string = g_strdup ("Down"); - break; - case XK_Left: - key_event.event_string = g_strdup ("Left"); - break; - case XK_Right: - key_event.event_string = g_strdup ("Right"); - break; - default: - if (nbytes > 0) - { - gunichar c; - cbuf[nbytes] = '\0'; /* OK since length is cbuf_bytes+1 */ - key_event.event_string = g_strdup (cbuf); - c = keysym2ucs (keysym); - if (c > 0 && !g_unichar_iscntrl (c)) - { - key_event.is_text = TRUE; - /* incorrect for some composed chars? */ - } - } - else - { - key_event.event_string = g_strdup (""); - } - } - - key_event.timestamp = (dbus_uint32_t) x_key_event->time; -#ifdef SPI_KEYEVENT_DEBUG - { - char *pressed_str = "pressed"; - char *released_str = "released"; - char *state_ptr; - - if (key_event.type == Accessibility_KEY_PRESSED_EVENT) - state_ptr = pressed_str; - else - state_ptr = released_str; - - fprintf (stderr, - "Key %lu %s (%c), modifiers %d; string=%s [%x] %s\n", - (unsigned long) keysym, - state_ptr, - keysym ? (int) keysym : '*', - (int) x_key_event->state, - key_event.event_string, - key_event.event_string[0], - (key_event.is_text == TRUE) ? "(text)" : "(not text)"); - } -#endif -#ifdef SPI_DEBUG - fprintf (stderr, "%s%c\n", - (x_key_event->state & Mod1Mask)?"Alt-":"", - ((x_key_event->state & ShiftMask)^(x_key_event->state & LockMask))? - g_ascii_toupper (keysym) : g_ascii_tolower (keysym)); - fprintf (stderr, "serial: %x Time: %x\n", x_key_event->serial, x_key_event->time); -#endif /* SPI_DEBUG */ - return key_event; -} - -static gboolean +gboolean spi_controller_update_key_grabs (SpiDEController *controller, Accessibility_DeviceEvent *recv) { GList *l, *next; gboolean update_failed = FALSE; - KeyCode keycode = 0; + long keycode = 0; g_return_val_if_fail (controller != NULL, FALSE); @@ -1716,7 +1247,7 @@ spi_controller_update_key_grabs (SpiDEController *controller, * ControlMask grabs are broken, must be in use already */ if (recv) - keycode = keycode_for_keysym (controller, recv->id, NULL); + keycode = spi_dec_plat_get_keycode (controller, recv->id, NULL, TRUE, NULL); for (l = controller->keygrabs_list; l; l = next) { gboolean do_remove; @@ -1749,10 +1280,9 @@ spi_controller_update_key_grabs (SpiDEController *controller, #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 ()); + spi_dec_plat_ungrab_key (controller, + grab_mask->key_val, + grab_mask->mod_mask); do_remove = TRUE; } @@ -1762,15 +1292,9 @@ spi_controller_update_key_grabs (SpiDEController *controller, #ifdef SPI_DEBUG 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 (); + update_failed = spi_dec_plat_grab_key (controller, + grab_mask->key_val, + grab_mask->mod_mask); if (update_failed) { while (grab_mask->ref_count > 0) --grab_mask->ref_count; do_remove = TRUE; @@ -1802,34 +1326,22 @@ static void spi_device_event_controller_object_finalize (GObject *object) { SpiDEController *controller; - DEControllerPrivateData *private; - controller = SPI_DEVICE_EVENT_CONTROLLER (object); GObjectClass *parent_class = G_OBJECT_CLASS(spi_device_event_controller_parent_class); + SpiDEControllerClass *klass; + + controller = SPI_DEVICE_EVENT_CONTROLLER (object); + klass = SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS (controller); #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 ())); - -#ifdef HAVE_XEVIE - if (controller->xevie_display != NULL) - { - XevieEnd(controller->xevie_display); -#ifdef SPI_KEYEVENT_DEBUG - printf("XevieEnd(dpy) finished \n"); -#endif - } -#endif + if (klass->plat.finalize) + klass->plat.finalize (controller); - private = g_object_get_data (G_OBJECT (controller), "spi-dec-private"); - if (private->xkb_desc) - XkbFreeKeyboard (private->xkb_desc, 0, True); - g_free (private); parent_class->finalize (object); } /* - * DBus Accessibility::DEController::registerKeystrokeListener + * DBus Accessibility::DEController::RegisterKeystrokeListener * method implementation */ static DBusMessage * @@ -1844,12 +1356,14 @@ impl_register_keystroke_listener (DBusConnection *bus, GSList *keys = NULL; dbus_int32_t mask, type; Accessibility_EventListenerMode *mode; - dbus_bool_t ret; + dbus_bool_t ret; DBusMessage *reply = NULL; char *keystring; + if (strcmp (dbus_message_get_signature (message), "oa(iisi)uu(bbb)") != 0) + return invalid_arguments_error (message); + dbus_message_iter_init(message, &iter); - // TODO: verify type signature dbus_message_iter_get_basic(&iter, &path); dbus_message_iter_next(&iter); dbus_message_iter_recurse(&iter, &iter_array); @@ -1858,6 +1372,7 @@ impl_register_keystroke_listener (DBusConnection *bus, Accessibility_KeyDefinition *kd = (Accessibility_KeyDefinition *)g_malloc(sizeof(Accessibility_KeyDefinition)); if (!spi_dbus_message_iter_get_struct(&iter_array, DBUS_TYPE_INT32, &kd->keycode, DBUS_TYPE_INT32, &kd->keysym, DBUS_TYPE_STRING, &keystring, DBUS_TYPE_INVALID)) { + g_free (kd); break; } kd->keystring = g_strdup (keystring); @@ -1866,20 +1381,7 @@ impl_register_keystroke_listener (DBusConnection *bus, dbus_message_iter_next(&iter); dbus_message_iter_get_basic(&iter, &mask); dbus_message_iter_next(&iter); - if (!strcmp (dbus_message_iter_get_signature (&iter), "u")) - dbus_message_iter_get_basic(&iter, &type); - else - { - dbus_message_iter_recurse(&iter, &iter_array); - while (dbus_message_iter_get_arg_type(&iter_array) != DBUS_TYPE_INVALID) - { - dbus_uint32_t t; - dbus_message_iter_get_basic (&iter_array, &t); - type |= (1 << t); - dbus_message_iter_next (&iter_array); - } - dbus_message_iter_next (&iter_array); - } + dbus_message_iter_get_basic(&iter, &type); dbus_message_iter_next(&iter); mode = (Accessibility_EventListenerMode *)g_malloc(sizeof(Accessibility_EventListenerMode)); if (mode) @@ -1891,6 +1393,7 @@ impl_register_keystroke_listener (DBusConnection *bus, dbus_message_get_sender(message), path, (unsigned long) mask); #endif dec_listener = spi_dec_key_listener_new (dbus_message_get_sender(message), path, keys, mask, type, mode); + g_free (mode); ret = spi_controller_register_device_listener ( controller, (DEControllerListener *) dec_listener); reply = dbus_message_new_method_return (message); @@ -1902,7 +1405,7 @@ impl_register_keystroke_listener (DBusConnection *bus, } /* - * DBus Accessibility::DEController::registerDeviceEventListener + * DBus Accessibility::DEController::RegisterDeviceEventListener * method implementation */ static DBusMessage * @@ -1912,16 +1415,14 @@ impl_register_device_event_listener (DBusConnection *bus, { SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER(user_data); DEControllerListener *dec_listener; - DBusError error; const char *path; dbus_int32_t event_types; dbus_bool_t ret; DBusMessage *reply = NULL; - dbus_error_init(&error); - if (!dbus_message_get_args(message, &error, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_UINT32, &event_types, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args(message, NULL, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_UINT32, &event_types, DBUS_TYPE_INVALID)) { - return droute_invalid_arguments_error (message); + return invalid_arguments_error (message); } dec_listener = spi_dec_listener_new (dbus_message_get_sender(message), path, event_types); ret = spi_controller_register_device_listener ( @@ -1986,6 +1487,8 @@ spi_controller_deregister_device_listener (SpiDEController *controlle ctx.bus = controller->bus; ctx.listener = listener; + notify_mouse_listener (controller, listener, FALSE); + spi_re_entrant_list_foreach (&controller->mouse_listeners, remove_listener_cb, &ctx); if (!controller->mouse_listeners) @@ -1999,7 +1502,9 @@ spi_deregister_controller_key_listener (SpiDEController *controller, RemoveListenerClosure ctx; ctx.bus = controller->bus; - ctx.listener = (DEControllerListener *) key_listener; + ctx.listener = (DEControllerListener *) spi_key_listener_clone (key_listener); + + notify_keystroke_listener (controller, key_listener, FALSE); /* special case, copy keyset from existing controller list entry */ if (g_slist_length(key_listener->keys) == 0) @@ -2013,6 +1518,7 @@ spi_deregister_controller_key_listener (SpiDEController *controller, spi_re_entrant_list_foreach (&controller->key_listeners, remove_listener_cb, &ctx); + spi_key_listener_clone_free ((DEControllerKeyListener *) ctx.listener); } void @@ -2027,6 +1533,7 @@ spi_remove_device_listeners (SpiDEController *controller, const char *bus_name) if (!strcmp (listener->bus_name, bus_name)) { spi_controller_deregister_device_listener (controller, listener); + tmp = controller->mouse_listeners; } } for (l = controller->key_listeners; l; l = tmp) @@ -2035,13 +1542,15 @@ spi_remove_device_listeners (SpiDEController *controller, const char *bus_name) tmp = l->next; if (!strcmp (key_listener->listener.bus_name, bus_name)) { + /* TODO: untangle the below line(s) */ spi_deregister_controller_key_listener (controller, key_listener); + tmp = controller->key_listeners; } } } /* - * DBus Accessibility::DEController::deregisterKeystrokeListener + * DBus Accessibility::DEController::DeregisterKeystrokeListener * method implementation */ static DBusMessage * @@ -2058,7 +1567,12 @@ impl_deregister_keystroke_listener (DBusConnection *bus, DBusMessage *reply = NULL; dbus_message_iter_init(message, &iter); - // TODO: verify type signature + if (strcmp (dbus_message_get_signature (message), "oa(iisi)uu") != 0) + { + g_warning ("Received DeregisterKeystrokeListener with strange signature '%s'", dbus_message_get_signature (message)); + return invalid_arguments_error (message); + } + dbus_message_iter_get_basic(&iter, &path); dbus_message_iter_next(&iter); dbus_message_iter_recurse(&iter, &iter_array); @@ -2069,6 +1583,7 @@ impl_deregister_keystroke_listener (DBusConnection *bus, if (!spi_dbus_message_iter_get_struct(&iter_array, DBUS_TYPE_INT32, &kd->keycode, DBUS_TYPE_INT32, &kd->keysym, DBUS_TYPE_STRING, &keystring, DBUS_TYPE_INVALID)) { + g_free(kd); break; } kd->keystring = g_strdup (keystring); @@ -2093,7 +1608,7 @@ impl_deregister_keystroke_listener (DBusConnection *bus, } /* - * DBus Accessibility::DEController::deregisterDeviceEventListener + * DBus Accessibility::DEController::DeregisterDeviceEventListener * method implementation */ static DBusMessage * @@ -2103,15 +1618,13 @@ impl_deregister_device_event_listener (DBusConnection *bus, { SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER(user_data); DEControllerListener *listener; - DBusError error; const char *path; dbus_int32_t event_types; DBusMessage *reply = NULL; - dbus_error_init(&error); - if (!dbus_message_get_args(message, &error, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_UINT32, &event_types, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args(message, NULL, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_UINT32, &event_types, DBUS_TYPE_INVALID)) { - return droute_invalid_arguments_error (message); + return invalid_arguments_error (message); } listener = spi_dec_listener_new (dbus_message_get_sender(message), path, event_types); spi_controller_deregister_device_listener ( @@ -2120,309 +1633,105 @@ impl_deregister_device_event_listener (DBusConnection *bus, return reply; } -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 -#ifdef SPI_XKB_DEBUG - fprintf (stderr, "SlowKeys delay: %d\n", (int) retval); -#endif - return retval; -} - -static unsigned int dec_xkb_get_bouncekeys_delay (SpiDEController *controller) +static DBusMessage * +impl_get_keystroke_listeners (DBusConnection *bus, + DBusMessage *message, + void *user_data) { - 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; -} + SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER(user_data); + DBusMessageIter iter, iter_array; + DBusMessage *reply = dbus_message_new_method_return (message); + GList *l; -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; - XFlush (spi_get_display ()); - XSync (spi_get_display (), False); - gettimeofday (&priv->last_press_time, NULL); - return TRUE; -} + if (!reply) + return NULL; -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; + dbus_message_iter_init_append (reply, &iter); + dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, + "(souua(iisi)u(bbb))", &iter_array); + for (l = controller->key_listeners; l; l = l->next) + { + append_keystroke_listener (&iter_array, l->data); + } + dbus_message_iter_close_container (&iter, &iter_array); + return reply; } -static unsigned -dec_get_modifier_state (SpiDEController *controller) +static DBusMessage * +impl_get_device_event_listeners (DBusConnection *bus, + DBusMessage *message, + void *user_data) { - return mouse_mask_state; -} + SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER(user_data); + DBusMessageIter iter, iter_array; + GList *l; + DBusMessage *reply = dbus_message_new_method_return (message); -static gboolean -dec_lock_modifiers (SpiDEController *controller, unsigned modifiers) -{ - DEControllerPrivateData *priv = (DEControllerPrivateData *) - g_object_get_qdata (G_OBJECT (controller), spi_dec_private_quark); - - if (priv->have_xkb) { - return XkbLockModifiers (spi_get_display (), XkbUseCoreKbd, - modifiers, modifiers); - } else { - int mod_index; - for (mod_index=0;mod_index<8;mod_index++) - if (modifiers & (1<modifiermap[mod_index]); - return TRUE; - } -} + if (!reply) + return NULL; -static gboolean -dec_unlock_modifiers (SpiDEController *controller, unsigned modifiers) -{ - DEControllerPrivateData *priv = (DEControllerPrivateData *) - g_object_get_qdata (G_OBJECT (controller), spi_dec_private_quark); - - if (priv->have_xkb) { - return XkbLockModifiers (spi_get_display (), XkbUseCoreKbd, - modifiers, 0); - } else { - int mod_index; - for (mod_index=0;mod_index<8;mod_index++) - if (modifiers & (1<modifiermap[mod_index]); - return TRUE; - } + dbus_message_iter_init_append (reply, &iter); + dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, + "(sou)", &iter_array); + for (l = controller->key_listeners; l; l = l->next) + { + append_mouse_listener (&iter_array, l->data); + } + dbus_message_iter_close_container (&iter, &iter_array); + return reply; } -static KeySym -dec_keysym_for_unichar (SpiDEController *controller, gunichar unichar) +static unsigned +get_modifier_state (SpiDEController *controller) { - return ucs2keysym ((long) unichar); + return mouse_mask_state; } -static gboolean -dec_synth_keysym (SpiDEController *controller, KeySym keysym) +gboolean +spi_dec_synth_keysym (SpiDEController *controller, long keysym) { - KeyCode key_synth_code; + long key_synth_code; unsigned int modifiers, synth_mods, lock_mods; - key_synth_code = keycode_for_keysym (controller, keysym, &synth_mods); + key_synth_code = spi_dec_plat_get_keycode (controller, keysym, NULL, TRUE, &synth_mods); if ((key_synth_code == 0) || (synth_mods == 0xFF)) return FALSE; /* TODO: set the modifiers accordingly! */ - modifiers = dec_get_modifier_state (controller); + modifiers = get_modifier_state (controller); /* side-effect; we may unset mousebutton modifiers here! */ lock_mods = 0; if (synth_mods != modifiers) { lock_mods = synth_mods & ~modifiers; - dec_lock_modifiers (controller, lock_mods); + spi_dec_plat_lock_modifiers (controller, lock_mods); } - dec_synth_keycode_press (controller, key_synth_code); - dec_synth_keycode_release (controller, key_synth_code); + spi_dec_plat_synth_keycode_press (controller, key_synth_code); + spi_dec_plat_synth_keycode_release (controller, key_synth_code); if (synth_mods != modifiers) - dec_unlock_modifiers (controller, lock_mods); + spi_dec_plat_unlock_modifiers (controller, lock_mods); return TRUE; } -static gboolean -dec_synth_keystring (SpiDEController *controller, const char *keystring) -{ - /* probably we need to create and inject an XIM handler eventually. */ - /* for now, try to match the string to existing - * keycode+modifier states. - */ - KeySym *keysyms; - gint maxlen = 0; - gunichar unichar = 0; - gint i = 0; - gboolean retval = TRUE; - const gchar *c; - - maxlen = strlen (keystring) + 1; - keysyms = g_new0 (KeySym, maxlen); - if (!(keystring && *keystring && g_utf8_validate (keystring, -1, &c))) { - retval = FALSE; - } - else { -#ifdef SPI_DEBUG - fprintf (stderr, "[keystring synthesis attempted on %s]\n", keystring); -#endif - while (keystring && (unichar = g_utf8_get_char (keystring))) { - KeySym keysym; - char bytes[6]; - gint mbytes; - - mbytes = g_unichar_to_utf8 (unichar, bytes); - bytes[mbytes] = '\0'; -#ifdef SPI_DEBUG - fprintf (stderr, "[unichar %s]", bytes); -#endif - keysym = dec_keysym_for_unichar (controller, unichar); - if (keysym == NoSymbol) { -#ifdef SPI_DEBUG - fprintf (stderr, "no keysym for %s", bytes); -#endif - retval = FALSE; - break; - } - keysyms[i++] = keysym; - keystring = g_utf8_next_char (keystring); - } - keysyms[i++] = 0; - XSynchronize (spi_get_display (), TRUE); - for (i = 0; keysyms[i]; ++i) { - if (!dec_synth_keysym (controller, keysyms[i])) { -#ifdef SPI_DEBUG - fprintf (stderr, "could not synthesize %c\n", - (int) keysyms[i]); -#endif - retval = FALSE; - break; - } - } - XSynchronize (spi_get_display (), FALSE); - } - g_free (keysyms); - - return retval; -} - /* - * DBus Accessibility::DEController::registerKeystrokeListener + * DBus Accessibility::DEController::RegisterKeystrokeListener * method implementation */ -static DBusMessage * impl_generate_keyboard_event (DBusConnection *bus, DBusMessage *message, void *user_data) +static DBusMessage * +impl_generate_keyboard_event (DBusConnection *bus, DBusMessage *message, void *user_data) { SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER(user_data); - DBusError error; dbus_int32_t keycode; char *keystring; dbus_uint32_t synth_type; - gint err; - KeySym keysym; - DEControllerPrivateData *priv; DBusMessage *reply = NULL; - dbus_error_init(&error); - if (!dbus_message_get_args(message, &error, DBUS_TYPE_INT32, &keycode, DBUS_TYPE_STRING, &keystring, DBUS_TYPE_UINT32, &synth_type, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args(message, NULL, DBUS_TYPE_INT32, &keycode, DBUS_TYPE_STRING, &keystring, DBUS_TYPE_UINT32, &synth_type, DBUS_TYPE_INVALID)) { - return droute_invalid_arguments_error (message); + return invalid_arguments_error (message); } #ifdef SPI_DEBUG @@ -2436,24 +1745,15 @@ static DBusMessage * impl_generate_keyboard_event (DBusConnection *bus, DBusMess * and fall back to XSendEvent() if XTest is not available. */ - gdk_error_trap_push (); - - priv = (DEControllerPrivateData *) - g_object_get_qdata (G_OBJECT (controller), spi_dec_private_quark); - - if (!priv->have_xkb && xmkeymap==NULL) { - xmkeymap = XGetModifierMapping(spi_get_display ()); - } - switch (synth_type) { case Accessibility_KEY_PRESS: - dec_synth_keycode_press (controller, keycode); + spi_dec_plat_synth_keycode_press (controller, keycode); break; case Accessibility_KEY_PRESSRELEASE: - dec_synth_keycode_press (controller, keycode); + spi_dec_plat_synth_keycode_press (controller, keycode); case Accessibility_KEY_RELEASE: - dec_synth_keycode_release (controller, keycode); + spi_dec_plat_synth_keycode_release (controller, keycode); break; case Accessibility_KEY_SYM: #ifdef SPI_XKB_DEBUG @@ -2464,104 +1764,46 @@ static DBusMessage * impl_generate_keyboard_event (DBusConnection *bus, DBusMess * in our arg list; it can contain either * a keycode or a keysym. */ - dec_synth_keysym (controller, (KeySym) keycode); +#ifdef HAVE_X11 + spi_dec_synth_keysym (controller, (KeySym) keycode); +#else + spi_dec_synth_keysym (controller, (long) keycode); +#endif break; case Accessibility_KEY_STRING: - if (!dec_synth_keystring (controller, keystring)) + if (!spi_dec_plat_synth_keystring (controller, synth_type, keycode, keystring)) fprintf (stderr, "Keystring synthesis failure, string=%s\n", keystring); break; } - if (synth_type == Accessibility_KEY_SYM) { - keysym = keycode; - } - else { - keysym = XkbKeycodeToKeysym (spi_get_display (), keycode, 0, 0); - } - if (XkbKeysymToModifiers (spi_get_display (), keysym) == 0) - { - spi_dec_clear_unlatch_pending (controller); - } reply = dbus_message_new_method_return (message); return reply; } -/* Accessibility::DEController::generateMouseEvent */ -static DBusMessage * impl_generate_mouse_event (DBusConnection *bus, DBusMessage *message, void *user_data) +/* Accessibility::DEController::GenerateMouseEvent */ +static DBusMessage * +impl_generate_mouse_event (DBusConnection *bus, DBusMessage *message, void *user_data) { - DBusError error; dbus_int32_t x; dbus_int32_t y; char *eventName; DBusMessage *reply = NULL; - int button = 0; - gboolean err = FALSE; - Display *display = spi_get_display (); - if (!dbus_message_get_args(message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, DBUS_TYPE_STRING, &eventName, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args(message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, DBUS_TYPE_STRING, &eventName, DBUS_TYPE_INVALID)) { - return droute_invalid_arguments_error (message); + return invalid_arguments_error (message); } #ifdef SPI_DEBUG 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; - case '4': - button = 4; - break; - case '5': - button = 5; - break; - default: - err = TRUE; - } - if (!err) - { - 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; - } + spi_dec_plat_generate_mouse_event (saved_controller, x, y, eventName); reply = dbus_message_new_method_return (message); return reply; } -/* Accessibility::DEController::notifyListenersSync */ +/* Accessibility::DEController::NotifyListenersSync */ static DBusMessage * impl_notify_listeners_sync (DBusConnection *bus, DBusMessage *message, void *user_data) { @@ -2572,7 +1814,7 @@ impl_notify_listeners_sync (DBusConnection *bus, DBusMessage *message, void *use if (!spi_dbus_demarshal_deviceEvent(message, &event)) { - return droute_invalid_arguments_error (message); + return invalid_arguments_error (message); } #ifdef SPI_DEBUG g_print ("notifylistening listeners synchronously: controller %p, event id %d\n", @@ -2599,7 +1841,7 @@ impl_notify_listeners_async (DBusConnection *bus, DBusMessage *message, void *us if (!spi_dbus_demarshal_deviceEvent(message, &event)) { - return droute_invalid_arguments_error (message); + return invalid_arguments_error (message); } #ifdef SPI_DEBUG g_print ("notifylistening listeners asynchronously: controller %p, event id %d\n", @@ -2620,176 +1862,182 @@ spi_device_event_controller_class_init (SpiDEControllerClass *klass) object_class->finalize = spi_device_event_controller_object_finalize; - if (!spi_dec_private_quark) - spi_dec_private_quark = g_quark_from_static_string ("spi-dec-private"); +#ifdef HAVE_X11 + if (g_getenv ("DISPLAY")) + spi_dec_setup_x11 (klass); + else +#endif + g_type_class_add_private (object_class, sizeof (long)); /* dummy */ } -#ifdef HAVE_XEVIE -static Bool isEvent(Display *dpy, XEvent *event, char *arg) +static void +spi_device_event_controller_init (SpiDEController *device_event_controller) { - return TRUE; -} + SpiDEControllerClass *klass; + klass = SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS (device_event_controller); -static gboolean -handle_io (GIOChannel *source, - GIOCondition condition, - gpointer data) -{ - SpiDEController *controller = (SpiDEController *) data; - gboolean is_consumed = FALSE; - XEvent ev; + /* TODO: shouldn't be gpointer below */ + device_event_controller->priv = G_TYPE_INSTANCE_GET_PRIVATE (device_event_controller, + SPI_DEVICE_EVENT_CONTROLLER_TYPE, + gpointer); + device_event_controller->message_queue = g_queue_new (); + saved_controller = device_event_controller; - while (XCheckIfEvent(controller->xevie_display, &ev, isEvent, NULL)) - { - if (ev.type == KeyPress || ev.type == KeyRelease) - is_consumed = spi_device_event_controller_forward_key_event (controller, &ev); + if (klass->plat.init) + klass->plat.init (device_event_controller); +} - if (! is_consumed) - XevieSendEvent(controller->xevie_display, &ev, XEVIE_UNMODIFIED); - } - return TRUE; -} -#endif /* HAVE_XEVIE */ +/*---------------------------------------------------------------------------*/ -static void -spi_device_event_controller_init (SpiDEController *device_event_controller) -{ -#ifdef HAVE_XEVIE - GIOChannel *ioc; - int fd; -#endif /* HAVE_XEVIE */ +static const char *introspection_header = +"\n"; - DEControllerPrivateData *private; - device_event_controller->key_listeners = NULL; - device_event_controller->mouse_listeners = NULL; - device_event_controller->keygrabs_list = NULL; - device_event_controller->xevie_display = NULL; +static const char *introspection_node_element = +"\n"; -#ifdef HAVE_XEVIE - device_event_controller->xevie_display = XOpenDisplay(NULL); +static const char *introspection_footer = +""; - if (XevieStart(device_event_controller->xevie_display) == TRUE) - { -#ifdef SPI_KEYEVENT_DEBUG - fprintf (stderr, "XevieStart() success \n"); -#endif - XevieSelectInput(device_event_controller->xevie_display, KeyPressMask | KeyReleaseMask); +static DBusMessage * +impl_Introspect (DBusConnection * bus, + DBusMessage * message, void *user_data) +{ + GString *output; + gchar *final; - fd = ConnectionNumber(device_event_controller->xevie_display); - ioc = g_io_channel_unix_new (fd); - g_io_add_watch (ioc, G_IO_IN | G_IO_HUP, handle_io, device_event_controller); - g_io_channel_unref (ioc); - } - else - { - device_event_controller->xevie_display = NULL; -#ifdef SPI_KEYEVENT_DEBUG - fprintf (stderr, "XevieStart() failed, only one client is allowed to do event int exception\n"); -#endif - } -#endif /* HAVE_XEVIE */ + const gchar *pathstr = SPI_DBUS_PATH_DEC; - 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); -} + DBusMessage *reply; -static gboolean -spi_device_event_controller_forward_key_event (SpiDEController *controller, - const XEvent *event) -{ - Accessibility_DeviceEvent key_event; - gboolean ret; + output = g_string_new(introspection_header); - g_assert (event->type == KeyPress || event->type == KeyRelease); + g_string_append_printf(output, introspection_node_element, pathstr); - key_event = spi_keystroke_from_x_key_event ((XKeyEvent *) event); + g_string_append (output, spi_org_a11y_atspi_DeviceEventController); - if (controller->xevie_display == NULL) - spi_controller_update_key_grabs (controller, &key_event); + g_string_append(output, introspection_footer); + final = g_string_free(output, FALSE); - /* relay to listeners, and decide whether to consume it or not */ - ret = spi_controller_notify_keylisteners (controller, &key_event, TRUE); - g_free(key_event.event_string); - return ret; + reply = dbus_message_new_method_return (message); + dbus_message_append_args(reply, DBUS_TYPE_STRING, &final, DBUS_TYPE_INVALID); + + g_free(final); + return reply; } +/*---------------------------------------------------------------------------*/ -static gboolean -is_key_released (KeyCode code) +static void +handle_dec_method_from_idle (DBusConnection *bus, DBusMessage *message, void *user_data) { - char keys[32]; - int down; + const gchar *iface = dbus_message_get_interface (message); + const gchar *member = dbus_message_get_member (message); + DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + DBusMessage *reply = NULL; + + if (!strcmp (iface, SPI_DBUS_INTERFACE_DEC)) + { + result = DBUS_HANDLER_RESULT_HANDLED; + if (!strcmp (member, "RegisterKeystrokeListener")) + reply = impl_register_keystroke_listener (bus, message, user_data); + else if (!strcmp (member, "RegisterDeviceEventListener")) + reply = impl_register_device_event_listener (bus, message, user_data); + else if (!strcmp (member, "DeregisterKeystrokeListener")) + reply = impl_deregister_keystroke_listener (bus, message, user_data); + else if (!strcmp (member, "DeregisterDeviceEventListener")) + reply = impl_deregister_device_event_listener (bus, message, user_data); + else if (!strcmp (member, "GetKeystrokeListeners")) + reply = impl_get_keystroke_listeners (bus, message, user_data); + else if (!strcmp (member, "GetDeviceEventListeners")) + reply = impl_get_device_event_listeners (bus, message, user_data); + else if (!strcmp (member, "GenerateKeyboardEvent")) + reply = impl_generate_keyboard_event (bus, message, user_data); + else if (!strcmp (member, "GenerateMouseEvent")) + reply = impl_generate_mouse_event (bus, message, user_data); + else if (!strcmp (member, "NotifyListenersSync")) + reply = impl_notify_listeners_sync (bus, message, user_data); + else if (!strcmp (member, "NotifyListenersAsync")) + reply = impl_notify_listeners_async (bus, message, user_data); + else + result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } + + if (!strcmp (iface, "org.freedesktop.DBus.Introspectable")) + { + result = DBUS_HANDLER_RESULT_HANDLED; + if (!strcmp (member, "Introspect")) + reply = impl_Introspect (bus, message, user_data); + else + result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } + + if (result == DBUS_HANDLER_RESULT_HANDLED) + { + if (!reply) + { + reply = dbus_message_new_method_return (message); + } - XQueryKeymap (spi_get_display (), keys); - down = BIT (keys, code); - return (down == 0); + dbus_connection_send (bus, reply, NULL); + dbus_message_unref (reply); + } } static gboolean -check_release (gpointer data) +message_queue_dispatch (gpointer data) { - gboolean released; - Accessibility_DeviceEvent *event = (Accessibility_DeviceEvent *)data; - KeyCode code = event->hw_code; - - released = is_key_released (code); - - if (released) + saved_controller->message_queue_idle = 0; + while (!g_queue_is_empty (saved_controller->message_queue)) { - check_release_handler = 0; - event->type = Accessibility_KEY_RELEASED_EVENT; - spi_controller_notify_keylisteners (saved_controller, event, TRUE); + DBusMessage *message = g_queue_pop_head (saved_controller->message_queue); + data = g_queue_pop_head (saved_controller->message_queue); + handle_dec_method_from_idle (saved_controller->bus, message, data); + dbus_message_unref (message); } - return (released == 0); + return FALSE; } -static void wait_for_release_event (XEvent *event, - SpiDEController *controller) +static DBusHandlerResult +handle_dec_method (DBusConnection *bus, DBusMessage *message, void *user_data) { - pressed_event = spi_keystroke_from_x_key_event ((XKeyEvent *) event); - saved_controller = controller; - check_release_handler = g_timeout_add (CHECK_RELEASE_DELAY, check_release, &pressed_event); + const gchar *iface = dbus_message_get_interface (message); + const gchar *member = dbus_message_get_member (message); + const gint type = dbus_message_get_type (message); + + /* Check for basic reasons not to handle */ + if (type != DBUS_MESSAGE_TYPE_METHOD_CALL || + member == NULL || + iface == NULL) + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + + dbus_message_ref (message); + g_queue_push_tail (saved_controller->message_queue, message); + g_queue_push_tail (saved_controller->message_queue, user_data); + if (!saved_controller->message_queue_idle) { + saved_controller->message_queue_idle = g_idle_add (message_queue_dispatch, NULL); + g_source_set_name_by_id (saved_controller->message_queue_idle, "[at-spi2-core] message_queue_dispatch"); + } + return DBUS_HANDLER_RESULT_HANDLED; } -static DRouteMethod dev_methods[] = +static DBusObjectPathVTable dec_vtable = { - { impl_register_keystroke_listener, "registerKeystrokeListener" }, - { impl_register_device_event_listener, "registerDeviceEventListener" }, - { impl_deregister_keystroke_listener, "deregisterKeystrokeListener" }, - { impl_deregister_device_event_listener, "deregisterDeviceEventListener" }, - { impl_generate_keyboard_event, "generateKeyboardEvent" }, - { impl_generate_mouse_event, "generateMouseEvent" }, - { impl_notify_listeners_sync, "notifyListenersSync" }, - { impl_notify_listeners_async, "notifyListenersAsync" }, - { NULL, NULL } + NULL, + &handle_dec_method, + NULL, NULL, NULL, NULL }; SpiDEController * -spi_registry_dec_new (SpiRegistry *reg, DBusConnection *bus, DRouteContext *droute) +spi_registry_dec_new (SpiRegistry *reg, DBusConnection *bus) { SpiDEController *dec = g_object_new (SPI_DEVICE_EVENT_CONTROLLER_TYPE, NULL); - DRoutePath *path; dec->registry = g_object_ref (reg); + reg->dec = g_object_ref (dec); dec->bus = bus; - path = droute_add_one (droute, - SPI_DBUS_PATH_DEC, - dec); - - droute_path_add_interface (path, - SPI_DBUS_INTERFACE_DEC, - dev_methods, - NULL); - - spi_dec_init_mouse_listener (dec); - /* TODO: kill mouse listener on finalize */ + dbus_connection_register_object_path (bus, SPI_DBUS_PATH_DEC, &dec_vtable, dec); return dec; } @@ -2800,8 +2048,11 @@ spi_device_event_controller_start_poll_mouse (SpiRegistry *registry) if (!have_mouse_event_listener) { have_mouse_event_listener = TRUE; - if (!have_mouse_listener) - g_timeout_add (100, spi_dec_poll_mouse_idle, registry); + if (!have_mouse_listener) { + guint id; + id = g_timeout_add (100, spi_dec_poll_mouse_idle, registry->dec); + g_source_set_name_by_id (id, "[at-spi2-core] spi_dec_poll_mouse_idle"); + } } }