diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2008-12-10 11:35:09 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2008-12-10 12:42:45 +1000 |
commit | 0b4fef6337d88ae8ef05b8b73941350a9007565c (patch) | |
tree | c69b82f1ca755bd01d8b186ef053f7ecdb76b587 | |
parent | b36c398b11321a908cfe217108b26a32ffc1d850 (diff) |
dix: move MAX_VALUATOR_EVENTS into include/input.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r-- | dix/getevents.c | 4 | ||||
-rw-r--r-- | include/input.h | 5 | ||||
-rw-r--r-- | mi/mieq.c | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/dix/getevents.c b/dix/getevents.c index 19e6fa7cf..f53f3c347 100644 --- a/dix/getevents.c +++ b/dix/getevents.c | |||
@@ -62,10 +62,6 @@ | |||
62 | #include "extnsionst.h" | 62 | #include "extnsionst.h" |
63 | #include "listdev.h" /* for sizing up DeviceClassesChangedEvent */ | 63 | #include "listdev.h" /* for sizing up DeviceClassesChangedEvent */ |
64 | 64 | ||
65 | /* Maximum number of valuators, divided by six, rounded up, to get number | ||
66 | * of events. */ | ||
67 | #define MAX_VALUATOR_EVENTS 6 | ||
68 | |||
69 | /* Number of motion history events to store. */ | 65 | /* Number of motion history events to store. */ |
70 | #define MOTION_HISTORY_SIZE 256 | 66 | #define MOTION_HISTORY_SIZE 256 |
71 | 67 | ||
diff --git a/include/input.h b/include/input.h index 509ce3cff..e14f698e7 100644 --- a/include/input.h +++ b/include/input.h | |||
@@ -69,7 +69,10 @@ SOFTWARE. | |||
69 | #define PtrAccelLightweight 2 | 69 | #define PtrAccelLightweight 2 |
70 | #define PtrAccelDefault PtrAccelPredictable | 70 | #define PtrAccelDefault PtrAccelPredictable |
71 | 71 | ||
72 | #define MAX_VALUATORS 36 /* XXX from comment in dix/getevents.c */ | 72 | #define MAX_VALUATORS 36 |
73 | /* Maximum number of valuators, divided by six, rounded up, to get number | ||
74 | * of events. */ | ||
75 | #define MAX_VALUATOR_EVENTS 6 | ||
73 | 76 | ||
74 | #define NO_AXIS_LIMITS -1 | 77 | #define NO_AXIS_LIMITS -1 |
75 | 78 | ||
@@ -93,7 +93,7 @@ mieqInit(void) | |||
93 | miEventQueue.handlers[i] = NULL; | 93 | miEventQueue.handlers[i] = NULL; |
94 | for (i = 0; i < QUEUE_SIZE; i++) | 94 | for (i = 0; i < QUEUE_SIZE; i++) |
95 | { | 95 | { |
96 | EventListPtr evlist = InitEventList(7); /* 1 + MAX_VALUATOR_EVENTS */ | 96 | EventListPtr evlist = InitEventList(1 + MAX_VALUATOR_EVENTS); |
97 | if (!evlist) | 97 | if (!evlist) |
98 | FatalError("Could not allocate event queue.\n"); | 98 | FatalError("Could not allocate event queue.\n"); |
99 | miEventQueue.events[i].events = evlist; | 99 | miEventQueue.events[i].events = evlist; |