Copy in key mask defines from Xlib.h

[platform/upstream/at-spi2-core.git] / registryd / deviceeventcontroller.c

diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
index 8279a1d..8fefbd7 100644 (file)
--- a/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@ -66,8 +66,10 @@ struct _SpiPoint {
 typedef struct _SpiPoint SpiPoint;
 static unsigned int mouse_mask_state = 0;
 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 */
+  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 */
 
 static gboolean have_mouse_listener = FALSE;
 static gboolean have_mouse_event_listener = FALSE;
@@ -204,7 +206,7 @@ spi_dec_plat_emit_modifier_event (SpiDEController *controller, guint prev_mask,
   SpiDEControllerClass *klass;
   klass = SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS (controller);
   if (klass->plat.emit_modifier_event)
-    return klass->plat.emit_modifier_event (controller, prev_mask, current_mask);
+    klass->plat.emit_modifier_event (controller, prev_mask, current_mask);
 }
 
 static void
@@ -216,7 +218,7 @@ spi_dec_plat_generate_mouse_event (SpiDEController *controller,
   SpiDEControllerClass *klass;
   klass = SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS (controller);
   if (klass->plat.generate_mouse_event)
-    return klass->plat.generate_mouse_event (controller, x, y, eventName);
+    klass->plat.generate_mouse_event (controller, x, y, eventName);
 }
 
 DBusMessage *