diff options
| author | Philip Chimento <philip.chimento@gmail.com> | 2016-10-30 22:12:46 -0700 |
|---|---|---|
| committer | Mike Gorse <mgorse@suse.com> | 2016-11-16 19:54:36 -0600 |
| commit | 66ac36c66a420f497262e37f5553d6fea5635454 (patch) | |
| tree | 9f1069551f9da9b6fbfa0de861c5ac96081112b8 /registryd/keymasks.h | |
| parent | a2fac95cc1cb87429cb0cd426c09ce0f2cf45517 (diff) | |
| download | at-spi2-core-66ac36c66a420f497262e37f5553d6fea5635454.tar.gz | |
Copy in key mask defines from Xlib.h
This is to avoid including Xlib.h when building with --disable-x11.
https://bugzilla.gnome.org/show_bug.cgi?id=773710
Diffstat (limited to 'registryd/keymasks.h')
| -rw-r--r-- | registryd/keymasks.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/registryd/keymasks.h b/registryd/keymasks.h index 6dc95ad8..4e838b82 100644 --- a/registryd/keymasks.h +++ b/registryd/keymasks.h @@ -24,27 +24,27 @@ #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 |