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

Xi: purge old device enter/leave masks.

This commit is contained in:
Peter Hutterer 2009-03-18 15:13:00 +10:00
parent 15a969c0fc
commit dc153271b6
4 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Xi/exevents.c
View File

@ -146,8 +146,6 @@ XIGetDevice(xEvent* xE)
if (xE->u.u.type == DeviceButtonPress || if (xE->u.u.type == DeviceButtonPress ||
xE->u.u.type == DeviceButtonRelease || xE->u.u.type == DeviceButtonRelease ||
xE->u.u.type == DeviceMotionNotify || xE->u.u.type == DeviceMotionNotify ||
xE->u.u.type == DeviceEnterNotify ||
xE->u.u.type == DeviceLeaveNotify ||
xE->u.u.type == ProximityIn || xE->u.u.type == ProximityIn ||
xE->u.u.type == ProximityOut || xE->u.u.type == ProximityOut ||
xE->u.u.type == DevicePropertyNotify) xE->u.u.type == DevicePropertyNotify)

2
Xi/exglobals.h
View File

@ -75,8 +75,6 @@ extern int DeviceMappingNotify;
extern int ChangeDeviceNotify; extern int ChangeDeviceNotify;
extern int DevicePresenceNotify; extern int DevicePresenceNotify;
extern int DevicePropertyNotify; extern int DevicePropertyNotify;
extern int DeviceEnterNotify;
extern int DeviceLeaveNotify;
extern int RT_INPUTCLIENT; extern int RT_INPUTCLIENT;

14
Xi/extinit.c
View File

@ -331,8 +331,6 @@ int DeviceMappingNotify;
int ChangeDeviceNotify; int ChangeDeviceNotify;
int DevicePresenceNotify; int DevicePresenceNotify;
int DevicePropertyNotify; int DevicePropertyNotify;
int DeviceEnterNotify;
int DeviceLeaveNotify;
int RT_INPUTCLIENT; int RT_INPUTCLIENT;
@ -893,8 +891,6 @@ FixExtensionEvents(ExtensionEntry * extEntry)
DeviceButtonStateNotify = DeviceKeyStateNotify + 1; DeviceButtonStateNotify = DeviceKeyStateNotify + 1;
DevicePresenceNotify = DeviceButtonStateNotify + 1; DevicePresenceNotify = DeviceButtonStateNotify + 1;
DevicePropertyNotify = DevicePresenceNotify + 1; DevicePropertyNotify = DevicePresenceNotify + 1;
DeviceEnterNotify = DevicePropertyNotify + 1;
DeviceLeaveNotify = DeviceEnterNotify + 1;
event_base[KeyClass] = DeviceKeyPress; event_base[KeyClass] = DeviceKeyPress;
event_base[ButtonClass] = DeviceButtonPress; event_base[ButtonClass] = DeviceButtonPress;
@ -950,12 +946,6 @@ FixExtensionEvents(ExtensionEntry * extEntry)
SetEventInfo(DevicePresenceNotifyMask, _devicePresence); SetEventInfo(DevicePresenceNotifyMask, _devicePresence);
SetMaskForExtEvent(DevicePropertyNotifyMask, DevicePropertyNotify); SetMaskForExtEvent(DevicePropertyNotifyMask, DevicePropertyNotify);
SetMaskForExtEvent(DeviceEnterWindowMask, DeviceEnterNotify);
AllowPropagateSuppress(DeviceEnterWindowMask);
SetMaskForExtEvent(DeviceLeaveWindowMask, DeviceLeaveNotify);
AllowPropagateSuppress(DeviceLeaveWindowMask);
SetEventInfo(0, _noExtensionEvent); SetEventInfo(0, _noExtensionEvent);
} }
@ -1001,8 +991,6 @@ RestoreExtensionEvents(void)
DeviceButtonStateNotify = 13; DeviceButtonStateNotify = 13;
DevicePresenceNotify = 14; DevicePresenceNotify = 14;
DevicePropertyNotify = 15; DevicePropertyNotify = 15;
DeviceEnterNotify = 16;
DeviceLeaveNotify = 17;
BadDevice = 0; BadDevice = 0;
BadEvent = 1; BadEvent = 1;
@ -1042,8 +1030,6 @@ IResetProc(ExtensionEntry * unused)
EventSwapVector[ChangeDeviceNotify] = NotImplemented; EventSwapVector[ChangeDeviceNotify] = NotImplemented;
EventSwapVector[DevicePresenceNotify] = NotImplemented; EventSwapVector[DevicePresenceNotify] = NotImplemented;
EventSwapVector[DevicePropertyNotify] = NotImplemented; EventSwapVector[DevicePropertyNotify] = NotImplemented;
EventSwapVector[DeviceEnterNotify] = NotImplemented;
EventSwapVector[DeviceLeaveNotify] = NotImplemented;
RestoreExtensionEvents(); RestoreExtensionEvents();
} }

1
include/xkbsrv.h
View File

@ -318,7 +318,6 @@ extern _X_EXPORT CARD32 xkbDebugFlags;
extern _X_EXPORT int DeviceKeyPress,DeviceKeyRelease,DeviceMotionNotify; extern _X_EXPORT int DeviceKeyPress,DeviceKeyRelease,DeviceMotionNotify;
extern _X_EXPORT int DeviceButtonPress,DeviceButtonRelease; extern _X_EXPORT int DeviceButtonPress,DeviceButtonRelease;
extern _X_EXPORT int DeviceEnterNotify,DeviceLeaveNotify;
#define _XkbIsPressEvent(t) (((t)==KeyPress)||((t)==DeviceKeyPress)) #define _XkbIsPressEvent(t) (((t)==KeyPress)||((t)==DeviceKeyPress))
#define _XkbIsReleaseEvent(t) (((t)==KeyRelease)||((t)==DeviceKeyRelease)) #define _XkbIsReleaseEvent(t) (((t)==KeyRelease)||((t)==DeviceKeyRelease))