diff options
| author | Keith Packard <keithp@keithp.com> | 2013-10-04 13:54:55 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-10-04 13:54:55 -0700 |
| commit | 9ccb4a63982942fdce19609d2cadbd8e51708462 (patch) | |
| tree | 9248b3857d7b3c54eadaef0394110a4ecd2957ae | |
| parent | 5d2ec6933f6bb5116666ca1bfb07f0f20bf2a0b5 (diff) | |
| parent | da5e20127a5b6e11a47eb6e61f3ea87b056cdf5f (diff) | |
Merge remote-tracking branch 'whot/for-keith'
| -rw-r--r-- | config/udev.c | 4 | ||||
| -rw-r--r-- | hw/dmx/input/usb-private.h | 4 | ||||
| -rw-r--r-- | test/.gitignore | 1 |
3 files changed, 7 insertions, 2 deletions
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); 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 */ 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 |