diff options
| -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 9592d4cc5..707d1da2f 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -61,10 +61,6 @@ #include "exglobals.h" #include "extnsionst.h" -/* 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 c78f0b750..82ee2360c 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 @@ -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; |