Device fixes

1 files changed, 227 insertions, 2 deletions

diff --git a/atspi/atspi-device-legacy.c b/atspi/atspi-device-legacy.c
index fbae5f03..6950bc37 100644
--- a/atspi/atspi-device-legacy.c
+++ b/atspi/atspi-device-legacy.c
@@ -23,10 +23,30 @@
 #include "atspi-private.h"
 #include "atspi-device-legacy.h"
 
+#ifdef HAVE_X11
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/XInput2.h>
+#include <X11/XKBlib.h>
+#endif
+
+typedef struct
+{
+  guint keycode;
+  guint modifier;
+} AtspiLegacyKeyModifier;
+
 typedef struct _AtspiDeviceLegacyPrivate AtspiDeviceLegacyPrivate;
 struct _AtspiDeviceLegacyPrivate
 {
   AtspiDeviceListener *listener;
+#ifdef HAVE_X11
+  Display *display;
+  Window window;
+#endif
+  GSList *modifiers;
+  guint virtual_mods_enabled;
+  gboolean keyboard_grabbed;
 };
 
 GObjectClass *device_legacy_parent_class;
@@ -35,12 +55,203 @@ G_DEFINE_TYPE_WITH_CODE (AtspiDeviceLegacy, atspi_device_legacy,
 			  ATSPI_TYPE_DEVICE,
 			  G_ADD_PRIVATE (AtspiDeviceLegacy))
 
+
+static guint
+find_virtual_mapping (AtspiDeviceLegacy *legacy_device, gint keycode)
+{
+  AtspiDeviceLegacyPrivate *priv = atspi_device_legacy_get_instance_private (legacy_device);
+  GSList *l;
+
+  for (l = priv->modifiers; l; l = l->next)
+  {
+    AtspiLegacyKeyModifier *entry = l->data;
+    if (entry->keycode == keycode)
+      return entry->modifier;
+  }
+
+  return 0;
+}
+
+static void
+set_virtual_modifier (AtspiDeviceLegacy *legacy_device, gint keycode, gboolean enabled)
+{
+  AtspiDeviceLegacyPrivate *priv = atspi_device_legacy_get_instance_private (legacy_device);
+  guint modifier = find_virtual_mapping (legacy_device, keycode);
+
+  if (enabled)
+    priv->virtual_mods_enabled |= modifier;
+  else
+    priv->virtual_mods_enabled &= ~modifier;
+}
+
+
 gboolean
 key_cb (const AtspiDeviceEvent *event, void *user_data)
 {
-  AtspiDeviceLegacy *device = ATSPI_DEVICE_LEGACY (user_data);
+  AtspiDeviceLegacy *legacy_device = ATSPI_DEVICE_LEGACY (user_data);
+  AtspiDeviceLegacyPrivate *priv = atspi_device_legacy_get_instance_private (legacy_device);
+  gboolean ret = priv->keyboard_grabbed;
+
+  set_virtual_modifier (legacy_device, event->hw_code,
+                        event->type == (AtspiEventType)ATSPI_KEY_PRESS);
+  ret |= atspi_device_notify_key (ATSPI_DEVICE (legacy_device),
+                                  event->type == (AtspiEventType)ATSPI_KEY_PRESS,
+                                  event->hw_code, event->id,
+                                  event->modifiers | priv->virtual_mods_enabled,
+                                  event->event_string);
+
+  return ret;
+}
+
+static guint
+atspi_device_legacy_get_locked_modifiers (AtspiDevice *device)
+{
+#ifdef HAVE_X11
+  AtspiDeviceLegacy *legacy_device = ATSPI_DEVICE_LEGACY (device);
+  AtspiDeviceLegacyPrivate *priv = atspi_device_legacy_get_instance_private (legacy_device);
+  XkbStateRec state_rec;
+
+  memset (&state_rec, 0, sizeof (state_rec));
+  XkbGetState (priv->display, XkbUseCoreKbd, &state_rec);
+  return state_rec.locked_mods;
+#else
+  return 0;
+#endif
+}
+
+static gboolean
+check_virtual_modifier (AtspiDeviceLegacy *legacy_device, guint modifier)
+{
+  AtspiDeviceLegacyPrivate *priv = atspi_device_legacy_get_instance_private (legacy_device);
+  GSList *l;
 
-   return atspi_device_notify_key (ATSPI_DEVICE (device), event->type == (AtspiEventType)ATSPI_KEY_PRESS, event->hw_code, event->id, event->modifiers, event->event_string);
+  for (l = priv->modifiers; l; l = l->next)
+  {
+    AtspiLegacyKeyModifier *entry = l->data;
+    if (entry->modifier == modifier)
+      return TRUE;
+  }
+
+  return FALSE;
+}
+
+static guint
+get_unused_virtual_modifier (AtspiDeviceLegacy *legacy_device)
+{
+  guint ret = 0x1000;
+
+  while (ret < 0x10000)
+  {
+    if (!check_virtual_modifier (legacy_device, ret))
+      return ret;
+    ret <<= 1;
+  }
+
+  return 0;
+}
+
+static guint
+atspi_device_legacy_map_modifier (AtspiDevice *device, gint keycode)
+{
+  AtspiDeviceLegacy *legacy_device = ATSPI_DEVICE_LEGACY (device);
+  AtspiDeviceLegacyPrivate *priv = atspi_device_legacy_get_instance_private (legacy_device);
+  guint ret;
+  AtspiLegacyKeyModifier *entry;
+#ifdef HAVE_X11
+  XkbDescPtr desc;
+
+  desc = XkbGetMap (priv->display, XkbModifierMapMask, XkbUseCoreKbd);
+
+  if (keycode < desc->min_key_code || keycode >= desc->max_key_code)
+  {
+    XkbFreeKeyboard (desc, XkbModifierMapMask, TRUE);
+    g_warning ("Passed invalid keycode %d", keycode);
+    return 0;
+  }
+
+  ret = desc->map->modmap[keycode];
+  XkbFreeKeyboard (desc, XkbModifierMapMask, TRUE);
+  if (ret & (ShiftMask | ControlMask))
+    return ret;
+#endif
+
+  ret = find_virtual_mapping (legacy_device, keycode);
+  if (ret)
+    return ret;
+
+  ret = get_unused_virtual_modifier (legacy_device);
+
+  entry = g_new (AtspiLegacyKeyModifier, 1);
+  entry->keycode = keycode;
+  entry->modifier = ret;
+  priv->modifiers = g_slist_append (priv->modifiers, entry);
+
+  return ret;
+}
+
+static void
+atspi_device_legacy_unmap_modifier (AtspiDevice *device, gint keycode)
+{
+  AtspiDeviceLegacy *legacy_device = ATSPI_DEVICE_LEGACY (device);
+  AtspiDeviceLegacyPrivate *priv = atspi_device_legacy_get_instance_private (legacy_device);
+  GSList *l;
+
+  for (l = priv->modifiers; l; l = l->next)
+  {
+    AtspiLegacyKeyModifier *entry = l->data;
+    if (entry->keycode == keycode)
+    {
+      g_free (entry);
+      priv->modifiers = g_slist_remove (priv->modifiers, entry);
+      return;
+    }
+  }
+}
+
+static guint
+atspi_device_legacy_get_modifier (AtspiDevice *device, gint keycode)
+{
+  AtspiDeviceLegacy *legacy_device = ATSPI_DEVICE_LEGACY (device);
+#ifdef HAVE_X11
+  AtspiDeviceLegacyPrivate *priv = atspi_device_legacy_get_instance_private (legacy_device);
+  XkbDescPtr desc;
+  guint ret;
+
+  desc = XkbGetMap (priv->display, XkbModifierMapMask, XkbUseCoreKbd);
+
+  if (keycode < desc->min_key_code || keycode >= desc->max_key_code)
+  {
+    XkbFreeKeyboard (desc, XkbModifierMapMask, TRUE);
+    g_warning ("Passed invalid keycode %d", keycode);
+    return 0;
+  }
+
+  ret = desc->map->modmap[keycode];
+  XkbFreeKeyboard (desc, XkbModifierMapMask, TRUE);
+  if (ret)
+    return ret;
+#endif
+
+  return find_virtual_mapping (legacy_device, keycode);
+}
+
+static gboolean
+atspi_device_legacy_grab_keyboard (AtspiDevice *device)
+{
+  AtspiDeviceLegacy *legacy_device = ATSPI_DEVICE_LEGACY (device);
+  AtspiDeviceLegacyPrivate *priv = atspi_device_legacy_get_instance_private (legacy_device);
+
+  priv->keyboard_grabbed = TRUE;
+  return TRUE;
+}
+
+static void
+atspi_device_legacy_ungrab_keyboard (AtspiDevice *device)
+{
+  AtspiDeviceLegacy *legacy_device = ATSPI_DEVICE_LEGACY (device);
+  AtspiDeviceLegacyPrivate *priv = atspi_device_legacy_get_instance_private (legacy_device);
+
+  priv->keyboard_grabbed = FALSE;
 }
 
 static void
@@ -52,6 +263,13 @@ atspi_device_legacy_init (AtspiDeviceLegacy *device)
   priv->listener = atspi_device_listener_new (key_cb, device, NULL);
   for (i = 0; i < 256; i++)
     atspi_register_keystroke_listener (priv->listener, NULL, i, 3, ATSPI_KEYLISTENER_SYNCHRONOUS | ATSPI_KEYLISTENER_CANCONSUME, NULL);
+
+#ifdef HAVE_X11
+  priv->display=XOpenDisplay("");
+  if (priv->display)
+    priv->window = DefaultRootWindow(priv->display);
+#endif
+
 }
 
 static void
@@ -69,9 +287,16 @@ static void
 atspi_device_legacy_class_init (AtspiDeviceLegacyClass *klass)
 {
   GObjectClass *object_class = (GObjectClass *) klass;
+  AtspiDeviceClass *device_class = ATSPI_DEVICE_CLASS (klass);
 
   device_legacy_parent_class = g_type_class_peek_parent (klass);
   object_class->finalize = atspi_device_legacy_finalize;
+  device_class->map_modifier = atspi_device_legacy_map_modifier;
+  device_class->unmap_modifier = atspi_device_legacy_unmap_modifier;
+  device_class->get_modifier = atspi_device_legacy_get_modifier;
+  device_class->get_locked_modifiers = atspi_device_legacy_get_locked_modifiers;
+  device_class->grab_keyboard = atspi_device_legacy_grab_keyboard;
+  device_class->ungrab_keyboard = atspi_device_legacy_ungrab_keyboard;
 }
 
 /**