diff options
| author | Adam Jackson <ajax@redhat.com> | 2018-04-19 14:42:47 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2020-03-30 21:48:11 +0000 |
| commit | 4520ec9bd54b261fa2b210e9550d76087ef06259 (patch) | |
| tree | a771365fe89867da06f1f109c6b6af86e34a9e9e /Xi | |
| parent | 1e29f3ea3eb63cfcb78a463ee0345ec22a013033 (diff) | |
| download | xserver-4520ec9bd54b261fa2b210e9550d76087ef06259.tar.gz | |
xinput: Remove ExtExclusiveMasks
Initialized to a constant value, never modified, never varied by device.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'Xi')
| -rw-r--r-- | Xi/extinit.c | 20 | ||||
| -rw-r--r-- | Xi/selectev.c | 4 |
2 files changed, 1 insertions, 23 deletions
diff --git a/Xi/extinit.c b/Xi/extinit.c index 058218905..ecb55da42 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -153,7 +153,6 @@ const Mask DevicePropertyNotifyMask = (1L << 19); const Mask XIAllMasks = (1L << 20) - 1; int ExtEventIndex; -Mask ExtExclusiveMasks[EMASKSIZE]; static struct dev_type { Atom type; @@ -953,23 +952,6 @@ SetEventInfo(Mask mask, int constant) /************************************************************************** * - * Allow the specified event to be restricted to being selected by one - * client at a time. - * The default is to allow more than one client to select the event. - * - */ - -static void -SetExclusiveAccess(Mask mask) -{ - int i; - - for (i = 0; i < MAXDEVICES; i++) - ExtExclusiveMasks[i] |= mask; -} - -/************************************************************************** - * * Assign the specified mask to the specified event. * */ @@ -1069,8 +1051,6 @@ FixExtensionEvents(ExtensionEntry * extEntry) SetMaskForExtEvent(ChangeDeviceNotifyMask, ChangeDeviceNotify); SetEventInfo(DeviceButtonGrabMask, _deviceButtonGrab); - SetExclusiveAccess(DeviceButtonGrabMask); - SetEventInfo(DeviceOwnerGrabButtonMask, _deviceOwnerGrabButton); SetEventInfo(DevicePresenceNotifyMask, _devicePresence); SetMaskForExtEvent(DevicePropertyNotifyMask, DevicePropertyNotify); diff --git a/Xi/selectev.c b/Xi/selectev.c index b9b8112aa..65c7bc868 100644 --- a/Xi/selectev.c +++ b/Xi/selectev.c @@ -65,8 +65,6 @@ SOFTWARE. #include "grabdev.h" #include "selectev.h" -extern Mask ExtExclusiveMasks[]; - static int HandleDevicePresenceMask(ClientPtr client, WindowPtr win, XEventClass * cls, CARD16 *count) @@ -175,7 +173,7 @@ ProcXSelectExtensionEvent(ClientPtr client) } if ((ret = SelectForWindow((DeviceIntPtr) tmp[i].dev, pWin, client, - tmp[i].mask, ExtExclusiveMasks[i])) != Success) + tmp[i].mask, DeviceButtonGrabMask)) != Success) return ret; } |