summaryrefslogtreecommitdiff
authorPeter Hutterer <peter.hutterer@who-t.net>2008-12-10 01:35:09 (GMT)
committer Peter Hutterer <peter.hutterer@who-t.net>2008-12-10 02:42:45 (GMT)
commit0b4fef6337d88ae8ef05b8b73941350a9007565c (patch) (side-by-side diff)
treec69b82f1ca755bd01d8b186ef053f7ecdb76b587
parentb36c398b11321a908cfe217108b26a32ffc1d850 (diff)
downloadxserver-0b4fef6337d88ae8ef05b8b73941350a9007565c.zip
xserver-0b4fef6337d88ae8ef05b8b73941350a9007565c.tar.gz
dix: move MAX_VALUATOR_EVENTS into include/input.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--dix/getevents.c4
-rw-r--r--include/input.h5
-rw-r--r--mi/mieq.c2
3 files changed, 5 insertions, 6 deletions
diff --git a/dix/getevents.c b/dix/getevents.c
index 19e6fa7..f53f3c3 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -62,10 +62,6 @@
#include "extnsionst.h"
#include "listdev.h" /* for sizing up DeviceClassesChangedEvent */
-/* Maximum number of valuators, divided by six, rounded up, to get number
- * of events. */
-#define MAX_VALUATOR_EVENTS 6
-
/* Number of motion history events to store. */
#define MOTION_HISTORY_SIZE 256
diff --git a/include/input.h b/include/input.h
index 509ce3c..e14f698 100644
--- a/include/input.h
+++ b/include/input.h
@@ -69,7 +69,10 @@ SOFTWARE.
#define PtrAccelLightweight 2
#define PtrAccelDefault PtrAccelPredictable
-#define MAX_VALUATORS 36 /* XXX from comment in dix/getevents.c */
+#define MAX_VALUATORS 36
+/* Maximum number of valuators, divided by six, rounded up, to get number
+ * of events. */
+#define MAX_VALUATOR_EVENTS 6
#define NO_AXIS_LIMITS -1
diff --git a/mi/mieq.c b/mi/mieq.c
index aef6fae..a05c9eb 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -93,7 +93,7 @@ mieqInit(void)
miEventQueue.handlers[i] = NULL;
for (i = 0; i < QUEUE_SIZE; i++)
{
- EventListPtr evlist = InitEventList(7); /* 1 + MAX_VALUATOR_EVENTS */
+ EventListPtr evlist = InitEventList(1 + MAX_VALUATOR_EVENTS);
if (!evlist)
FatalError("Could not allocate event queue.\n");
miEventQueue.events[i].events = evlist;