[PATCH evdev] evdev: enable option "GrabDevice" by default for non-seat0 seats (#69478)

Laércio de Sousa lbsousajr at gmail.com
Tue Sep 17 09:48:49 PDT 2013


This patch contributes to fill the remaining gaps which make
systemd-multi-seat-x wrapper still necessary in some multiseat setups.

When option "-seat" is passed with an argument different from "seat0",
option "GrabDevice" is enabled by default (no need of enabling it
in xorg.conf's "InputClass" section).

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=69478

Signed-off-by: Laércio de Sousa <lbsousajr at gmail.com>
---
 src/evdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/evdev.c b/src/evdev.c
index b97b841..f7bd763 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -2643,7 +2643,7 @@ EvdevPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
     /* Grabbing the event device stops in-kernel event forwarding. In other
        words, it disables rfkill and the "Macintosh mouse button emulation".
        Note that this needs a server that sets the console to RAW mode. */
-    pEvdev->grabDevice = xf86CheckBoolOption(pInfo->options, "GrabDevice", 0);
+    pEvdev->grabDevice = xf86CheckBoolOption(pInfo->options, "GrabDevice", ServerIsNotSeat0());
 
     /* If grabDevice is set, ungrab immediately since we only want to grab
      * between DEVICE_ON and DEVICE_OFF. If we never get DEVICE_ON, don't
-- 
1.8.1.4



More information about the xorg-devel mailing list