summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2018-04-19 14:49:22 -0400
committerAdam Jackson <ajax@nwnk.net>2020-03-30 21:48:11 +0000
commit5684d436e2b65cd0fe305460e437a2f69af29865 (patch)
tree456c09b5c024cd456eae2a1b0d61f2db82f5cefe
parent4520ec9bd54b261fa2b210e9550d76087ef06259 (diff)
xinput: Remove PropagateMaskHEADmaster
Initialized to a constant value, never modified, never varied by device. Signed-off-by: Adam Jackson <ajax@redhat.com>
-rw-r--r--Xi/exevents.c13
-rw-r--r--Xi/exglobals.h3
-rw-r--r--Xi/extinit.c38
3 files changed, 14 insertions, 40 deletions
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 659816a46..98319ad4d 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -746,9 +746,8 @@ UpdateDeviceMotionMask(DeviceIntPtr device, unsigned short state,
{
Mask mask;
- mask = DevicePointerMotionMask | state | motion_mask;
- SetMaskForEvent(device->id, mask, DeviceMotionNotify);
mask = PointerMotionMask | state | motion_mask;
+ SetMaskForEvent(device->id, mask, DeviceMotionNotify);
SetMaskForEvent(device->id, mask, MotionNotify);
}
@@ -2522,6 +2521,12 @@ FreeInputMask(OtherInputMasks ** imask)
*imask = NULL;
}
+#define XIPropagateMask (KeyPressMask | \
+ KeyReleaseMask | \
+ ButtonPressMask | \
+ ButtonReleaseMask | \
+ PointerMotionMask)
+
void
RecalculateDeviceDeliverableEvents(WindowPtr pWin)
{
@@ -2548,7 +2553,7 @@ RecalculateDeviceDeliverableEvents(WindowPtr pWin)
inputMasks->deliverableEvents[i] |=
(wOtherInputMasks(tmp)->deliverableEvents[i]
& ~inputMasks->dontPropagateMask[i] &
- PropagateMask[i]);
+ XIPropagateMask);
}
if (pChild->firstChild) {
pChild = pChild->firstChild;
@@ -2961,7 +2966,7 @@ DeviceEventSuppressForWindow(WindowPtr pWin, ClientPtr client, Mask mask,
{
struct _OtherInputMasks *inputMasks = wOtherInputMasks(pWin);
- if (mask & ~PropagateMask[maskndx]) {
+ if (mask & ~XIPropagateMask) {
client->errorValue = mask;
return BadValue;
}
diff --git a/Xi/exglobals.h b/Xi/exglobals.h
index 9f235e034..461a7f8ca 100644
--- a/Xi/exglobals.h
+++ b/Xi/exglobals.h
@@ -44,7 +44,6 @@ extern int DeviceBusy;
extern int BadClass;
/* Note: only the ones needed in files other than extinit.c are declared */
-extern const Mask DevicePointerMotionMask;
extern const Mask DevicePointerMotionHintMask;
extern const Mask DeviceFocusChangeMask;
extern const Mask DeviceStateNotifyMask;
@@ -56,8 +55,6 @@ extern const Mask DevicePresenceNotifyMask;
extern const Mask DevicePropertyNotifyMask;
extern const Mask XIAllMasks;
-extern Mask PropagateMask[];
-
extern int DeviceValuator;
extern int DeviceKeyPress;
extern int DeviceKeyRelease;
diff --git a/Xi/extinit.c b/Xi/extinit.c
index ecb55da42..8d9120866 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -129,13 +129,8 @@ SOFTWARE.
* breaks down. The device needs the dev->button->motionMask. If DBMM is
* the same as BMM, we can ensure that both core and device events can be
* delivered, without the need for extra structures in the DeviceIntRec. */
-const Mask DeviceKeyPressMask = KeyPressMask;
-const Mask DeviceKeyReleaseMask = KeyReleaseMask;
-const Mask DeviceButtonPressMask = ButtonPressMask;
-const Mask DeviceButtonReleaseMask = ButtonReleaseMask;
const Mask DeviceProximityMask = (1L << 4);
const Mask DeviceStateNotifyMask = (1L << 5);
-const Mask DevicePointerMotionMask = PointerMotionMask;
const Mask DevicePointerMotionHintMask = PointerMotionHintMask;
const Mask DeviceButton1MotionMask = Button1MotionMask;
const Mask DeviceButton2MotionMask = Button2MotionMask;
@@ -363,8 +358,6 @@ RESTYPE RT_INPUTCLIENT;
extern XExtensionVersion XIVersion;
-Mask PropagateMask[EMASKSIZE];
-
/*****************************************************************
*
* Versioning support
@@ -916,22 +909,6 @@ XI2EventSwap(xGenericEvent *from, xGenericEvent *to)
/**************************************************************************
*
- * Allow the specified event to have its propagation suppressed.
- * The default is to not allow suppression of propagation.
- *
- */
-
-static void
-AllowPropagateSuppress(Mask mask)
-{
- int i;
-
- for (i = 0; i < MAXDEVICES; i++)
- PropagateMask[i] |= mask;
-}
-
-/**************************************************************************
- *
* Record an event mask where there is no unique corresponding event type.
* We can't call SetMaskForEvent, since that would clobber the existing
* mask for that event. MotionHint and ButtonMotion are examples.
@@ -1011,20 +988,16 @@ FixExtensionEvents(ExtensionEntry * extEntry)
DeviceBusy += extEntry->errorBase;
BadClass += extEntry->errorBase;
- SetMaskForExtEvent(DeviceKeyPressMask, DeviceKeyPress);
- AllowPropagateSuppress(DeviceKeyPressMask);
+ SetMaskForExtEvent(KeyPressMask, DeviceKeyPress);
SetCriticalEvent(DeviceKeyPress);
- SetMaskForExtEvent(DeviceKeyReleaseMask, DeviceKeyRelease);
- AllowPropagateSuppress(DeviceKeyReleaseMask);
+ SetMaskForExtEvent(KeyReleaseMask, DeviceKeyRelease);
SetCriticalEvent(DeviceKeyRelease);
- SetMaskForExtEvent(DeviceButtonPressMask, DeviceButtonPress);
- AllowPropagateSuppress(DeviceButtonPressMask);
+ SetMaskForExtEvent(ButtonPressMask, DeviceButtonPress);
SetCriticalEvent(DeviceButtonPress);
- SetMaskForExtEvent(DeviceButtonReleaseMask, DeviceButtonRelease);
- AllowPropagateSuppress(DeviceButtonReleaseMask);
+ SetMaskForExtEvent(ButtonReleaseMask, DeviceButtonRelease);
SetCriticalEvent(DeviceButtonRelease);
SetMaskForExtEvent(DeviceProximityMask, ProximityIn);
@@ -1032,8 +1005,7 @@ FixExtensionEvents(ExtensionEntry * extEntry)
SetMaskForExtEvent(DeviceStateNotifyMask, DeviceStateNotify);
- SetMaskForExtEvent(DevicePointerMotionMask, DeviceMotionNotify);
- AllowPropagateSuppress(DevicePointerMotionMask);
+ SetMaskForExtEvent(PointerMotionMask, DeviceMotionNotify);
SetCriticalEvent(DeviceMotionNotify);
SetEventInfo(DevicePointerMotionHintMask, _devicePointerMotionHint);