From 160c2db32d0b9ee5316a44179a6af4f4722e3d0a Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 18 Sep 2013 16:04:44 +1000 Subject: [PATCH 1/3] dmx: provide enough space for axis mappings relmap/absmap is used as a evdev-axis-to-x-axis mapping. ABS_X maps to axis 0, ABS_Y to 1, etc. skipping over non-existing axes so that the third bit set in the ABS_* range is axis 2, and so on. This requires us to actually have enough space to have all the ABS_*/REL_* range. Signed-off-by: Peter Hutterer Reviewed-by: Alan Coopersmith --- hw/dmx/input/usb-private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/dmx/input/usb-private.h b/hw/dmx/input/usb-private.h index 096607a34..2ecfdf636 100644 --- a/hw/dmx/input/usb-private.h +++ b/hw/dmx/input/usb-private.h @@ -102,8 +102,8 @@ typedef struct _myPrivate { int fd; /**< File descriptor */ unsigned char mask[EV_MAX / 8 + 1]; /**< Mask */ int numRel, numAbs, numLeds; /**< Counts */ - int relmap[DMX_MAX_AXES]; /**< Relative axis map */ - int absmap[DMX_MAX_AXES]; /**< Absolute axis map */ + int relmap[REL_CNT]; /**< Relative axis map */ + int absmap[ABS_CNT]; /**< Absolute axis map */ CARD32 kbdState[NUM_STATE_ENTRIES]; /**< Keyboard state */ DeviceIntPtr pKeyboard; /** Keyboard device */ From c73c36b537f996574628e69681833ea37dec2b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?La=C3=A9rcio=20de=20Sousa?= Date: Wed, 18 Sep 2013 13:42:17 -0300 Subject: [PATCH 2/3] xserver: enable InputClass option "GrabDevice" by default for non-seat0 seats (#69478) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch contributes to fill the remaining gaps which make systemd-multi-seat-x wrapper still necessary in some multiseat setups. This also replaces previous evdev patch that does the same thing for that particular driver. When option "-seat" is passed with an argument different from "seat0", option "GrabDevice" for input devices 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 Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer --- config/udev.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/udev.c b/config/udev.c index de8924143..b55b78ec5 100644 --- a/config/udev.c +++ b/config/udev.c @@ -226,6 +226,10 @@ device_added(struct udev_device *udev_device) input_options = input_option_new(input_options, "config_info", config_info); + /* Default setting needed for non-seat0 seats */ + if (ServerIsNotSeat0()) + input_options = input_option_new(input_options, "GrabDevice", "on"); + LogMessage(X_INFO, "config/udev: Adding input device %s (%s)\n", name, path); rc = NewInputDeviceRequest(input_options, &attrs, &dev); From da5e20127a5b6e11a47eb6e61f3ea87b056cdf5f Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Thu, 19 Sep 2013 19:13:35 -0400 Subject: [PATCH 3/3] test: add new os executable to .gitignore Signed-off-by: Gaetan Nadon Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer --- test/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/test/.gitignore b/test/.gitignore index 363d4b683..acbda7a57 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -3,6 +3,7 @@ hashtabletest input list misc +os string touch xfree86