summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-05-11 12:53:56 +1000
committerKeith Packard <keithp@keithp.com>2009-06-29 14:17:13 -0700
commitf697b6c582095aa1eec3244fa05835922249425b (patch)
tree256f20aab86e8940d0c084553e624d0e01de4898
parentc91accd173b5f17af771bd9f4e60b5860af15718 (diff)
kdrive: set Activate/Deactivate grab for input devices (#21591)
X.Org Bug 21591 <http://bugs.freedesktop.org/show_bug.cgi?id=21591> (cherry picked from commit b1b5ec45c1cb650ccb8c659218f9481379c777d9) Signed-off-by: Keith Packard <keithp@keithp.com>
-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 816e933e6..8e6a475d1 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -1021,6 +1021,8 @@ KdAddKeyboard (KdKeyboardInfo *ki)
return !Success;
}
+ ki->dixdev->deviceGrab.ActivateGrab = ActivateKeyboardGrab;
+ ki->dixdev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;
RegisterOtherDevice(ki->dixdev);
#ifdef DEBUG
@@ -1090,6 +1092,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);