xserver: Branch 'master' - 9 commits
Peter Hutterer
whot at kemper.freedesktop.org
Fri Oct 31 01:07:03 PDT 2008
Xext/xtest.c | 1
Xi/extinit.c | 12 +--
Xi/selectev.c | 4 -
Xi/sendexev.c | 1
dix/devices.c | 193 +++++++++++++++++++++-------------------------------
dix/events.c | 12 +--
dix/extension.c | 2
dix/getevents.c | 16 ----
include/input.h | 14 ---
include/inputstr.h | 4 -
include/misc.h | 4 +
include/windowstr.h | 4 -
render/animcur.c | 4 -
xkb/xkbPrKeyEv.c | 1
xkb/xkbUtils.c | 4 -
15 files changed, 102 insertions(+), 174 deletions(-)
New commits:
commit 0a076b6a7f3c97ff712412eee32e013d3bfd7364
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date: Fri Oct 31 18:32:26 2008 +1030
xkb: remove unused label "out", clean up program flow.
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 7e9f8d0..61d37af 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -81,12 +81,10 @@ _XkbLookupAnyDevice(DeviceIntPtr *pDev, int id, ClientPtr client,
if (id == XkbUseCoreKbd) {
id = PickKeyboard(client)->id;
- }
- if (id == XkbUseCorePtr) {
+ } else if (id == XkbUseCorePtr) {
id = PickPointer(client)->id;
}
rc = dixLookupDevice(pDev, id, client, access_mode);
-out:
if (rc != Success)
*xkb_err = XkbErr_BadDevice;
return rc;
commit 971aef64416058665bc903fee39fea1619cd3727
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date: Fri Oct 31 17:05:40 2008 +1030
dix: FreeDeviceClass() and friends can be static.
diff --git a/dix/devices.c b/dix/devices.c
index 1e7588e..2ec9284 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -659,31 +659,10 @@ InitAndStartDevices()
return Success;
}
-_X_EXPORT void
-FreeAllDeviceClasses(ClassesPtr classes)
-{
- if (!classes)
- return;
-
- FreeDeviceClass(KeyClass, (pointer)&classes->key);
- FreeDeviceClass(ValuatorClass, (pointer)&classes->valuator);
- FreeDeviceClass(ButtonClass, (pointer)&classes->button);
- FreeDeviceClass(FocusClass, (pointer)&classes->focus);
- FreeDeviceClass(ProximityClass, (pointer)&classes->proximity);
-
- FreeFeedbackClass(KbdFeedbackClass, (pointer)&classes->kbdfeed);
- FreeFeedbackClass(PtrFeedbackClass, (pointer)&classes->ptrfeed);
- FreeFeedbackClass(IntegerFeedbackClass, (pointer)&classes->intfeed);
- FreeFeedbackClass(StringFeedbackClass, (pointer)&classes->stringfeed);
- FreeFeedbackClass(BellFeedbackClass, (pointer)&classes->bell);
- FreeFeedbackClass(LedFeedbackClass, (pointer)&classes->leds);
-
-}
-
/**
* Free the given device class and reset the pointer to NULL.
*/
-_X_EXPORT void
+static void
FreeDeviceClass(int type, pointer *class)
{
if (!(*class))
@@ -742,7 +721,8 @@ FreeDeviceClass(int type, pointer *class)
}
*class = NULL;
}
-_X_EXPORT void
+
+static void
FreeFeedbackClass(int type, pointer *class)
{
if (!(*class))
@@ -828,6 +808,28 @@ FreeFeedbackClass(int type, pointer *class)
}
*class = NULL;
}
+
+static void
+FreeAllDeviceClasses(ClassesPtr classes)
+{
+ if (!classes)
+ return;
+
+ FreeDeviceClass(KeyClass, (pointer)&classes->key);
+ FreeDeviceClass(ValuatorClass, (pointer)&classes->valuator);
+ FreeDeviceClass(ButtonClass, (pointer)&classes->button);
+ FreeDeviceClass(FocusClass, (pointer)&classes->focus);
+ FreeDeviceClass(ProximityClass, (pointer)&classes->proximity);
+
+ FreeFeedbackClass(KbdFeedbackClass, (pointer)&classes->kbdfeed);
+ FreeFeedbackClass(PtrFeedbackClass, (pointer)&classes->ptrfeed);
+ FreeFeedbackClass(IntegerFeedbackClass, (pointer)&classes->intfeed);
+ FreeFeedbackClass(StringFeedbackClass, (pointer)&classes->stringfeed);
+ FreeFeedbackClass(BellFeedbackClass, (pointer)&classes->bell);
+ FreeFeedbackClass(LedFeedbackClass, (pointer)&classes->leds);
+
+}
+
/**
* Close down a device and free all resources.
* Once closed down, the driver will probably not expect you that you'll ever
diff --git a/include/input.h b/include/input.h
index 408d9da..bf63f4b 100644
--- a/include/input.h
+++ b/include/input.h
@@ -523,9 +523,6 @@ extern int AllocMasterDevice(ClientPtr client,
extern void DeepCopyDeviceClasses(DeviceIntPtr from,
DeviceIntPtr to);
-extern void FreeDeviceClass(int type, pointer* class);
-extern void FreeFeedbackClass(int type, pointer* class);
-extern void FreeAllDeviceClasses(ClassesPtr classes);
extern int EnterLeaveSemaphoresIsset(WindowPtr win);
extern int FocusSemaphoresIsset(WindowPtr win);
commit 3c3a47d0f5ce7fb9548a3eefee9e72488d3ac279
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date: Fri Oct 31 17:00:21 2008 +1030
include: remove unused declaration for RegisterPairingClient().
Matching functions got removed in 004876355b43fb4d3c2bc5653a7dc1bfd3f985ee.
diff --git a/include/input.h b/include/input.h
index e2f3593..408d9da 100644
--- a/include/input.h
+++ b/include/input.h
@@ -516,8 +516,6 @@ extern int AttachDevice(ClientPtr client,
extern DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd);
-extern Bool RegisterPairingClient(ClientPtr client);
-
extern int AllocMasterDevice(ClientPtr client,
char* name,
DeviceIntPtr* ptr,
commit 7c5dec9f716962a6e67dba99418061cebe10e1d2
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date: Fri Oct 31 16:56:49 2008 +1030
dix: remove unused GuessFreePointerDevice().
Not used since the MD/SD hierarchy was introduced many moons ago.
diff --git a/dix/devices.c b/dix/devices.c
index 11720e5..1e7588e 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -2616,46 +2616,6 @@ GetPairedDevice(DeviceIntPtr dev)
return dev->spriteInfo->paired;
}
-/* Guess a pointer that could be a good one for pairing. Any pointer that is
- * not yet paired with keyboard is considered a good one.
- * If no pointer is found, the last real pointer is chosen. If that doesn't
- * work either, we take the core pointer.
- */
-DeviceIntPtr
-GuessFreePointerDevice()
-{
- DeviceIntPtr it, it2;
- DeviceIntPtr lastRealPtr = NULL;
-
- it = inputInfo.devices;
-
- while(it)
- {
- /* found device with a sprite? */
- if (it->spriteInfo->spriteOwner)
- {
- lastRealPtr = it;
-
- it2 = inputInfo.devices;
- while(it2)
- {
- /* something paired with it? */
- if (it != it2 &&
- it2->spriteInfo->sprite == it->spriteInfo->sprite)
- break;
-
- it2 = it2->next;
- }
-
- /* woohoo! no pairing set up for 'it' yet */
- if (!it2)
- return it;
- }
- it = it->next;
- }
-
- return (lastRealPtr) ? lastRealPtr : inputInfo.pointer;
-}
/**
* Create a new master device (== one pointer, one keyboard device).
diff --git a/include/input.h b/include/input.h
index 7428564..e2f3593 100644
--- a/include/input.h
+++ b/include/input.h
@@ -518,8 +518,6 @@ extern DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd);
extern Bool RegisterPairingClient(ClientPtr client);
-extern DeviceIntPtr GuessFreePointerDevice(void);
-
extern int AllocMasterDevice(ClientPtr client,
char* name,
DeviceIntPtr* ptr,
commit 12599af285a610fb429245798330f2317c75ac2c
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date: Fri Oct 31 16:50:28 2008 +1030
dix: NextFreePointerDevice() can be static.
diff --git a/dix/devices.c b/dix/devices.c
index d9541b2..11720e5 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -161,6 +161,20 @@ PairDevices(ClientPtr client, DeviceIntPtr ptr, DeviceIntPtr kbd)
}
+/**
+ * Find and return the next unpaired MD pointer device.
+ */
+static DeviceIntPtr
+NextFreePointerDevice(void)
+{
+ DeviceIntPtr dev;
+ for (dev = inputInfo.devices; dev; dev = dev->next)
+ if (dev->isMaster &&
+ dev->spriteInfo->spriteOwner &&
+ !dev->spriteInfo->paired)
+ return dev;
+ return NULL;
+}
/**
* Create a new input device and init it to sane values. The device is added
@@ -2643,17 +2657,6 @@ GuessFreePointerDevice()
return (lastRealPtr) ? lastRealPtr : inputInfo.pointer;
}
-DeviceIntPtr
-NextFreePointerDevice()
-{
- DeviceIntPtr dev;
- for (dev = inputInfo.devices; dev; dev = dev->next)
- if (dev->isMaster &&
- dev->spriteInfo->spriteOwner &&
- !dev->spriteInfo->paired)
- return dev;
- return NULL;
-}
/**
* Create a new master device (== one pointer, one keyboard device).
* Only allocates the devices, you will need to call ActivateDevice() and
diff --git a/include/input.h b/include/input.h
index 2ffd97e..7428564 100644
--- a/include/input.h
+++ b/include/input.h
@@ -519,7 +519,6 @@ extern DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd);
extern Bool RegisterPairingClient(ClientPtr client);
extern DeviceIntPtr GuessFreePointerDevice(void);
-extern DeviceIntPtr NextFreePointerDevice(void);
extern int AllocMasterDevice(ClientPtr client,
char* name,
commit 5d0a945a030cd7626046e9f6c8d5c6bd170649d9
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date: Fri Oct 31 16:29:42 2008 +1030
dix: SwitchCorePointer is long gone, bury it.
diff --git a/dix/getevents.c b/dix/getevents.c
index 4770a69..920cf05 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -1049,22 +1049,6 @@ GetProximityEvents(EventList *events, DeviceIntPtr pDev, int type,
}
/**
- * Note that pDev was the last function to send a core pointer event.
- * Currently a no-op.
- *
- * Call this just before processInputProc.
- */
-_X_EXPORT void
-SwitchCorePointer(DeviceIntPtr pDev)
-{
- if (pDev != dixLookupPrivate(&inputInfo.pointer->devPrivates,
- CoreDevicePrivateKey))
- dixSetPrivate(&inputInfo.pointer->devPrivates,
- CoreDevicePrivateKey, pDev);
-}
-
-
-/**
* Synthesize a single motion event for the core pointer.
*
* Used in cursor functions, e.g. when cursor confinement changes, and we need
diff --git a/include/input.h b/include/input.h
index cd9bfde..2ffd97e 100644
--- a/include/input.h
+++ b/include/input.h
@@ -510,8 +510,6 @@ extern int GetMotionHistory(
ScreenPtr pScreen,
BOOL core);
-extern void SwitchCorePointer(DeviceIntPtr pDev);
-
extern int AttachDevice(ClientPtr client,
DeviceIntPtr slave,
DeviceIntPtr master);
commit eb014021c2b3604fc67daebd6860b5dc959fabb6
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date: Fri Oct 31 16:27:58 2008 +1030
dix: PairDevices() can be static, remove from input.
PairDevices() is only ever called in EnableDevice().
diff --git a/dix/devices.c b/dix/devices.c
index abefc2e..d9541b2 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -128,6 +128,38 @@ DeviceSetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop,
return Success;
}
+/* Pair the keyboard to the pointer device. Keyboard events will follow the
+ * pointer sprite. Only applicable for master devices.
+ * If the client is set, the request to pair comes from some client. In this
+ * case, we need to check for access. If the client is NULL, it's from an
+ * internal automatic pairing, we must always permit this.
+ */
+static int
+PairDevices(ClientPtr client, DeviceIntPtr ptr, DeviceIntPtr kbd)
+{
+ if (!ptr)
+ return BadDevice;
+
+ /* Don't allow pairing for slave devices */
+ if (!ptr->isMaster || !kbd->isMaster)
+ return BadDevice;
+
+ if (ptr->spriteInfo->paired)
+ return BadDevice;
+
+ if (kbd->spriteInfo->spriteOwner)
+ {
+ xfree(kbd->spriteInfo->sprite);
+ kbd->spriteInfo->sprite = NULL;
+ kbd->spriteInfo->spriteOwner = FALSE;
+ }
+
+ kbd->spriteInfo->sprite = ptr->spriteInfo->sprite;
+ kbd->spriteInfo->paired = ptr;
+ ptr->spriteInfo->paired = kbd;
+ return Success;
+}
+
/**
@@ -2462,38 +2494,6 @@ ProcQueryKeymap(ClientPtr client)
return Success;
}
-/* Pair the keyboard to the pointer device. Keyboard events will follow the
- * pointer sprite. Only applicable for master devices.
- * If the client is set, the request to pair comes from some client. In this
- * case, we need to check for access. If the client is NULL, it's from an
- * internal automatic pairing, we must always permit this.
- */
-int
-PairDevices(ClientPtr client, DeviceIntPtr ptr, DeviceIntPtr kbd)
-{
- if (!ptr)
- return BadDevice;
-
- /* Don't allow pairing for slave devices */
- if (!ptr->isMaster || !kbd->isMaster)
- return BadDevice;
-
- if (ptr->spriteInfo->paired)
- return BadDevice;
-
- if (kbd->spriteInfo->spriteOwner)
- {
- xfree(kbd->spriteInfo->sprite);
- kbd->spriteInfo->sprite = NULL;
- kbd->spriteInfo->spriteOwner = FALSE;
- }
-
- kbd->spriteInfo->sprite = ptr->spriteInfo->sprite;
- kbd->spriteInfo->paired = ptr;
- ptr->spriteInfo->paired = kbd;
- return Success;
-}
-
/**
* Attach device 'dev' to device 'master'.
* Client is set to the client that issued the request, or NULL if it comes
diff --git a/include/input.h b/include/input.h
index 2e40272..cd9bfde 100644
--- a/include/input.h
+++ b/include/input.h
@@ -512,10 +512,6 @@ extern int GetMotionHistory(
extern void SwitchCorePointer(DeviceIntPtr pDev);
-/* Pairing input devices */
-extern int PairDevices(ClientPtr client,
- DeviceIntPtr pointer,
- DeviceIntPtr keyboard);
extern int AttachDevice(ClientPtr client,
DeviceIntPtr slave,
DeviceIntPtr master);
commit b6b26560d65d9468c89dd046396d9aeb14e1b227
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date: Fri Oct 31 16:23:34 2008 +1030
Move EXTENSION_BASE and EXTENSION_EVENT_BASE to misc.h.
diff --git a/Xext/xtest.c b/Xext/xtest.c
index fbf2a27..1290a23 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -48,7 +48,6 @@
#include <X11/extensions/xteststr.h>
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
-#define EXTENSION_EVENT_BASE 64
#include "modinit.h"
diff --git a/Xi/sendexev.c b/Xi/sendexev.c
index 8c975e3..9b37de3 100644
--- a/Xi/sendexev.c
+++ b/Xi/sendexev.c
@@ -50,7 +50,6 @@ SOFTWARE.
*
*/
-#define EXTENSION_EVENT_BASE 64
#define NEED_EVENTS
#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
diff --git a/dix/events.c b/dix/events.c
index aa10b02..6833a6b 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -179,8 +179,6 @@ int xeviegrabState = 0;
/**
* Extension events type numbering starts at EXTENSION_EVENT_BASE.
*/
-#define EXTENSION_EVENT_BASE 64
-
#define NoSuchEvent 0x80000000 /* so doesn't match NoEventMask */
#define StructureAndSubMask ( StructureNotifyMask | SubstructureNotifyMask )
#define AllButtonsMask ( \
diff --git a/dix/extension.c b/dix/extension.c
index ccd9362..3070f4d 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -63,8 +63,6 @@ SOFTWARE.
#include "registry.h"
#include "xace.h"
-#define EXTENSION_BASE 128
-#define EXTENSION_EVENT_BASE 64
#define LAST_EVENT 128
#define LAST_ERROR 255
diff --git a/include/misc.h b/include/misc.h
index 3ecc9f2..85f9e5d 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -91,6 +91,9 @@ extern unsigned long serverGeneration;
#define MAXFORMATS 8
#define MAXDEVICES 20 /* input devices */
+#define EXTENSION_EVENT_BASE 64
+#define EXTENSION_BASE 128
+
typedef unsigned long PIXEL;
typedef unsigned long ATOM;
diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c
index 74d02c6..a3f715c 100644
--- a/xkb/xkbPrKeyEv.c
+++ b/xkb/xkbPrKeyEv.c
@@ -39,7 +39,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "exevents.h"
#include <xkbsrv.h>
#include <ctype.h>
-#define EXTENSION_EVENT_BASE 64
/***====================================================================***/
commit f781a752e642cfe7d08f841b332c3ae507315598
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date: Fri Oct 31 16:16:18 2008 +1030
Move MAX_DEVICES to misc.h, rename to MAXDEVICES for consistency.
diff --git a/Xi/extinit.c b/Xi/extinit.c
index 8b21bd9..e222de6 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -340,7 +340,7 @@ int RT_INPUTCLIENT;
extern XExtensionVersion AllExtensionVersions[];
-Mask PropagateMask[MAX_DEVICES];
+Mask PropagateMask[MAXDEVICES];
/*****************************************************************
*
@@ -680,7 +680,7 @@ AllowPropagateSuppress(Mask mask)
{
int i;
- for (i = 0; i < MAX_DEVICES; i++)
+ for (i = 0; i < MAXDEVICES; i++)
PropagateMask[i] |= mask;
}
@@ -701,7 +701,7 @@ GetNextExtEventMask(void)
}
lastExtEventMask <<= 1;
- for (i = 0; i < MAX_DEVICES; i++)
+ for (i = 0; i < MAXDEVICES; i++)
ExtValidMasks[i] |= mask;
return mask;
}
@@ -739,7 +739,7 @@ SetExclusiveAccess(Mask mask)
{
int i;
- for (i = 0; i < MAX_DEVICES; i++)
+ for (i = 0; i < MAXDEVICES; i++)
ExtExclusiveMasks[i] |= mask;
}
@@ -760,7 +760,7 @@ SetMaskForExtEvent(Mask mask, int event)
if ((event < LASTEvent) || (event >= 128))
FatalError("MaskForExtensionEvent: bogus event number");
- for (i = 0; i < MAX_DEVICES; i++)
+ for (i = 0; i < MAXDEVICES; i++)
SetMaskForEvent(i, mask, event);
}
@@ -914,7 +914,7 @@ RestoreExtensionEvents(void)
for (i = 0; i < ExtEventIndex - 1; i++) {
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);
}
EventInfo[i].mask = 0;
diff --git a/Xi/selectev.c b/Xi/selectev.c
index 53d8f74..9c336fc 100644
--- a/Xi/selectev.c
+++ b/Xi/selectev.c
@@ -106,10 +106,10 @@ HandleDevicePresenceMask(ClientPtr client, WindowPtr win,
if (mask == 0)
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 */
- if (AddExtensionClient (win, client, mask, MAX_DEVICES) != Success)
+ if (AddExtensionClient (win, client, mask, MAXDEVICES) != Success)
return BadAlloc;
RecalculateDeviceDeliverableEvents(win);
diff --git a/dix/devices.c b/dix/devices.c
index 3f6d560..abefc2e 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -143,19 +143,19 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart)
DeviceIntPtr dev, *prev; /* not a typo */
DeviceIntPtr devtmp;
int devid;
- char devind[MAX_DEVICES];
+ char devind[MAXDEVICES];
BOOL enabled;
/* 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)
devind[devtmp->id]++;
for (devtmp = inputInfo.off_devices; devtmp; devtmp = devtmp->next)
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;
dev = xcalloc(sizeof(DeviceIntRec) + sizeof(SpriteInfoRec), 1);
if (!dev)
@@ -291,7 +291,7 @@ EnableDevice(DeviceIntPtr dev)
ev.time = currentTime.milliseconds;
ev.devchange = DeviceEnabled;
ev.deviceid = dev->id;
- dummyDev.id = MAX_DEVICES;
+ dummyDev.id = MAXDEVICES;
SendEventToAllWindows(&dummyDev, DevicePresenceNotifyMask,
(xEvent *) &ev, 1);
@@ -369,7 +369,7 @@ DisableDevice(DeviceIntPtr dev)
ev.time = currentTime.milliseconds;
ev.devchange = DeviceDisabled;
ev.deviceid = dev->id;
- dummyDev.id = MAX_DEVICES;
+ dummyDev.id = MAXDEVICES;
SendEventToAllWindows(&dummyDev, DevicePresenceNotifyMask,
(xEvent *) &ev, 1);
@@ -409,7 +409,7 @@ ActivateDevice(DeviceIntPtr dev)
ev.deviceid = dev->id;
memset(&dummyDev, 0, sizeof(DeviceIntRec));
- dummyDev.id = MAX_DEVICES;
+ dummyDev.id = MAXDEVICES;
SendEventToAllWindows(&dummyDev, DevicePresenceNotifyMask,
(xEvent *) &ev, 1);
@@ -973,7 +973,7 @@ RemoveDevice(DeviceIntPtr dev)
ev.time = currentTime.milliseconds;
ev.devchange = DeviceRemoved;
ev.deviceid = deviceid;
- dummyDev.id = MAX_DEVICES;
+ dummyDev.id = MAXDEVICES;
SendEventToAllWindows(&dummyDev, DevicePresenceNotifyMask,
(xEvent *) &ev, 1);
}
diff --git a/dix/events.c b/dix/events.c
index 952a801..aa10b02 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -372,7 +372,7 @@ extern int DeviceMotionNotify;
* is initialized. The rest is memcpy'd in InitEvents.
*/
#define CantBeFiltered NoEventMask
-static Mask filters[MAX_DEVICES][128] = {
+static Mask filters[MAXDEVICES][128] = {
{
NoSuchEvent, /* 0 */
NoSuchEvent, /* 1 */
@@ -794,7 +794,7 @@ void
SetMaskForEvent(int deviceid, Mask mask, int event)
{
int coretype;
- if (deviceid < 0 || deviceid > MAX_DEVICES)
+ if (deviceid < 0 || deviceid > MAXDEVICES)
FatalError("SetMaskForEvent: bogus device id");
if ((event < LASTEvent) || (event >= 128))
FatalError("SetMaskForEvent: bogus event number");
@@ -5451,7 +5451,7 @@ InitEvents(void)
inputInfo.pointer = (DeviceIntPtr)NULL;
lastEventMask = OwnerGrabButtonMask;
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]));
}
@@ -6405,7 +6405,7 @@ EnterLeaveSemaphoresIsset(WindowPtr win)
int i;
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];
return set;
@@ -6422,7 +6422,7 @@ FocusSemaphoresIsset(WindowPtr win)
int i;
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];
return set;
diff --git a/include/inputstr.h b/include/inputstr.h
index c74a4b1..9591d2f 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -64,9 +64,7 @@ SOFTWARE.
#define SameClient(obj,client) \
(CLIENT_BITS((obj)->resource) == (client)->clientAsMask)
-#define MAX_DEVICES 20
-
-#define EMASKSIZE MAX_DEVICES + 1
+#define EMASKSIZE MAXDEVICES + 1
extern DevPrivateKey CoreDevicePrivateKey;
diff --git a/include/misc.h b/include/misc.h
index 0107a30..3ecc9f2 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -89,6 +89,7 @@ extern unsigned long serverGeneration;
#define MAXCLIENTS 256
#define MAXEXTENSIONS 128
#define MAXFORMATS 8
+#define MAXDEVICES 20 /* input devices */
typedef unsigned long PIXEL;
typedef unsigned long ATOM;
diff --git a/include/windowstr.h b/include/windowstr.h
index 13ce60b..9bdcadd 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -253,8 +253,8 @@ extern DevPrivateKey FocusPrivatesKey;
* window/has focus.
*/
typedef struct _FocusSemaphores {
- char enterleave[(MAX_DEVICES + 7)/8];
- char focusinout[(MAX_DEVICES + 7)/8];
+ char enterleave[(MAXDEVICES + 7)/8];
+ char focusinout[(MAXDEVICES + 7)/8];
} FocusSemaphoresRec, *FocusSemaphoresPtr;
#ifdef XEVIE
diff --git a/render/animcur.c b/render/animcur.c
index 5723442..d80094d 100644
--- a/render/animcur.c
+++ b/render/animcur.c
@@ -82,7 +82,7 @@ typedef struct _AnimCurState {
} AnimCurStateRec, *AnimCurStatePtr;
/* 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];
@@ -354,7 +354,7 @@ AnimCurInit (ScreenPtr pScreen)
{
int i;
AnimCurGeneration = serverGeneration;
- for (i = 0; i < MAX_DEVICES; i++) {
+ for (i = 0; i < MAXDEVICES; i++) {
animCurState[i].pCursor = 0;
animCurState[i].pScreen = 0;
animCurState[i].elt = 0;
More information about the xorg-commit
mailing list