/* deviceeventcontroller.c: implement the DeviceEventController interface */
-#include <config.h>
+#include "config.h"
#undef SPI_XKB_DEBUG
#undef SPI_DEBUG
#include <ctype.h>
#include <stdio.h>
#include <sys/time.h>
-#include <bonobo/bonobo-exception.h>
-
-#include <X11/Xlib.h>
-#include <X11/extensions/XTest.h>
-#include <X11/XKBlib.h>
-#define XK_MISCELLANY
-#include <X11/keysymdef.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h> /* TODO: hide dependency (wrap in single porting file) */
-#include <gdk/gdkkeysyms.h>
-#include <gdk/gdkwindow.h>
-
-#include "../libspi/spi-private.h"
+
+#include <glib.h>
+
+#include <dbus/dbus.h>
+
+#include "paths.h"
+#include "de-types.h"
+#include "de-marshaller.h"
+#include "keymasks.h"
+
+#ifdef HAVE_X11
+#include "display.h"
+#include "event-source.h"
+#endif
+
#include "deviceeventcontroller.h"
+#include "reentrant-list.h"
+
+#include "introspection.h"
+
+#define CHECK_RELEASE_DELAY 20
+#define BIT(c, x) (c[x/8]&(1<<(x%8)))
+static SpiDEController *saved_controller;
/* Our parent Gtk object type */
-#define PARENT_TYPE BONOBO_TYPE_OBJECT
+#define PARENT_TYPE G_TYPE_OBJECT
/* 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;
+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;
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;
+ SPI_KEYMASK_MOD1 | SPI_KEYMASK_MOD2 | SPI_KEYMASK_MOD3 | SPI_KEYMASK_MOD4 |
+ SPI_KEYMASK_MOD5 | SPI_KEYMASK_SHIFT | SPI_KEYMASK_SHIFTLOCK |
+ SPI_KEYMASK_CONTROL | SPI_KEYMASK_NUMLOCK;
+static unsigned int _numlock_physical_mask = SPI_KEYMASK_MOD2; /* a guess, will be reset */
-int (*x_default_error_handler) (Display *display, XErrorEvent *error_event);
+static gboolean have_mouse_listener = FALSE;
+static gboolean have_mouse_event_listener = FALSE;
-typedef enum {
- SPI_DEVICE_TYPE_KBD,
- SPI_DEVICE_TYPE_MOUSE,
- SPI_DEVICE_TYPE_LAST_DEFINED
-} SpiDeviceTypeCategory;
typedef struct {
guint ref_count : 30;
guint pending_remove : 1;
Accessibility_ControllerEventMask mod_mask;
- CORBA_unsigned_long key_val; /* KeyCode */
+ dbus_uint32_t key_val; /* KeyCode */
} DEControllerGrabMask;
-typedef struct {
- CORBA_Object object;
- SpiDeviceTypeCategory type;
- Accessibility_EventTypeSeq *typeseq;
-} DEControllerListener;
-
-typedef struct {
- DEControllerListener listener;
- Accessibility_KeySet *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;
-} 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,
- 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 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)
-/* Private methods */
+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 unsigned int
-keysym_mod_mask (KeySym keysym, KeyCode keycode)
+static guint
+spi_dec_plat_mouse_check (SpiDEController *controller,
+ int *x, int *y, gboolean *moved)
{
- /* 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;
+ 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;
+}
- 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_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 KeyCode
-keycode_for_keysym (long keysym, unsigned int *modmask)
+static void
+spi_dec_plat_ungrab_key (SpiDEController *controller, guint key_val, Accessibility_ControllerEventMask mod_mask)
{
- KeyCode keycode = 0;
- keycode = XKeysymToKeycode (spi_get_display (), (KeySym) keysym);
- if (modmask)
- *modmask = keysym_mod_mask (keysym, keycode);
- return keycode;
+ 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)
+ 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)
+ 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)
+{
+ char *match = g_strdup_printf ("interface=%s,member=NameOwnerChanged,arg0=%s", DBUS_INTERFACE_DBUS, name);
+ if (match)
+ {
+ DBusError error;
+ dbus_error_init (&error);
+ dbus_bus_add_match (bus, match, &error);
+ g_free (match);
+ if (dbus_error_is_set (&error))
+ {
+ dbus_error_free (&error);
+ return FALSE;
+ }
+ else
+ {
+ return TRUE;
+ }
+ }
+ else return FALSE;
+}
+
+static dbus_bool_t
+spi_dbus_remove_disconnect_match (DBusConnection *bus, const char *name)
+{
+ char *match = g_strdup_printf ("interface=%s,member=NameOwnerChanged,arg0=%s", DBUS_INTERFACE_DBUS, name);
+ if (match)
+ {
+ DBusError error;
+ dbus_error_init (&error);
+ dbus_bus_remove_match (bus, match, &error);
+ g_free (match);
+ if (dbus_error_is_set (&error))
+ {
+ dbus_error_free (&error);
+ return FALSE;
+ }
+ else
+ {
+ return TRUE;
+ }
+ }
+ else return FALSE;
}
static DEControllerGrabMask *
}
}
-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 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: 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 = (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 guint
-spi_dec_mouse_check (SpiDEController *controller,
- int *x, int *y, gboolean *moved)
+void
+spi_dec_dbus_emit (SpiDEController *controller, const char *interface,
+ const char *name, const char *minor, int a1, int a2)
{
- 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));
- }
+ DBusMessage *signal = NULL;
+ DBusMessageIter iter, iter_struct, iter_variant;
+ int nil = 0;
+ const char *path = SPI_DBUS_PATH_ROOT;
+ const char *bus_name = dbus_bus_get_unique_name (controller->bus);
- 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;
- }
+ signal = dbus_message_new_signal (path, interface, name);
- return mask_return;
-}
+ dbus_message_iter_init_append (signal, &iter);
-static void
-spi_dec_emit_modifier_event (SpiDEController *controller, guint prev_mask,
- guint current_mask)
-{
- Accessibility_Event e;
- CORBA_Environment ev;
-
-#ifdef SPI_XKB_DEBUG
- fprintf (stderr, "MODIFIER CHANGE EVENT! %x to %x\n",
- prev_mask, current_mask);
-#endif
+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &minor);
+ 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);
- /* 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;
+ 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);
- 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);
+ dbus_connection_send (controller->bus, signal, NULL);
+ dbus_message_unref (signal);
}
static gboolean
spi_dec_poll_mouse_moved (gpointer data)
{
- SpiRegistry *registry = SPI_REGISTRY (data);
- SpiDEController *controller = registry->de_controller;
- int x, y;
+ SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER(data);
+ int x, y;
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;
}
static gboolean
spi_dec_poll_mouse_idle (gpointer data)
{
- if (! spi_dec_poll_mouse_moved (data))
+ if (!have_mouse_event_listener && !have_mouse_listener)
+ return FALSE;
+ else if (!spi_dec_poll_mouse_moved (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;
}
}
static gboolean
spi_dec_poll_mouse_moving (gpointer data)
{
- if (spi_dec_poll_mouse_moved (data))
+ if (!have_mouse_event_listener && !have_mouse_listener)
+ return FALSE;
+ else if (spi_dec_poll_mouse_moved (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 (SpiRegistry *registry)
-{
- Display *display = spi_get_display ();
- g_timeout_add (100, spi_dec_poll_mouse_idle, registry);
-
- if (display)
- {
- if (XGrabButton (display, AnyButton, AnyModifier,
- gdk_x11_get_default_root_xwindow (),
- True, ButtonPressMask | ButtonReleaseMask,
- GrabModeSync, GrabModeAsync, None, None) != Success)
- fprintf (stderr, "WARNING: could not grab mouse buttons!\n");
- XSync (display, False);
-#ifdef SPI_DEBUG
- fprintf (stderr, "mouse buttons grabbed\n");
-#endif
- }
-}
-
/**
* Eventually we can use this to make the marshalling of mask types
* more sane, but for now we just use this to detect
- * the use of 'virtual' masks such as Mumlock and convert them to
+ * the use of 'virtual' masks such as numlock and convert them to
* system-specific mask values (i.e. ModMask).
*
**/
static Accessibility_ControllerEventMask
spi_dec_translate_mask (Accessibility_ControllerEventMask mask)
{
- DEControllerPrivateData *priv;
+ Accessibility_ControllerEventMask tmp_mask;
+ gboolean has_numlock;
- if (mask == SPI_KEYMASK_NUMLOCK) {
- mask = _numlock_physical_mask;
- }
- return mask;
+ has_numlock = (mask & SPI_KEYMASK_NUMLOCK);
+ tmp_mask = mask;
+ if (has_numlock)
+ {
+ tmp_mask = mask ^ SPI_KEYMASK_NUMLOCK;
+ tmp_mask |= _numlock_physical_mask;
+ }
+
+ return tmp_mask;
}
static DEControllerKeyListener *
-spi_dec_key_listener_new (CORBA_Object l,
- const Accessibility_KeySet *keys,
+spi_dec_key_listener_new (const char *bus_name,
+ const char *path,
+ GSList *keys,
const Accessibility_ControllerEventMask mask,
- const Accessibility_EventTypeSeq *typeseq,
- const Accessibility_EventListenerMode *mode,
- CORBA_Environment *ev)
+ const dbus_uint32_t types,
+ const Accessibility_EventListenerMode *mode)
{
DEControllerKeyListener *key_listener = g_new0 (DEControllerKeyListener, 1);
- key_listener->listener.object = bonobo_object_dup_ref (l, ev);
+ key_listener->listener.bus_name = g_strdup(bus_name);
+ key_listener->listener.path = g_strdup(path);
key_listener->listener.type = SPI_DEVICE_TYPE_KBD;
- key_listener->keys = ORBit_copy_value (keys, TC_Accessibility_KeySet);
+ key_listener->keys = keys;
key_listener->mask = spi_dec_translate_mask (mask);
- key_listener->listener.typeseq = ORBit_copy_value (typeseq, TC_Accessibility_EventTypeSeq);
+ key_listener->listener.types = types;
if (mode)
- key_listener->mode = ORBit_copy_value (mode, TC_Accessibility_EventListenerMode);
+ {
+ key_listener->mode = (Accessibility_EventListenerMode *) g_malloc(sizeof(Accessibility_EventListenerMode));
+ memcpy(key_listener->mode, mode, sizeof(*mode));
+ }
else
key_listener->mode = NULL;
(unsigned int) key_listener->mask,
(int) (mode ? mode->global : 0),
(void *) key_listener->keys,
- (int) (key_listener->keys ? key_listener->keys->_length : 0));
+ (int) (key_listener->keys ? g_slist_length(key_listener->keys) : 0));
#endif
return key_listener;
}
static DEControllerListener *
-spi_dec_listener_new (CORBA_Object l,
- const Accessibility_EventTypeSeq *typeseq,
- CORBA_Environment *ev)
+spi_dec_listener_new (const char *bus_name,
+ const char *path,
+ dbus_uint32_t types)
{
DEControllerListener *listener = g_new0 (DEControllerListener, 1);
- listener->object = bonobo_object_dup_ref (l, ev);
+ listener->bus_name = g_strdup(bus_name);
+ listener->path = g_strdup(path);
listener->type = SPI_DEVICE_TYPE_MOUSE;
- listener->typeseq = ORBit_copy_value (typeseq, TC_Accessibility_EventTypeSeq);
+ listener->types = types;
return listener;
}
static DEControllerListener *
-spi_listener_clone (DEControllerListener *listener, CORBA_Environment *ev)
+spi_listener_clone (DEControllerListener *listener)
{
DEControllerListener *clone = g_new0 (DEControllerListener, 1);
- clone->object =
- CORBA_Object_duplicate (listener->object, ev);
+ clone->bus_name = g_strdup (listener->bus_name);
+ clone->path = g_strdup (listener->path);
clone->type = listener->type;
- clone->typeseq = ORBit_copy_value (listener->typeseq, TC_Accessibility_EventTypeSeq);
+ clone->types = listener->types;
return clone;
}
+static GSList *keylist_clone (GSList *s)
+{
+ GSList *d = NULL;
+ GSList *l;
+
+ for (l = s; l; l = g_slist_next(l))
+ {
+ Accessibility_KeyDefinition *kd = (Accessibility_KeyDefinition *)g_malloc(sizeof(Accessibility_KeyDefinition));
+ if (kd)
+ {
+ Accessibility_KeyDefinition *kds = (Accessibility_KeyDefinition *)l->data;
+ kd->keycode = kds->keycode;
+ kd->keysym = kds->keysym;
+ kd->keystring = g_strdup(kds->keystring);
+ d = g_slist_append(d, kd);
+ }
+ }
+ return d;
+}
+
static DEControllerKeyListener *
-spi_key_listener_clone (DEControllerKeyListener *key_listener, CORBA_Environment *ev)
+spi_key_listener_clone (DEControllerKeyListener *key_listener)
{
DEControllerKeyListener *clone = g_new0 (DEControllerKeyListener, 1);
- clone->listener.object =
- CORBA_Object_duplicate (key_listener->listener.object, ev);
+ clone->listener.bus_name = g_strdup (key_listener->listener.bus_name);
+ clone->listener.path = g_strdup (key_listener->listener.path);
clone->listener.type = SPI_DEVICE_TYPE_KBD;
- clone->keys = ORBit_copy_value (key_listener->keys, TC_Accessibility_KeySet);
+ clone->keys = keylist_clone (key_listener->keys);
clone->mask = key_listener->mask;
- clone->listener.typeseq = ORBit_copy_value (key_listener->listener.typeseq, TC_Accessibility_EventTypeSeq);
+ clone->listener.types = key_listener->listener.types;
if (key_listener->mode)
- clone->mode = ORBit_copy_value (key_listener->mode, TC_Accessibility_EventListenerMode);
+ {
+ clone->mode = (Accessibility_EventListenerMode *)g_malloc(sizeof(Accessibility_EventListenerMode));
+ if (clone->mode) memcpy(clone->mode, key_listener->mode, sizeof(Accessibility_EventListenerMode));
+ }
else
clone->mode = NULL;
return clone;
}
+static void keylist_free(GSList *keys)
+{
+ GSList *l;
+
+ for (l = keys; l; l = g_slist_next(l))
+ {
+ Accessibility_KeyDefinition *kd = (Accessibility_KeyDefinition *)l->data;
+ g_free(kd->keystring);
+ g_free(kd);
+ }
+ g_slist_free (keys);
+}
+
static void
-spi_key_listener_data_free (DEControllerKeyListener *key_listener, CORBA_Environment *ev)
+spi_key_listener_data_free (DEControllerKeyListener *key_listener)
{
- CORBA_free (key_listener->listener.typeseq);
- CORBA_free (key_listener->keys);
+ 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);
}
static void
-spi_key_listener_clone_free (DEControllerKeyListener *clone, CORBA_Environment *ev)
+spi_key_listener_clone_free (DEControllerKeyListener *clone)
{
- CORBA_Object_release (clone->listener.object, ev);
- spi_key_listener_data_free (clone, ev);
+ spi_key_listener_data_free (clone);
}
static void
-spi_listener_clone_free (DEControllerListener *clone, CORBA_Environment *ev)
+spi_listener_clone_free (DEControllerListener *clone)
{
- CORBA_Object_release (clone->object, ev);
- CORBA_free (clone->typeseq);
+ g_free (clone->path);
+ g_free (clone->bus_name);
g_free (clone);
}
static void
-spi_dec_listener_free (DEControllerListener *listener,
- CORBA_Environment *ev)
+spi_dec_listener_free (DEControllerListener *listener)
{
- bonobo_object_release_unref (listener->object, ev);
if (listener->type == SPI_DEVICE_TYPE_KBD)
- spi_key_listener_data_free ((DEControllerKeyListener *) listener, ev);
+ spi_key_listener_data_free ((DEControllerKeyListener *) listener);
+ else
+ {
+ g_free (listener->bus_name);
+ g_free (listener->path);
+ }
}
static void
cur_mask->pending_remove = TRUE;
}
}
- else
- {
- DBG (1, g_warning ("De-registering non-existant grab"));
- }
}
static void
DEControllerGrabMask grab_mask = { 0 };
grab_mask.mod_mask = key_listener->mask;
- if (key_listener->keys->_length == 0) /* special case means AnyKey/AllKeys */
+ if (g_slist_length (key_listener->keys) == 0) /* special case means AnyKey/AllKeys */
{
- grab_mask.key_val = AnyKey;
+ grab_mask.key_val = 0L; /* AnyKey */
#ifdef SPI_DEBUG
fprintf (stderr, "AnyKey grab!");
#endif
}
else
{
- int i;
+ GSList *l;
- for (i = 0; i < key_listener->keys->_length; ++i)
+ for (l = key_listener->keys; l; l = g_slist_next(l))
{
- Accessibility_KeyDefinition keydef = key_listener->keys->_buffer[i];
- 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;
- }
+ Accessibility_KeyDefinition *keydef = l->data;
+ 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);
}
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
spi_controller_register_device_listener (SpiDEController *controller,
- DEControllerListener *listener,
- CORBA_Environment *ev)
+ DEControllerListener *listener)
{
DEControllerKeyListener *key_listener;
+ gboolean retval;
switch (listener->type) {
case SPI_DEVICE_TYPE_KBD:
controller->key_listeners = g_list_prepend (controller->key_listeners,
key_listener);
+ 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) {
+ 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:
- DBG (1, g_warning ("listener registration for unknown device type.\n"));
break;
}
- return FALSE;
+ return FALSE;
}
-static gboolean
-spi_controller_notify_mouselisteners (SpiDEController *controller,
- const Accessibility_DeviceEvent *event,
- CORBA_Environment *ev)
+static void
+set_reply (DBusPendingCall *pending, void *user_data)
{
- GList *l;
- GSList *notify = NULL, *l2;
- GList **listeners = &controller->mouse_listeners;
- gboolean is_consumed;
+ void **replyptr = (void **)user_data;
- 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));
- }
- }
- }
+ *replyptr = dbus_pending_call_steal_reply (pending);
+}
-#ifdef SPI_KEYEVENT_DEBUG
- if (!notify)
- {
- g_print ("no match for event\n");
- }
-#endif
+static GSList *hung_processes = NULL;
- is_consumed = FALSE;
- for (l2 = notify; l2 && !is_consumed; l2 = l2->next)
- {
- DEControllerListener *listener = l2->data;
- Accessibility_DeviceEventListener ls = listener->object;
+static void
+reset_hung_process (DBusPendingCall *pending, void *data)
+{
+ DBusMessage *message = data;
+ const char *dest = dbus_message_get_destination (message);
+ GSList *l;
- 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);
- }
+ /* At this point we don't care about the result */
+ dbus_pending_call_unref (pending);
- for (; l2; l2 = l2->next)
+ for (l = hung_processes; l; l = l->next)
+ {
+ if (!strcmp (l->data, dest))
{
- 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_free (l->data);
+ hung_processes = g_slist_remove (hung_processes, l->data);
+ break;
}
+ }
+}
- g_slist_free (notify);
+static gint
+time_elapsed (struct timeval *origin)
+{
+ struct timeval tv;
-#ifdef SPI_DEBUG
- if (is_consumed) g_message ("consumed\n");
-#endif
- return is_consumed;
+ gettimeofday (&tv, NULL);
+ return (tv.tv_sec - origin->tv_sec) * 1000 + (tv.tv_usec - origin->tv_usec) / 1000;
}
static void
-spi_device_event_controller_forward_mouse_event (SpiDEController *controller,
- XEvent *xevent)
-{
- 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;
+reset_hung_process_from_ping (DBusPendingCall *pending, void *data)
+{
+ GSList *l;
- switch (button)
+ for (l = hung_processes; l; l = l->next)
+ {
+ if (!strcmp (l->data, data))
{
- 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;
- }
-
- 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
- snprintf (event_name, 22, "mouse:button:%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 = (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);
+ g_free (l->data);
+ hung_processes = g_slist_remove (hung_processes, l->data);
+ break;
}
-
- 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);
+ }
+ g_free (data);
+ dbus_pending_call_unref (pending);
}
-static GdkFilterReturn
-global_filter_fn (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
+static DBusMessage *
+send_and_allow_reentry (DBusConnection *bus, DBusMessage *message, int timeout, DBusError *error)
{
- 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);
+ DBusPendingCall *pending;
+ DBusMessage *reply = NULL;
+ struct timeval tv;
- if (xevent->type == KeyPress || xevent->type == KeyRelease)
+ if (!dbus_connection_send_with_reply (bus, message, &pending, -1))
{
- spi_device_event_controller_forward_key_event (controller, xevent);
- return GDK_FILTER_CONTINUE;
+ return NULL;
}
- if (xevent->type == ButtonPress || xevent->type == ButtonRelease)
+ dbus_pending_call_set_notify (pending, set_reply, (void *)&reply, NULL);
+ gettimeofday (&tv, NULL);
+ while (!reply)
{
- spi_device_event_controller_forward_mouse_event (controller, xevent);
+ 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;
+ }
}
- if (xevent->type == priv->xkb_base_event_code)
+ dbus_pending_call_unref (pending);
+ return reply;
+}
+static gboolean
+Accessibility_DeviceEventListener_NotifyEvent(SpiDEController *controller,
+ SpiRegistry *registry,
+ DEControllerListener *listener,
+ const Accessibility_DeviceEvent *key_event)
+{
+ 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;
+
+ for (l = hung_processes; l; l = l->next)
+ {
+ if (!strcmp (l->data, listener->bus_name))
{
- XkbAnyEvent * xkb_ev = (XkbAnyEvent *) xevent;
- /* ugly but probably necessary...*/
- XSynchronize (spi_get_display (), TRUE);
+ dbus_message_set_no_reply (message, TRUE);
+ hung = TRUE;
+ break;
+ }
+ }
- 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);
-#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);
+ if (spi_dbus_marshal_deviceEvent(message, key_event))
+ {
+ DBusMessage *reply;
+
+ if (hung)
+ {
+ dbus_connection_send (controller->bus, message, NULL);
+ dbus_message_unref (message);
+ return FALSE;
}
-
- return GDK_FILTER_CONTINUE;
+
+ 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;
}
-int
-_spi_controller_device_error_handler (Display *display, XErrorEvent *error)
+gboolean
+spi_controller_notify_mouselisteners (SpiDEController *controller,
+ const Accessibility_DeviceEvent *event)
{
- if (error->error_code == BadAccess)
- {
- g_message ("Could not complete key grab: grab already in use.\n");
- spi_error_code = BadAccess;
- return 0;
+ 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;
+ }
+
+ for (l = *listeners; l; l = l->next)
+ {
+ DEControllerListener *listener = l->data;
+
+ 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
+ }
}
- else
+
+#ifdef SPI_KEYEVENT_DEBUG
+ if (!found)
{
- return (*x_default_error_handler) (display, error);
+ g_print ("no match for event\n");
}
-}
+#endif
-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);
-
- /* calls to device-specific implementations and routines go here */
- /* register with: keyboard hardware code handler */
- /* register with: (translated) keystroke handler */
-
- 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)
+ is_consumed = FALSE;
+ for (l2 = notify; l2 && !is_consumed; l2 = l2->next)
{
- priv->xkb_desc = XkbGetMap (spi_get_display (), 0, XkbUseCoreKbd);
- XkbSelectEvents (spi_get_display (),
- XkbUseCoreKbd,
- XkbStateNotifyMask, XkbStateNotifyMask);
- _numlock_physical_mask = XkbKeysymToModifiers (spi_get_display (),
- XK_Num_Lock);
- }
+ DEControllerListener *listener = l2->data;
+
+ is_consumed = Accessibility_DeviceEventListener_NotifyEvent (controller, controller->registry, listener, event);
- gdk_window_add_filter (NULL, global_filter_fn, controller);
+ spi_listener_clone_free ((DEControllerListener *) l2->data);
+ }
+
+ 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 (Accessibility_KeySet *key_set,
+key_set_contains_key (GSList *key_set,
const Accessibility_DeviceEvent *key_event)
{
gint i;
gint len;
+ GSList *l;
if (!key_set)
{
- g_print ("null key set!");
+#ifdef SPI_DEBUG
+ g_print ("null key set!\n");
+#endif
return TRUE;
}
- len = key_set->_length;
+ len = g_slist_length (key_set);
if (len == 0) /* special case, means "all keys/any key" */
{
+#ifdef SPI_DEBUG
g_print ("anykey\n");
+#endif
return TRUE;
}
- for (i = 0; i < len; ++i)
+ for (l = key_set,i = 0; l; l = g_slist_next(l),i++)
{
+ Accessibility_KeyDefinition *kd = l->data;
#ifdef SPI_KEYEVENT_DEBUG
- 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);
+ g_print ("key_set[%d] event = %d, code = %d; key_event %d, code %d, string %s\n",
+ i,
+ (int) kd->keysym,
+ (int) kd->keycode,
+ (int) key_event->id,
+ (int) key_event->hw_code,
+ key_event->event_string);
#endif
- if (key_set->_buffer[i].keysym == (CORBA_long) key_event->id)
+ if (kd->keysym == (dbus_uint32_t) key_event->id)
{
return TRUE;
}
- if (key_set->_buffer[i].keycode == (CORBA_long) key_event->hw_code)
+ if (kd->keycode == (dbus_uint32_t) 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))
+ !strcmp (kd->keystring, key_event->event_string))
{
return TRUE;
}
}
-
+
return FALSE;
}
static gboolean
-spi_eventtype_seq_contains_event (Accessibility_EventTypeSeq *type_seq,
+eventtype_seq_contains_event (dbus_uint32_t types,
const Accessibility_DeviceEvent *event)
{
- gint i;
- gint len;
-
-
- if (!type_seq)
- {
- g_print ("null type seq!");
- return TRUE;
- }
-
- len = type_seq->_length;
-
- if (len == 0) /* special case, means "all events/any event" */
+ if (types == 0) /* special case, means "all events/any event" */
{
return TRUE;
}
- for (i = 0; i < len; ++i)
- {
-#ifdef SPI_DEBUG
- 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) event->type)
- {
- return TRUE;
- }
- }
-
- return FALSE;
+ return (types & (1 << event->type));
}
static gboolean
spi_key_event_matches_listener (const Accessibility_DeviceEvent *key_event,
DEControllerKeyListener *listener,
- CORBA_boolean is_system_global)
+ dbus_bool_t is_system_global)
{
- if ((key_event->modifiers == (CORBA_unsigned_short) (listener->mask & 0xFF)) &&
- spi_key_set_contains_key (listener->keys, key_event) &&
- spi_eventtype_seq_contains_event (listener->listener.typeseq, key_event) &&
+ if (((key_event->modifiers & 0xFF) == (dbus_uint16_t) (listener->mask & 0xFF)) &&
+ 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;
}
}
-static gboolean
+gboolean
spi_controller_notify_keylisteners (SpiDEController *controller,
- const Accessibility_DeviceEvent *key_event,
- CORBA_boolean is_system_global,
- CORBA_Environment *ev)
+ Accessibility_DeviceEvent *key_event,
+ dbus_bool_t is_system_global)
{
GList *l;
GSList *notify = NULL, *l2;
return FALSE;
}
+ /* set the NUMLOCK event mask bit if appropriate: see bug #143702 */
+ if (key_event->modifiers & _numlock_physical_mask)
+ key_event->modifiers |= SPI_KEYMASK_NUMLOCK;
+
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));
- }
+ /* we clone (don't dup) the listener, to avoid refcount inc. */
+ notify = g_slist_prepend (notify,
+ spi_key_listener_clone (key_listener));
}
}
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);
- }
+ is_consumed = Accessibility_DeviceEventListener_NotifyEvent (controller, controller->registry, &key_listener->listener, key_event) &&
+ key_listener->mode->preemptive;
- spi_key_listener_clone_free (key_listener, ev);
+ spi_key_listener_clone_free (key_listener);
}
for (; l2; l2 = l2->next)
{
DEControllerKeyListener *key_listener = l2->data;
- spi_key_listener_clone_free (key_listener, ev);
+ spi_key_listener_clone_free (key_listener);
/* clone doesn't have its own ref, so don't use spi_dec_listener_free */
}
return is_consumed;
}
-static gboolean
-spi_clear_error_state ()
+gboolean
+spi_clear_error_state (void)
{
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)
-{
- Accessibility_DeviceEvent key_event;
- KeySym keysym;
- const int cbuf_bytes = 20;
- char cbuf [cbuf_bytes+1];
- int nbytes;
-
- nbytes = XLookupString (x_key_event, cbuf, cbuf_bytes, &keysym, NULL);
- key_event.id = (CORBA_long)(keysym);
- key_event.hw_code = (CORBA_short) 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 = (CORBA_unsigned_short)(x_key_event->state);
- key_event.is_text = CORBA_FALSE;
- switch (keysym)
- {
- case ' ':
- key_event.event_string = CORBA_string_dup ("space");
- break;
- case XK_Tab:
- key_event.event_string = CORBA_string_dup ("Tab");
- break;
- case XK_BackSpace:
- key_event.event_string = CORBA_string_dup ("Backspace");
- break;
- 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 (nbytes > 0)
- {
- gunichar c;
- cbuf[nbytes] = '\0'; /* OK since length is cbuf_bytes+1 */
- key_event.event_string = CORBA_string_dup (cbuf);
- c = g_utf8_get_char_validated (cbuf, nbytes);
- if ((c > 0) && g_unichar_isprint (c))
- {
- key_event.is_text = CORBA_TRUE;
- /* incorrect for some composed chars? */
- }
- }
- else
- {
- key_event.event_string = CORBA_string_dup ("");
- }
- }
-
- key_event.timestamp = (CORBA_unsigned_long) x_key_event->time;
-#ifdef SPI_KEYEVENT_DEBUG
- fprintf (stderr,
- "Key %lu pressed (%c), modifiers %d; string=%s [%x] %s\n",
- (unsigned long) keysym,
- keysym ? (int) keysym : '*',
- (int) x_key_event->state,
- key_event.event_string,
- key_event.event_string[0],
- (key_event.is_text == CORBA_TRUE) ? "(text)" : "(not text)");
-#endif
-#ifdef SPI_DEBUG
- fprintf (stderr, "%s%c",
- (x_key_event->state & Mod1Mask)?"Alt-":"",
- ((x_key_event->state & ShiftMask)^(x_key_event->state & LockMask))?
- g_ascii_toupper (keysym) : g_ascii_tolower (keysym));
-#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;
+ long keycode = 0;
g_return_val_if_fail (controller != NULL, FALSE);
*
* ControlMask grabs are broken, must be in use already
*/
+ if (recv)
+ keycode = spi_dec_plat_get_keycode (controller, recv->id, NULL, TRUE, NULL);
for (l = controller->keygrabs_list; l; l = next)
{
gboolean do_remove;
re_issue_grab = recv &&
(recv->modifiers & grab_mask->mod_mask) &&
- (grab_mask->key_val == keycode_for_keysym (recv->id, NULL));
+ (grab_mask->key_val == keycode);
#ifdef SPI_DEBUG
fprintf (stderr, "mask=%lx %lx (%c%c) %s\n",
#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;
}
#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;
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 ()));
+ 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);
- spi_device_event_controller_parent_class->finalize (object);
+ parent_class->finalize (object);
}
/*
- * CORBA Accessibility::DEController::registerKeystrokeListener
+ * DBus Accessibility::DEController::RegisterKeystrokeListener
* method implementation
*/
-static CORBA_boolean
-impl_register_keystroke_listener (PortableServer_Servant servant,
- const Accessibility_DeviceEventListener l,
- const Accessibility_KeySet *keys,
- const Accessibility_ControllerEventMask mask,
- const Accessibility_EventTypeSeq *type,
- const Accessibility_EventListenerMode *mode,
- CORBA_Environment *ev)
-{
- SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER (
- bonobo_object_from_servant (servant));
+static DBusMessage *
+impl_register_keystroke_listener (DBusConnection *bus,
+ DBusMessage *message,
+ void *user_data)
+{
+ SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER(user_data);
DEControllerKeyListener *dec_listener;
+ DBusMessageIter iter, iter_array;
+ const char *path;
+ GSList *keys = NULL;
+ dbus_int32_t mask, type;
+ Accessibility_EventListenerMode *mode;
+ 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);
+ dbus_message_iter_get_basic(&iter, &path);
+ dbus_message_iter_next(&iter);
+ dbus_message_iter_recurse(&iter, &iter_array);
+ while (dbus_message_iter_get_arg_type(&iter_array) != DBUS_TYPE_INVALID)
+ {
+ 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);
+ keys = g_slist_append(keys, kd);
+ }
+ dbus_message_iter_next(&iter);
+ dbus_message_iter_get_basic(&iter, &mask);
+ dbus_message_iter_next(&iter);
+ dbus_message_iter_get_basic(&iter, &type);
+ dbus_message_iter_next(&iter);
+ mode = (Accessibility_EventListenerMode *)g_malloc(sizeof(Accessibility_EventListenerMode));
+ if (mode)
+ {
+ spi_dbus_message_iter_get_struct(&iter, DBUS_TYPE_BOOLEAN, &mode->synchronous, DBUS_TYPE_BOOLEAN, &mode->preemptive, DBUS_TYPE_BOOLEAN, &mode->global, DBUS_TYPE_INVALID);
+ }
#ifdef SPI_DEBUG
- fprintf (stderr, "registering keystroke listener %p with maskVal %lu\n",
- (void *) l, (unsigned long) mask);
+ fprintf (stderr, "registering keystroke listener %s:%s with maskVal %lu\n",
+ dbus_message_get_sender(message), path, (unsigned long) mask);
#endif
- dec_listener = spi_dec_key_listener_new (l, keys, mask, type, mode, ev);
- return spi_controller_register_device_listener (
- controller, (DEControllerListener *) dec_listener, ev);
+ 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);
+ if (reply)
+ {
+ dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &ret, DBUS_TYPE_INVALID);
+ }
+ return reply;
}
-
/*
- * CORBA Accessibility::DEController::registerDeviceEventListener
+ * DBus 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));
+static DBusMessage *
+impl_register_device_event_listener (DBusConnection *bus,
+ DBusMessage *message,
+ void *user_data)
+{
+ SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER(user_data);
DEControllerListener *dec_listener;
-
- dec_listener = spi_dec_listener_new (l, event_types, ev);
- return spi_controller_register_device_listener (
- controller, (DEControllerListener *) dec_listener, ev);
+ const char *path;
+ dbus_int32_t event_types;
+ dbus_bool_t ret;
+ DBusMessage *reply = NULL;
+
+ if (!dbus_message_get_args(message, NULL, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_UINT32, &event_types, DBUS_TYPE_INVALID))
+ {
+ 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 (
+ controller, (DEControllerListener *) dec_listener);
+ reply = dbus_message_new_method_return (message);
+ if (reply)
+ {
+ dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &ret, DBUS_TYPE_INVALID);
+ }
+ return reply;
}
typedef struct {
- CORBA_Environment *ev;
+ DBusConnection *bus;
DEControllerListener *listener;
} RemoveListenerClosure;
DEControllerListener *listener = (*list)->data;
RemoveListenerClosure *ctx = user_data;
- if (CORBA_Object_is_equivalent (ctx->listener->object,
- listener->object, ctx->ev))
+ if (!strcmp(ctx->listener->bus_name, listener->bus_name) &&
+ !strcmp(ctx->listener->path, listener->path))
{
spi_re_entrant_list_delete_link (list);
- spi_dec_listener_free (listener, ctx->ev);
+ spi_dbus_remove_disconnect_match (ctx->bus, listener->bus_name);
+ spi_dec_listener_free (listener);
}
return SPI_RE_ENTRANT_CONTINUE;
DEControllerKeyListener *key_listener = (*list)->data;
RemoveListenerClosure *ctx = user_data;
- if (CORBA_Object_is_equivalent (ctx->listener->object,
- key_listener->listener.object, ctx->ev))
+ if (!strcmp(ctx->listener->bus_name, key_listener->listener.bus_name) &&
+ !strcmp(ctx->listener->path, key_listener->listener.path))
{
/* 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);
+ keylist_free (ctx_key_listener->keys);
+ ctx_key_listener->keys = keylist_clone(key_listener->keys);
}
return SPI_RE_ENTRANT_CONTINUE;
}
static void
-spi_deregister_controller_device_listener (SpiDEController *controller,
- DEControllerListener *listener,
- CORBA_Environment *ev)
+spi_controller_deregister_device_listener (SpiDEController *controller,
+ DEControllerListener *listener)
{
RemoveListenerClosure ctx;
- ctx.ev = ev;
+ 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)
+ have_mouse_listener = FALSE;
}
static void
spi_deregister_controller_key_listener (SpiDEController *controller,
- DEControllerKeyListener *key_listener,
- CORBA_Environment *ev)
+ DEControllerKeyListener *key_listener)
{
RemoveListenerClosure ctx;
- ctx.ev = ev;
- ctx.listener = (DEControllerListener *) key_listener;
+ ctx.bus = controller->bus;
+ 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 (key_listener->keys->_length == 0)
+ if (g_slist_length(key_listener->keys) == 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);
+ spi_key_listener_clone_free ((DEControllerKeyListener *) ctx.listener);
+}
+
+void
+spi_remove_device_listeners (SpiDEController *controller, const char *bus_name)
+{
+ GList *l, *tmp;
+
+ for (l = controller->mouse_listeners; l; l = tmp)
+ {
+ DEControllerListener *listener = l->data;
+ tmp = l->next;
+ 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)
+ {
+ DEControllerKeyListener *key_listener = l->data;
+ 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;
+ }
+ }
}
/*
- * CORBA Accessibility::DEController::deregisterKeystrokeListener
+ * DBus Accessibility::DEController::DeregisterKeystrokeListener
* method implementation
*/
-static void
-impl_deregister_keystroke_listener (PortableServer_Servant servant,
- const Accessibility_DeviceEventListener l,
- const Accessibility_KeySet *keys,
- const Accessibility_ControllerEventMask mask,
- const Accessibility_EventTypeSeq *type,
- CORBA_Environment *ev)
-{
- DEControllerKeyListener *key_listener;
- SpiDEController *controller;
-
- controller = SPI_DEVICE_EVENT_CONTROLLER (bonobo_object (servant));
+static DBusMessage *
+impl_deregister_keystroke_listener (DBusConnection *bus,
+ DBusMessage *message,
+ void *user_data)
+{
+ SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER(user_data);
+ DEControllerKeyListener *key_listener;
+ DBusMessageIter iter, iter_array;
+ const char *path;
+ GSList *keys = NULL;
+ dbus_int32_t mask, type;
+ DBusMessage *reply = NULL;
+
+ dbus_message_iter_init(message, &iter);
+ 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);
+ }
- key_listener = spi_dec_key_listener_new (l, keys, mask, type, NULL, ev);
+ dbus_message_iter_get_basic(&iter, &path);
+ dbus_message_iter_next(&iter);
+ dbus_message_iter_recurse(&iter, &iter_array);
+ while (dbus_message_iter_get_arg_type(&iter_array) != DBUS_TYPE_INVALID)
+ {
+ Accessibility_KeyDefinition *kd = (Accessibility_KeyDefinition *)g_malloc(sizeof(Accessibility_KeyDefinition));
+ char *keystring;
+ 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);
+ keys = g_slist_append(keys, kd);
+ }
+ dbus_message_iter_next(&iter);
+ dbus_message_iter_get_basic(&iter, &mask);
+ dbus_message_iter_next(&iter);
+ dbus_message_iter_get_basic(&iter, &type);
+ dbus_message_iter_next(&iter);
+ key_listener = spi_dec_key_listener_new (dbus_message_get_sender(message), path, keys, mask, type, NULL);
#ifdef SPI_DEREGISTER_DEBUG
fprintf (stderr, "deregistering keystroke listener %p with maskVal %lu\n",
(void *) l, (unsigned long) mask->value);
#endif
- spi_deregister_controller_key_listener (controller, key_listener, ev);
+ spi_deregister_controller_key_listener (controller, key_listener);
- spi_dec_listener_free ((DEControllerListener *) key_listener, ev);
+ spi_dec_listener_free ((DEControllerListener *) key_listener);
+ reply = dbus_message_new_method_return (message);
+ return reply;
}
/*
- * CORBA Accessibility::DEController::deregisterDeviceEventListener
+ * DBus Accessibility::DEController::DeregisterDeviceEventListener
* method implementation
*/
-static void
-impl_deregister_device_listener (PortableServer_Servant servant,
- const Accessibility_DeviceEventListener l,
- const Accessibility_EventTypeSeq *event_types,
- CORBA_Environment *ev)
-{
- 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
-#ifdef SPI_XKB_DEBUG
- fprintf (stderr, "SlowKeys delay: %d\n", (int) retval);
-#endif
- return retval;
+static DBusMessage *
+impl_deregister_device_event_listener (DBusConnection *bus,
+ DBusMessage *message,
+ void *user_data)
+{
+ SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER(user_data);
+ DEControllerListener *listener;
+ const char *path;
+ dbus_int32_t event_types;
+ DBusMessage *reply = NULL;
+
+ if (!dbus_message_get_args(message, NULL, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_UINT32, &event_types, DBUS_TYPE_INVALID))
+ {
+ return invalid_arguments_error (message);
+ }
+ listener = spi_dec_listener_new (dbus_message_get_sender(message), path, event_types);
+ spi_controller_deregister_device_listener (
+ controller, listener);
+ reply = dbus_message_new_method_return (message);
+ return reply;
}
-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;
- 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)
-{
- return XkbLockModifiers (spi_get_display (), XkbUseCoreKbd,
- modifiers, modifiers);
-}
+ if (!reply)
+ return NULL;
-static gboolean
-dec_unlock_modifiers (SpiDEController *controller, unsigned modifiers)
-{
- return XkbLockModifiers (spi_get_display (), XkbUseCoreKbd,
- modifiers, 0);
+ 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;
}
-dec_keysym_for_unichar (SpiDEController *controller, gunichar unichar)
+static unsigned
+get_modifier_state (SpiDEController *controller)
{
- /* TODO: table lookups within a range, for various code pages! */
- KeySym keysym = NoSymbol;
-
- if (unichar >= 0x20 && unichar < 0x7f) { /* Basic Latin/ASCII */
- keysym = (KeySym) unichar;
- }
- else if (unichar >= 0xa0 && unichar <= 0xff) { /* Latin 1 extensions */
- keysym = (KeySym) unichar;
- }
- else if (unichar >= 0x100 && unichar <= 0x233) { /* unfortunately the mapping gets nasty for Latin-2 and 3... help! */
- keysym = NoSymbol;
- }
- else if (unichar >= 0x7c1 && unichar <= 0x3a1) { /* let's try Greek anyway... */
- keysym = (KeySym) (0x391 + (unichar - 0x7c1));
- }
- else if (unichar >= 0x3a3 && unichar <= 0x3a9) { /* let's try Greek anyway... */
- keysym = (KeySym) (0x7d2 + (unichar - 0x3a3));
- }
- else if (unichar >= 0x3b1 && unichar <= 0x3c1) { /* let's try Greek anyway... */
- keysym = (KeySym) (0x7e1 + (unichar - 0x3b1));
- }
- else if (unichar == 0x3c2) {
- keysym = (KeySym) 0x7f3; /* XK_Greek_finalsmallsigma; */
- }
- else if (unichar >= 0x3c3 && unichar <= 0x3c9) { /* let's try Greek anyway... */
- keysym = (KeySym) (0x7f2 + (unichar - 0x3c2));
- }
- else if (unichar >= 0x5d0 && unichar <= 0x5ea) { /* Hebrew basics */
- /* probably broken :-) */
- keysym = (KeySym) (0xce0 + (unichar - 0x5d0));
- }
- else if (unichar >= 0x30a1 && unichar <= 0x30ab) { /* partial katakana support */
- /* TODO: complete! */
- keysym = (KeySym) (0x4b1 + (unichar - 0x30a1)/2);
- }
- else if (unichar >= 0x20a0 && unichar <= 0x20ac) { /* currency */
- keysym = (KeySym) unichar; /* how convenient ;-) */
- }
- return keysym;
+ 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 (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 CORBA_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);
- 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;
- 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;
- }
- }
- }
- g_free (keysyms);
-
- return retval;
-}
-
/*
- * CORBA Accessibility::DEController::registerKeystrokeListener
+ * DBus Accessibility::DEController::RegisterKeystrokeListener
* method implementation
*/
-static void
-impl_generate_keyboard_event (PortableServer_Servant servant,
- const CORBA_long keycode,
- const CORBA_char *keystring,
- const Accessibility_KeySynthType synth_type,
- CORBA_Environment *ev)
-{
- SpiDEController *controller =
- SPI_DEVICE_EVENT_CONTROLLER (bonobo_object (servant));
- long key_synth_code;
- KeySym keysym;
+static DBusMessage *
+impl_generate_keyboard_event (DBusConnection *bus, DBusMessage *message, void *user_data)
+{
+ SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER(user_data);
+ dbus_int32_t keycode;
+ char *keystring;
+ dbus_uint32_t synth_type;
+ DBusMessage *reply = NULL;
+
+ if (!dbus_message_get_args(message, NULL, DBUS_TYPE_INT32, &keycode, DBUS_TYPE_STRING, &keystring, DBUS_TYPE_UINT32, &synth_type, DBUS_TYPE_INVALID))
+ {
+ return invalid_arguments_error (message);
+ }
#ifdef SPI_DEBUG
fprintf (stderr, "synthesizing keystroke %ld, type %d\n",
* and fall back to XSendEvent() if XTest is not available.
*/
- gdk_error_trap_push ();
- key_synth_code = keycode;
-
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
* in our arg list; it can contain either
* a keycode or a keysym.
*/
- dec_synth_keysym (controller, (KeySym) keycode);
+ spi_dec_synth_keysym (controller, keycode);
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;
+ case Accessibility_KEY_LOCKMODIFIERS:
+ spi_dec_plat_lock_modifiers (controller, keycode);
+ break;
+ case Accessibility_KEY_UNLOCKMODIFIERS:
+ spi_dec_plat_unlock_modifiers (controller, keycode);
+ break;
}
- if (gdk_error_trap_pop ())
- {
- DBG (-1, g_warning ("Error emitting keystroke"));
- }
- 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 void
-impl_generate_mouse_event (PortableServer_Servant servant,
- const CORBA_long x,
- const CORBA_long y,
- const CORBA_char *eventName,
- CORBA_Environment *ev)
-{
- int button = 0;
- gboolean error = FALSE;
- Display *display = spi_get_display ();
+/* Accessibility::DEController::GenerateMouseEvent */
+static DBusMessage *
+impl_generate_mouse_event (DBusConnection *bus, DBusMessage *message, void *user_data)
+{
+ dbus_int32_t x;
+ dbus_int32_t y;
+ char *eventName;
+ DBusMessage *reply = NULL;
+
+ if (!dbus_message_get_args(message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, DBUS_TYPE_STRING, &eventName, DBUS_TYPE_INVALID))
+ {
+ 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:
- 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;
- }
+ spi_dec_plat_generate_mouse_event (saved_controller, x, y, eventName);
+ reply = dbus_message_new_method_return (message);
+ return reply;
}
-/* Accessibility::DEController::notifyListenersSync */
-static CORBA_boolean
-impl_notify_listeners_sync (PortableServer_Servant servant,
- const Accessibility_DeviceEvent *event,
- CORBA_Environment *ev)
+/* Accessibility::DEController::NotifyListenersSync */
+static DBusMessage *
+impl_notify_listeners_sync (DBusConnection *bus, DBusMessage *message, void *user_data)
{
- SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER (
- bonobo_object_from_servant (servant));
+ SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER(user_data);
+ Accessibility_DeviceEvent event;
+ dbus_bool_t ret;
+ DBusMessage *reply = NULL;
+
+ if (!spi_dbus_demarshal_deviceEvent(message, &event))
+ {
+ return invalid_arguments_error (message);
+ }
#ifdef SPI_DEBUG
g_print ("notifylistening listeners synchronously: controller %p, event id %d\n",
- controller, (int) event->id);
+ controller, (int) event.id);
#endif
- return spi_controller_notify_keylisteners (controller, event, CORBA_FALSE, ev) ?
- CORBA_TRUE : CORBA_FALSE;
+ ret = spi_controller_notify_keylisteners (controller,
+ (Accessibility_DeviceEvent *)
+ &event, FALSE) ?
+ TRUE : FALSE;
+ reply = dbus_message_new_method_return (message);
+ if (reply)
+ {
+ dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &ret, DBUS_TYPE_INVALID);
+ }
+ return reply;
}
-/* Accessibility::DEController::notifyListenersAsync */
-static void
-impl_notify_listeners_async (PortableServer_Servant servant,
- const Accessibility_DeviceEvent *event,
- CORBA_Environment *ev)
+static DBusMessage *
+impl_notify_listeners_async (DBusConnection *bus, DBusMessage *message, void *user_data)
{
- SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER (
- bonobo_object_from_servant (servant));
+ SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER(user_data);
+ Accessibility_DeviceEvent event;
+ DBusMessage *reply = NULL;
+
+ if (!spi_dbus_demarshal_deviceEvent(message, &event))
+ {
+ return invalid_arguments_error (message);
+ }
#ifdef SPI_DEBUG
- fprintf (stderr, "notifying listeners asynchronously\n");
+ g_print ("notifylistening listeners asynchronously: controller %p, event id %d\n",
+ controller, (int) event.id);
#endif
- spi_controller_notify_keylisteners (controller, event, CORBA_FALSE, ev);
+ spi_controller_notify_keylisteners (controller, (Accessibility_DeviceEvent *)
+ &event, FALSE);
+ reply = dbus_message_new_method_return (message);
+ return reply;
}
static void
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);
-
+
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");
+#ifdef HAVE_X11
+ if (g_getenv ("DISPLAY"))
+ spi_dec_setup_x11 (klass);
+ else
+#endif
+ g_type_class_add_private (object_class, sizeof (long)); /* dummy */
}
static void
spi_device_event_controller_init (SpiDEController *device_event_controller)
{
- DEControllerPrivateData *private;
- device_event_controller->key_listeners = NULL;
- device_event_controller->mouse_listeners = NULL;
- device_event_controller->keygrabs_list = NULL;
+ SpiDEControllerClass *klass;
+ klass = SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS (device_event_controller);
+
+ /* 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;
- 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);
+ if (klass->plat.init)
+ klass->plat.init (device_event_controller);
}
-static void
-spi_device_event_controller_forward_key_event (SpiDEController *controller,
- const XEvent *event)
+
+/*---------------------------------------------------------------------------*/
+
+static const char *introspection_header =
+"<?xml version=\"1.0\"?>\n";
+
+static const char *introspection_node_element =
+"<node name=\"%s\">\n";
+
+static const char *introspection_footer =
+"</node>";
+
+static DBusMessage *
+impl_Introspect (DBusConnection * bus,
+ DBusMessage * message, void *user_data)
{
- gboolean is_consumed = FALSE;
- CORBA_Environment ev;
- Accessibility_DeviceEvent key_event;
+ GString *output;
+ gchar *final;
+
+ const gchar *pathstr = SPI_DBUS_PATH_DEC;
+
+ DBusMessage *reply;
+
+ output = g_string_new(introspection_header);
+
+ g_string_append_printf(output, introspection_node_element, pathstr);
- g_assert (event->type == KeyPress || event->type == KeyRelease);
+ g_string_append (output, spi_org_a11y_atspi_DeviceEventController);
- CORBA_exception_init (&ev);
+ g_string_append(output, introspection_footer);
+ final = g_string_free(output, FALSE);
- key_event = spi_keystroke_from_x_key_event ((XKeyEvent *) event);
+ reply = dbus_message_new_method_return (message);
+ dbus_message_append_args(reply, DBUS_TYPE_STRING, &final, DBUS_TYPE_INVALID);
- spi_controller_update_key_grabs (controller, &key_event);
+ g_free(final);
+ return reply;
+}
+
+/*---------------------------------------------------------------------------*/
- /* relay to listeners, and decide whether to consume it or not */
- is_consumed = spi_controller_notify_keylisteners (
- controller, &key_event, CORBA_TRUE, &ev);
+static void
+handle_dec_method_from_idle (DBusConnection *bus, DBusMessage *message, void *user_data)
+{
+ 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 (is_consumed)
+ if (!strcmp (iface, SPI_DBUS_INTERFACE_DEC))
{
- XAllowEvents (spi_get_display (), AsyncKeyboard, CurrentTime);
+ 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;
}
- else
+
+ 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);
+ }
+
+ dbus_connection_send (bus, reply, NULL);
+ dbus_message_unref (reply);
+ }
+}
+
+static gboolean
+message_queue_dispatch (gpointer data)
+{
+ saved_controller->message_queue_idle = 0;
+ while (!g_queue_is_empty (saved_controller->message_queue))
{
- XAllowEvents (spi_get_display (), ReplayKeyboard, CurrentTime);
+ 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 FALSE;
+}
+
+static DBusHandlerResult
+handle_dec_method (DBusConnection *bus, DBusMessage *message, void *user_data)
+{
+ 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 DBusObjectPathVTable dec_vtable =
+{
+ NULL,
+ &handle_dec_method,
+ NULL, NULL, NULL, NULL
+};
+
SpiDEController *
-spi_device_event_controller_new (SpiRegistry *registry)
+spi_registry_dec_new (SpiRegistry *reg, DBusConnection *bus)
{
- SpiDEController *retval = g_object_new (
- SPI_DEVICE_EVENT_CONTROLLER_TYPE, NULL);
-
- retval->registry = SPI_REGISTRY (bonobo_object_ref (
- BONOBO_OBJECT (registry)));
+ SpiDEController *dec = g_object_new (SPI_DEVICE_EVENT_CONTROLLER_TYPE, NULL);
+
+ dec->registry = g_object_ref (reg);
+ reg->dec = g_object_ref (dec);
+ dec->bus = bus;
+
+ dbus_connection_register_object_path (bus, SPI_DBUS_PATH_DEC, &dec_vtable, dec);
- spi_dec_init_mouse_listener (registry);
- /* TODO: kill mouse listener on finalize */
- return retval;
+ return dec;
}
-BONOBO_TYPE_FUNC_FULL (SpiDEController,
- Accessibility_DeviceEventController,
- PARENT_TYPE,
- spi_device_event_controller)
+void
+spi_device_event_controller_start_poll_mouse (SpiRegistry *registry)
+{
+ if (!have_mouse_event_listener)
+ {
+ have_mouse_event_listener = TRUE;
+ 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");
+ }
+ }
+}
+
+void
+spi_device_event_controller_stop_poll_mouse (void)
+{
+ have_mouse_event_listener = FALSE;
+}