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

dix: Remove lastEventMask variable, substitute with a #define. 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-02-12 14:29:23 +10:00
parent 772e0f9159
commit b735a4b495
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dix/events.c
View File

@ -183,7 +183,8 @@ typedef const char *string;
#define AllModifiersMask ( \ #define AllModifiersMask ( \
ShiftMask | LockMask | ControlMask | Mod1Mask | Mod2Mask | \ ShiftMask | LockMask | ControlMask | Mod1Mask | Mod2Mask | \
Mod3Mask | Mod4Mask | Mod5Mask ) Mod3Mask | Mod4Mask | Mod5Mask )
#define AllEventMasks (lastEventMask|(lastEventMask-1)) #define LastEventMask OwnerGrabButtonMask
#define AllEventMasks (LastEventMask|(LastEventMask-1))
/** /**
* Used to indicate a implicit passive grab created by a ButtonPress event. * Used to indicate a implicit passive grab created by a ButtonPress event.
@ -338,8 +339,6 @@ static WindowPtr XYToWindow(
*/ */
extern int lastEvent; extern int lastEvent;
static Mask lastEventMask;
extern int DeviceMotionNotify; extern int DeviceMotionNotify;
#define CantBeFiltered NoEventMask #define CantBeFiltered NoEventMask
@ -4616,7 +4615,6 @@ InitEvents(void)
inputInfo.off_devices = (DeviceIntPtr)NULL; inputInfo.off_devices = (DeviceIntPtr)NULL;
inputInfo.keyboard = (DeviceIntPtr)NULL; inputInfo.keyboard = (DeviceIntPtr)NULL;
inputInfo.pointer = (DeviceIntPtr)NULL; inputInfo.pointer = (DeviceIntPtr)NULL;
lastEventMask = OwnerGrabButtonMask;
/* The mask for pointer motion events may have changed in the last server /* The mask for pointer motion events may have changed in the last server
* generation. See comment above definition of filters. */ * generation. See comment above definition of filters. */
filters[0][PointerMotionMask] = MotionNotify; filters[0][PointerMotionMask] = MotionNotify;