aboutsummaryrefslogtreecommitdiff
path: root/src/evdev.h
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-01-22 09:19:16 +1100
committerPeter Hutterer <peter.hutterer@who-t.net>2009-01-22 14:06:38 +1100
commit3047c25db24becf475b45d13e03a8badd58dcde6 (patch)
tree91c07d65d7b9e2d0941929754e0d382ff0b332d9 /src/evdev.h
parentRequire XKB. (diff)
downloadxf86-input-evdev-3047c25db24becf475b45d13e03a8badd58dcde6.tar.gz
xf86-input-evdev-3047c25db24becf475b45d13e03a8badd58dcde6.tar.bz2
xf86-input-evdev-3047c25db24becf475b45d13e03a8badd58dcde6.zip
Deal with XINPUT ABI 5.
Some XKB stuff has been removed, so let's deal with it.
Diffstat (limited to 'src/evdev.h')
-rw-r--r--src/evdev.h20
1 files changed, 15 insertions, 5 deletions
diff --git a/src/evdev.h b/src/evdev.h
index 67fee1d..68ee073 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -62,6 +62,17 @@
#define HAVE_PROPERTIES 1
#endif
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 5
+typedef struct {
+ char *rules;
+ char *model;
+ char *layout;
+ char *variant;
+ char *options;
+} XkbRMLVOSet;
+#endif
+
+
#define LONG_BITS (sizeof(long) * 8)
/* Number of longs needed to hold the given number of bits */
@@ -89,12 +100,11 @@ typedef struct {
BOOL has_pressure;
/* XKB stuff has to be per-device rather than per-driver */
- char *xkb_rules;
- char *xkb_model;
- char *xkb_layout;
- char *xkb_variant;
- char *xkb_options;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 5
XkbComponentNamesRec xkbnames;
+#endif
+ XkbRMLVOSet rmlvo;
+
/* Middle mouse button emulation */
struct {
BOOL enabled;