xserver: Branch 'master' - 4 commits

[Keith Packard]

 config/udev.c              |    4 ++++
 hw/dmx/input/usb-private.h |    4 ++--
 test/.gitignore            |    1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 9ccb4a63982942fdce19609d2cadbd8e51708462
Merge: 5d2ec69 da5e201
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Oct 4 13:54:55 2013 -0700

    Merge remote-tracking branch 'whot/for-keith'

commit da5e20127a5b6e11a47eb6e61f3ea87b056cdf5f
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Thu Sep 19 19:13:35 2013 -0400

    test: add new os executable to .gitignore
    
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/test/.gitignore b/test/.gitignore
index 363d4b6..acbda7a 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -3,6 +3,7 @@ hashtabletest
 input
 list
 misc
+os
 string
 touch
 xfree86
commit c73c36b537f996574628e69681833ea37dec2b6e
Author: Laércio de Sousa <lbsousajr at gmail.com>
Date:   Wed Sep 18 13:42:17 2013 -0300

    xserver: enable InputClass option "GrabDevice" by default for non-seat0 seats (#69478)
    
    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 <lbsousajr at gmail.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/config/udev.c b/config/udev.c
index de89241..b55b78e 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);
commit 160c2db32d0b9ee5316a44179a6af4f4722e3d0a
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Sep 18 16:04:44 2013 +1000

    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 <peter.hutterer at who-t.net>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/hw/dmx/input/usb-private.h b/hw/dmx/input/usb-private.h
index 096607a..2ecfdf6 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 */