Xi: purge old device enter/leave masks.
This commit is contained in:
parent
15a969c0fc
commit
dc153271b6
|
@ -146,8 +146,6 @@ XIGetDevice(xEvent* xE)
|
|||
if (xE->u.u.type == DeviceButtonPress ||
|
||||
xE->u.u.type == DeviceButtonRelease ||
|
||||
xE->u.u.type == DeviceMotionNotify ||
|
||||
xE->u.u.type == DeviceEnterNotify ||
|
||||
xE->u.u.type == DeviceLeaveNotify ||
|
||||
xE->u.u.type == ProximityIn ||
|
||||
xE->u.u.type == ProximityOut ||
|
||||
xE->u.u.type == DevicePropertyNotify)
|
||||
|
|
|
@ -75,8 +75,6 @@ extern int DeviceMappingNotify;
|
|||
extern int ChangeDeviceNotify;
|
||||
extern int DevicePresenceNotify;
|
||||
extern int DevicePropertyNotify;
|
||||
extern int DeviceEnterNotify;
|
||||
extern int DeviceLeaveNotify;
|
||||
|
||||
extern int RT_INPUTCLIENT;
|
||||
|
||||
|
|
14
Xi/extinit.c
14
Xi/extinit.c
|
@ -331,8 +331,6 @@ int DeviceMappingNotify;
|
|||
int ChangeDeviceNotify;
|
||||
int DevicePresenceNotify;
|
||||
int DevicePropertyNotify;
|
||||
int DeviceEnterNotify;
|
||||
int DeviceLeaveNotify;
|
||||
|
||||
int RT_INPUTCLIENT;
|
||||
|
||||
|
@ -893,8 +891,6 @@ FixExtensionEvents(ExtensionEntry * extEntry)
|
|||
DeviceButtonStateNotify = DeviceKeyStateNotify + 1;
|
||||
DevicePresenceNotify = DeviceButtonStateNotify + 1;
|
||||
DevicePropertyNotify = DevicePresenceNotify + 1;
|
||||
DeviceEnterNotify = DevicePropertyNotify + 1;
|
||||
DeviceLeaveNotify = DeviceEnterNotify + 1;
|
||||
|
||||
event_base[KeyClass] = DeviceKeyPress;
|
||||
event_base[ButtonClass] = DeviceButtonPress;
|
||||
|
@ -950,12 +946,6 @@ FixExtensionEvents(ExtensionEntry * extEntry)
|
|||
SetEventInfo(DevicePresenceNotifyMask, _devicePresence);
|
||||
SetMaskForExtEvent(DevicePropertyNotifyMask, DevicePropertyNotify);
|
||||
|
||||
SetMaskForExtEvent(DeviceEnterWindowMask, DeviceEnterNotify);
|
||||
AllowPropagateSuppress(DeviceEnterWindowMask);
|
||||
|
||||
SetMaskForExtEvent(DeviceLeaveWindowMask, DeviceLeaveNotify);
|
||||
AllowPropagateSuppress(DeviceLeaveWindowMask);
|
||||
|
||||
SetEventInfo(0, _noExtensionEvent);
|
||||
}
|
||||
|
||||
|
@ -1001,8 +991,6 @@ RestoreExtensionEvents(void)
|
|||
DeviceButtonStateNotify = 13;
|
||||
DevicePresenceNotify = 14;
|
||||
DevicePropertyNotify = 15;
|
||||
DeviceEnterNotify = 16;
|
||||
DeviceLeaveNotify = 17;
|
||||
|
||||
BadDevice = 0;
|
||||
BadEvent = 1;
|
||||
|
@ -1042,8 +1030,6 @@ IResetProc(ExtensionEntry * unused)
|
|||
EventSwapVector[ChangeDeviceNotify] = NotImplemented;
|
||||
EventSwapVector[DevicePresenceNotify] = NotImplemented;
|
||||
EventSwapVector[DevicePropertyNotify] = NotImplemented;
|
||||
EventSwapVector[DeviceEnterNotify] = NotImplemented;
|
||||
EventSwapVector[DeviceLeaveNotify] = NotImplemented;
|
||||
RestoreExtensionEvents();
|
||||
}
|
||||
|
||||
|
|
|
@ -318,7 +318,6 @@ extern _X_EXPORT CARD32 xkbDebugFlags;
|
|||
|
||||
extern _X_EXPORT int DeviceKeyPress,DeviceKeyRelease,DeviceMotionNotify;
|
||||
extern _X_EXPORT int DeviceButtonPress,DeviceButtonRelease;
|
||||
extern _X_EXPORT int DeviceEnterNotify,DeviceLeaveNotify;
|
||||
|
||||
#define _XkbIsPressEvent(t) (((t)==KeyPress)||((t)==DeviceKeyPress))
|
||||
#define _XkbIsReleaseEvent(t) (((t)==KeyRelease)||((t)==DeviceKeyRelease))
|
||||
|
|
Loading…
Reference in New Issue
Block a user