summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Hlusiak <saschahlusiak@arcor.de>2008-09-15 19:27:52 +0200
committerSascha Hlusiak <saschahlusiak@arcor.de>2008-09-15 19:27:52 +0200
commit57d1201f584a74b9d6822e55ff66a0786de4ea2b (patch)
tree7cf0cbee14062120fe4187614b391bb0c1778b7c
parent838dfffe9833b52626d5a528fc08d2838438ee46 (diff)
Set type_name to XI_JOYSTICK. Let's not claim we are XI_MOUSE.
-rw-r--r--src/jstk.c2
-rw-r--r--src/jstk.h7
2 files changed, 8 insertions, 1 deletions
diff --git a/src/jstk.c b/src/jstk.c
index 33c8e5c..10add2d 100644
--- a/src/jstk.c
+++ b/src/jstk.c
@@ -501,7 +501,7 @@ jstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
local->fd = -1;
local->dev = NULL;
local->private = priv;
- local->type_name = XI_MOUSE;
+ local->type_name = XI_JOYSTICK;
local->history_size = 0;
local->always_core_feedback = 0;
local->conf_idev = dev;
diff --git a/src/jstk.h b/src/jstk.h
index fb600ff..03f896a 100644
--- a/src/jstk.h
+++ b/src/jstk.h
@@ -25,6 +25,7 @@
#define __JSTK_H_INCLUDED__
#include <xf86Xinput.h>
+#include <X11/extensions/XIproto.h>
#define MAXBUTTONS 32
@@ -47,6 +48,12 @@
#define DBG(lvl, f)
#endif
+
+#ifndef XI_JOYSTICK
+#define XI_JOYSTICK "JOYSTICK"
+#endif
+
+
typedef enum _JOYSTICKEVENT {
EVENT_NONE=0,
EVENT_BUTTON,