summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-05-04 17:30:19 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-05-04 17:40:29 +1000
commit59358de4b68a01452bf68593beb83605087ebc8f (patch)
treebecf1fcc9f496cac270e684f4351470e3f387b95
parent834ea071b619506e0bef5bdbf0e3c59831cf6e99 (diff)
input: ensure various ProcUngrabKey/Buttons have the right grabtype set.
-rw-r--r--Xi/ungrdevb.c1
-rw-r--r--Xi/ungrdevk.c1
-rw-r--r--dix/events.c2
3 files changed, 4 insertions, 0 deletions
diff --git a/Xi/ungrdevb.c b/Xi/ungrdevb.c
index a53dc5bdb..4e93f1ae3 100644
--- a/Xi/ungrdevb.c
+++ b/Xi/ungrdevb.c
@@ -132,6 +132,7 @@ ProcXUngrabDeviceButton(ClientPtr client)
temporaryGrab.device = dev;
temporaryGrab.window = pWin;
temporaryGrab.type = DeviceButtonPress;
+ temporaryGrab.grabtype = GRABTYPE_XI;
temporaryGrab.modifierDevice = mdev;
temporaryGrab.modifiersDetail.exact = stuff->modifiers;
temporaryGrab.modifiersDetail.pMask = NULL;
diff --git a/Xi/ungrdevk.c b/Xi/ungrdevk.c
index 7f5e4aab0..3b4d6260e 100644
--- a/Xi/ungrdevk.c
+++ b/Xi/ungrdevk.c
@@ -139,6 +139,7 @@ ProcXUngrabDeviceKey(ClientPtr client)
temporaryGrab.device = dev;
temporaryGrab.window = pWin;
temporaryGrab.type = DeviceKeyPress;
+ temporaryGrab.grabtype = GRABTYPE_XI;
temporaryGrab.modifierDevice = mdev;
temporaryGrab.modifiersDetail.exact = stuff->modifiers;
temporaryGrab.modifiersDetail.pMask = NULL;
diff --git a/dix/events.c b/dix/events.c
index 86aa24f17..0ff8308f2 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -5003,6 +5003,7 @@ ProcUngrabKey(ClientPtr client)
tempGrab.modifiersDetail.pMask = NULL;
tempGrab.modifierDevice = GetPairedDevice(keybd);
tempGrab.type = KeyPress;
+ tempGrab.grabtype = GRABTYPE_CORE;
tempGrab.detail.exact = stuff->key;
tempGrab.detail.pMask = NULL;
tempGrab.next = NULL;
@@ -5197,6 +5198,7 @@ ProcUngrabButton(ClientPtr client)
tempGrab.modifierDevice = GetPairedDevice(ptr);
tempGrab.type = ButtonPress;
tempGrab.detail.exact = stuff->button;
+ tempGrab.grabtype = GRABTYPE_CORE;
tempGrab.detail.pMask = NULL;
tempGrab.next = NULL;