frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move MAX_DEVICES to misc.h, rename to MAXDEVICES for consistency.

This commit is contained in:
Peter Hutterer 2008-10-31 16:16:18 +10:30
parent 245d1c162c
commit f781a752e6
8 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Xi/extinit.c
View File

@ -340,7 +340,7 @@ int RT_INPUTCLIENT;
extern XExtensionVersion AllExtensionVersions[]; extern XExtensionVersion AllExtensionVersions[];
Mask PropagateMask[MAX_DEVICES]; Mask PropagateMask[MAXDEVICES];
/***************************************************************** /*****************************************************************
* *
@ -680,7 +680,7 @@ AllowPropagateSuppress(Mask mask)
{ {
int i; int i;
for (i = 0; i < MAX_DEVICES; i++) for (i = 0; i < MAXDEVICES; i++)
PropagateMask[i] |= mask; PropagateMask[i] |= mask;
} }
@ -701,7 +701,7 @@ GetNextExtEventMask(void)
} }
lastExtEventMask <<= 1; lastExtEventMask <<= 1;
for (i = 0; i < MAX_DEVICES; i++) for (i = 0; i < MAXDEVICES; i++)
ExtValidMasks[i] |= mask; ExtValidMasks[i] |= mask;
return mask; return mask;
} }
@ -739,7 +739,7 @@ SetExclusiveAccess(Mask mask)
{ {
int i; int i;
for (i = 0; i < MAX_DEVICES; i++) for (i = 0; i < MAXDEVICES; i++)
ExtExclusiveMasks[i] |= mask; ExtExclusiveMasks[i] |= mask;
} }
@ -760,7 +760,7 @@ SetMaskForExtEvent(Mask mask, int event)
if ((event < LASTEvent) || (event >= 128)) if ((event < LASTEvent) || (event >= 128))
FatalError("MaskForExtensionEvent: bogus event number"); FatalError("MaskForExtensionEvent: bogus event number");
for (i = 0; i < MAX_DEVICES; i++) for (i = 0; i < MAXDEVICES; i++)
SetMaskForEvent(i, mask, event); SetMaskForEvent(i, mask, event);
} }
@ -914,7 +914,7 @@ RestoreExtensionEvents(void)
for (i = 0; i < ExtEventIndex - 1; i++) { for (i = 0; i < ExtEventIndex - 1; i++) {
if ((EventInfo[i].type >= LASTEvent) && (EventInfo[i].type < 128)) if ((EventInfo[i].type >= LASTEvent) && (EventInfo[i].type < 128))
{ {
for (j = 0; j < MAX_DEVICES; j++) for (j = 0; j < MAXDEVICES; j++)
SetMaskForEvent(j, 0, EventInfo[i].type); SetMaskForEvent(j, 0, EventInfo[i].type);
} }
EventInfo[i].mask = 0; EventInfo[i].mask = 0;

4
Xi/selectev.c
View File

@ -106,10 +106,10 @@ HandleDevicePresenceMask(ClientPtr client, WindowPtr win,
if (mask == 0) if (mask == 0)
return Success; return Success;
/* We always only use mksidx = MAX_DEVICES for events not bound to /* We always only use mksidx = MAXDEVICES for events not bound to
* devices */ * devices */
if (AddExtensionClient (win, client, mask, MAX_DEVICES) != Success) if (AddExtensionClient (win, client, mask, MAXDEVICES) != Success)
return BadAlloc; return BadAlloc;
RecalculateDeviceDeliverableEvents(win); RecalculateDeviceDeliverableEvents(win);

16
dix/devices.c
View File

@ -143,19 +143,19 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart)
DeviceIntPtr dev, *prev; /* not a typo */ DeviceIntPtr dev, *prev; /* not a typo */
DeviceIntPtr devtmp; DeviceIntPtr devtmp;
int devid; int devid;
char devind[MAX_DEVICES]; char devind[MAXDEVICES];
BOOL enabled; BOOL enabled;
/* Find next available id */ /* Find next available id */
memset(devind, 0, sizeof(char)*MAX_DEVICES); memset(devind, 0, sizeof(char)*MAXDEVICES);
for (devtmp = inputInfo.devices; devtmp; devtmp = devtmp->next) for (devtmp = inputInfo.devices; devtmp; devtmp = devtmp->next)
devind[devtmp->id]++; devind[devtmp->id]++;
for (devtmp = inputInfo.off_devices; devtmp; devtmp = devtmp->next) for (devtmp = inputInfo.off_devices; devtmp; devtmp = devtmp->next)
devind[devtmp->id]++; devind[devtmp->id]++;
for (devid = 0; devid < MAX_DEVICES && devind[devid]; devid++) for (devid = 0; devid < MAXDEVICES && devind[devid]; devid++)
; ;
if (devid >= MAX_DEVICES) if (devid >= MAXDEVICES)
return (DeviceIntPtr)NULL; return (DeviceIntPtr)NULL;
dev = xcalloc(sizeof(DeviceIntRec) + sizeof(SpriteInfoRec), 1); dev = xcalloc(sizeof(DeviceIntRec) + sizeof(SpriteInfoRec), 1);
if (!dev) if (!dev)
@ -291,7 +291,7 @@ EnableDevice(DeviceIntPtr dev)
ev.time = currentTime.milliseconds; ev.time = currentTime.milliseconds;
ev.devchange = DeviceEnabled; ev.devchange = DeviceEnabled;
ev.deviceid = dev->id; ev.deviceid = dev->id;
dummyDev.id = MAX_DEVICES; dummyDev.id = MAXDEVICES;
SendEventToAllWindows(&dummyDev, DevicePresenceNotifyMask, SendEventToAllWindows(&dummyDev, DevicePresenceNotifyMask,
(xEvent *) &ev, 1); (xEvent *) &ev, 1);
@ -369,7 +369,7 @@ DisableDevice(DeviceIntPtr dev)
ev.time = currentTime.milliseconds; ev.time = currentTime.milliseconds;
ev.devchange = DeviceDisabled; ev.devchange = DeviceDisabled;
ev.deviceid = dev->id; ev.deviceid = dev->id;
dummyDev.id = MAX_DEVICES; dummyDev.id = MAXDEVICES;
SendEventToAllWindows(&dummyDev, DevicePresenceNotifyMask, SendEventToAllWindows(&dummyDev, DevicePresenceNotifyMask,
(xEvent *) &ev, 1); (xEvent *) &ev, 1);
@ -409,7 +409,7 @@ ActivateDevice(DeviceIntPtr dev)
ev.deviceid = dev->id; ev.deviceid = dev->id;
memset(&dummyDev, 0, sizeof(DeviceIntRec)); memset(&dummyDev, 0, sizeof(DeviceIntRec));
dummyDev.id = MAX_DEVICES; dummyDev.id = MAXDEVICES;
SendEventToAllWindows(&dummyDev, DevicePresenceNotifyMask, SendEventToAllWindows(&dummyDev, DevicePresenceNotifyMask,
(xEvent *) &ev, 1); (xEvent *) &ev, 1);
@ -973,7 +973,7 @@ RemoveDevice(DeviceIntPtr dev)
ev.time = currentTime.milliseconds; ev.time = currentTime.milliseconds;
ev.devchange = DeviceRemoved; ev.devchange = DeviceRemoved;
ev.deviceid = deviceid; ev.deviceid = deviceid;
dummyDev.id = MAX_DEVICES; dummyDev.id = MAXDEVICES;
SendEventToAllWindows(&dummyDev, DevicePresenceNotifyMask, SendEventToAllWindows(&dummyDev, DevicePresenceNotifyMask,
(xEvent *) &ev, 1); (xEvent *) &ev, 1);
} }

10
dix/events.c
View File

@ -372,7 +372,7 @@ extern int DeviceMotionNotify;
* is initialized. The rest is memcpy'd in InitEvents. * is initialized. The rest is memcpy'd in InitEvents.
*/ */
#define CantBeFiltered NoEventMask #define CantBeFiltered NoEventMask
static Mask filters[MAX_DEVICES][128] = { static Mask filters[MAXDEVICES][128] = {
{ {
NoSuchEvent, /* 0 */ NoSuchEvent, /* 0 */
NoSuchEvent, /* 1 */ NoSuchEvent, /* 1 */
@ -794,7 +794,7 @@ void
SetMaskForEvent(int deviceid, Mask mask, int event) SetMaskForEvent(int deviceid, Mask mask, int event)
{ {
int coretype; int coretype;
if (deviceid < 0 || deviceid > MAX_DEVICES) if (deviceid < 0 || deviceid > MAXDEVICES)
FatalError("SetMaskForEvent: bogus device id"); FatalError("SetMaskForEvent: bogus device id");
if ((event < LASTEvent) || (event >= 128)) if ((event < LASTEvent) || (event >= 128))
FatalError("SetMaskForEvent: bogus event number"); FatalError("SetMaskForEvent: bogus event number");
@ -5451,7 +5451,7 @@ InitEvents(void)
inputInfo.pointer = (DeviceIntPtr)NULL; inputInfo.pointer = (DeviceIntPtr)NULL;
lastEventMask = OwnerGrabButtonMask; lastEventMask = OwnerGrabButtonMask;
filters[0][PointerMotionMask] = MotionNotify; filters[0][PointerMotionMask] = MotionNotify;
for (i = 1; i < MAX_DEVICES; i++) for (i = 1; i < MAXDEVICES; i++)
{ {
memcpy(&filters[i], filters[0], sizeof(filters[0])); memcpy(&filters[i], filters[0], sizeof(filters[0]));
} }
@ -6405,7 +6405,7 @@ EnterLeaveSemaphoresIsset(WindowPtr win)
int i; int i;
sem = (FocusSemaphoresPtr)dixLookupPrivate(&win->devPrivates, FocusPrivatesKey); sem = (FocusSemaphoresPtr)dixLookupPrivate(&win->devPrivates, FocusPrivatesKey);
for (i = 0; i < (MAX_DEVICES + 7)/8; i++) for (i = 0; i < (MAXDEVICES + 7)/8; i++)
set += sem->enterleave[i]; set += sem->enterleave[i];
return set; return set;
@ -6422,7 +6422,7 @@ FocusSemaphoresIsset(WindowPtr win)
int i; int i;
sem = (FocusSemaphoresPtr)dixLookupPrivate(&win->devPrivates, FocusPrivatesKey); sem = (FocusSemaphoresPtr)dixLookupPrivate(&win->devPrivates, FocusPrivatesKey);
for (i = 0; i < (MAX_DEVICES + 7)/8; i++) for (i = 0; i < (MAXDEVICES + 7)/8; i++)
set += sem->focusinout[i]; set += sem->focusinout[i];
return set; return set;

4
include/inputstr.h
View File

@ -64,9 +64,7 @@ SOFTWARE.
#define SameClient(obj,client) \ #define SameClient(obj,client) \
(CLIENT_BITS((obj)->resource) == (client)->clientAsMask) (CLIENT_BITS((obj)->resource) == (client)->clientAsMask)
#define MAX_DEVICES 20 #define EMASKSIZE MAXDEVICES + 1
#define EMASKSIZE MAX_DEVICES + 1
extern DevPrivateKey CoreDevicePrivateKey; extern DevPrivateKey CoreDevicePrivateKey;

1
include/misc.h
View File

@ -89,6 +89,7 @@ extern unsigned long serverGeneration;
#define MAXCLIENTS 256 #define MAXCLIENTS 256
#define MAXEXTENSIONS 128 #define MAXEXTENSIONS 128
#define MAXFORMATS 8 #define MAXFORMATS 8
#define MAXDEVICES 20 /* input devices */
typedef unsigned long PIXEL; typedef unsigned long PIXEL;
typedef unsigned long ATOM; typedef unsigned long ATOM;

4
include/windowstr.h
View File

@ -253,8 +253,8 @@ extern DevPrivateKey FocusPrivatesKey;
* window/has focus. * window/has focus.
*/ */
typedef struct _FocusSemaphores { typedef struct _FocusSemaphores {
char enterleave[(MAX_DEVICES + 7)/8]; char enterleave[(MAXDEVICES + 7)/8];
char focusinout[(MAX_DEVICES + 7)/8]; char focusinout[(MAXDEVICES + 7)/8];
} FocusSemaphoresRec, *FocusSemaphoresPtr; } FocusSemaphoresRec, *FocusSemaphoresPtr;
#ifdef XEVIE #ifdef XEVIE

4
render/animcur.c
View File

@ -82,7 +82,7 @@ typedef struct _AnimCurState {
} AnimCurStateRec, *AnimCurStatePtr; } AnimCurStateRec, *AnimCurStatePtr;
/* What a waste. But we need an API change to alloc it per device only. */ /* What a waste. But we need an API change to alloc it per device only. */
static AnimCurStateRec animCurState[MAX_DEVICES]; static AnimCurStateRec animCurState[MAXDEVICES];
static unsigned char empty[4]; static unsigned char empty[4];
@ -354,7 +354,7 @@ AnimCurInit (ScreenPtr pScreen)
{ {
int i; int i;
AnimCurGeneration = serverGeneration; AnimCurGeneration = serverGeneration;
for (i = 0; i < MAX_DEVICES; i++) { for (i = 0; i < MAXDEVICES; i++) {
animCurState[i].pCursor = 0; animCurState[i].pCursor = 0;
animCurState[i].pScreen = 0; animCurState[i].pScreen = 0;
animCurState[i].elt = 0; animCurState[i].elt = 0;