summaryrefslogtreecommitdiff
authorPeter Hutterer <peter.hutterer@who-t.net>2009-05-11 02:53:56 (GMT)
committer Peter Hutterer <peter.hutterer@who-t.net>2009-05-16 02:01:22 (GMT)
commitb1b5ec45c1cb650ccb8c659218f9481379c777d9 (patch) (side-by-side diff)
tree1bf8a0f7af453a7d7270df86d6e258adb5fe95ae
parent6f9e22049862ee9ac7f604411d005d8bb1b2dd1c (diff)
downloadxserver-b1b5ec45c1cb650ccb8c659218f9481379c777d9.zip
xserver-b1b5ec45c1cb650ccb8c659218f9481379c777d9.tar.gz
kdrive: set Activate/Deactivate grab for input devices (#21591)
X.Org Bug 21591 <http://bugs.freedesktop.org/show_bug.cgi?id=21591>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--hw/kdrive/src/kinput.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 7ed3601..0d216a9 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -915,6 +915,8 @@ KdAddKeyboard (KdKeyboardInfo *ki)
return !Success;
}
+ ki->dixdev->deviceGrab.ActivateGrab = ActivateKeyboardGrab;
+ ki->dixdev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;
RegisterOtherDevice(ki->dixdev);
#ifdef DEBUG
@@ -984,6 +986,8 @@ KdAddPointer (KdPointerInfo *pi)
return BadDevice;
}
+ pi->dixdev->deviceGrab.ActivateGrab = ActivatePointerGrab;
+ pi->dixdev->deviceGrab.DeactivateGrab = DeactivatePointerGrab;
RegisterOtherDevice(pi->dixdev);
for (prev = &kdPointers; *prev; prev = &(*prev)->next);