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;
#ifndef SPI_KEYMASKS_H_
#define SPI_KEYMASKS_H_
-#include <X11/Xlib.h>
#include <glib.h>
G_BEGIN_DECLS
typedef unsigned long SpiKeyMaskType;
-#define SPI_KEYMASK_ALT Mod1Mask
-#define SPI_KEYMASK_MOD1 Mod1Mask
-#define SPI_KEYMASK_MOD2 Mod2Mask
-#define SPI_KEYMASK_MOD3 Mod3Mask
-#define SPI_KEYMASK_MOD4 Mod4Mask
-#define SPI_KEYMASK_MOD5 Mod5Mask
-#define SPI_KEYMASK_BUTTON1 Button1Mask
-#define SPI_KEYMASK_BUTTON2 Button2Mask
-#define SPI_KEYMASK_BUTTON3 Button3Mask
-#define SPI_KEYMASK_BUTTON4 Button4Mask
-#define SPI_KEYMASK_BUTTON5 Button5Mask
-#define SPI_KEYMASK_CONTROL ControlMask
-#define SPI_KEYMASK_SHIFT ShiftMask
-#define SPI_KEYMASK_SHIFTLOCK LockMask
+/* Values taken from Xlib.h */
+#define SPI_KEYMASK_ALT (1<<3) /* Mod1Mask */
+#define SPI_KEYMASK_MOD1 (1<<3) /* Mod1Mask */
+#define SPI_KEYMASK_MOD2 (1<<4) /* Mod2Mask */
+#define SPI_KEYMASK_MOD3 (1<<5) /* Mod3Mask */
+#define SPI_KEYMASK_MOD4 (1<<6) /* Mod4Mask */
+#define SPI_KEYMASK_MOD5 (1<<7) /* Mod5Mask */
+#define SPI_KEYMASK_BUTTON1 (1L<<8) /* Button1Mask */
+#define SPI_KEYMASK_BUTTON2 (1L<<9) /* Button2Mask */
+#define SPI_KEYMASK_BUTTON3 (1L<<10) /* Button3Mask */
+#define SPI_KEYMASK_BUTTON4 (1L<<11) /* Button4Mask */
+#define SPI_KEYMASK_BUTTON5 (1L<<12) /* Button5Mask */
+#define SPI_KEYMASK_CONTROL (1<<2) /* ControlMask */
+#define SPI_KEYMASK_SHIFT (1<<0) /* ShiftMask */
+#define SPI_KEYMASK_SHIFTLOCK (1<<1) /* LockMask */
#define SPI_KEYMASK_NUMLOCK (1<<14)
#define SPI_KEYMASK_UNMODIFIED 0