summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Hlusiak <saschahlusiak@arcor.de>2008-09-15 19:24:40 +0200
committerSascha Hlusiak <saschahlusiak@arcor.de>2008-09-15 19:24:40 +0200
commitf04e3c822229b51e5a4048d7e91fa34f69e361e9 (patch)
treec72a7fe34b172cf11a8d7749a737faabff4695ad
parent282fc3068ed734e099efe272c740e6c8e5495176 (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.h8
2 files changed, 9 insertions, 1 deletions
diff --git a/src/jstk.c b/src/jstk.c
index 4038f48..733e4dd 100644
--- a/src/jstk.c
+++ b/src/jstk.c
@@ -467,7 +467,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 c2cef9d..aef643f 100644
--- a/src/jstk.h
+++ b/src/jstk.h
@@ -24,6 +24,8 @@
#ifndef __JSTK_H_INCLUDED__
#define __JSTK_H_INCLUDED__
+#include <X11/extensions/XIproto.h>
+
#define MAXBUTTONS 32
#define MAXAXES 32
@@ -45,6 +47,12 @@
#define DBG(lvl, f)
#endif
+
+#ifndef XI_JOYSTICK
+#define XI_JOYSTICK "JOYSTICK"
+#endif
+
+
typedef enum _JOYSTICKEVENT {
EVENT_NONE=0,
EVENT_BUTTON,