Commit d202bc4462b4cca91d438b19c3293671f62e15a3
2010-10-08T15:07:44
Pull in XKB_COMMON_* version of modifier masks This way we can use libxkbcommon without having to include X.h.
diff --git a/include/X11/extensions/XKBcommon.h b/include/X11/extensions/XKBcommon.h
index 89e2009..c1bc270 100644
--- a/include/X11/extensions/XKBcommon.h
+++ b/include/X11/extensions/XKBcommon.h
@@ -64,6 +64,18 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
typedef unsigned char KeyCode;
#endif
+/* Duplicate the modifier mask defines so libxkcommon can be used
+ * without X.h */
+#define XKB_COMMON_SHIFT_MASK (1<<0)
+#define XKB_COMMON_LOCK_MASK (1<<1)
+#define XKB_COMMON_CONTROL_MASK (1<<2)
+#define XKB_COMMON_MOD1_MASK (1<<3)
+#define XKB_COMMON_MOD2_MASK (1<<4)
+#define XKB_COMMON_MOD3_MASK (1<<5)
+#define XKB_COMMON_MOD4_MASK (1<<6)
+#define XKB_COMMON_MOD5_MASK (1<<7)
+
+
struct xkb_rule_names {
const char * rules;
const char * model;