frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

This commit is contained in:
Keith Packard 2013-10-04 13:54:55 -07:00
parent 5d2ec6933f da5e20127a
commit 9ccb4a6398
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/udev.c
View File

@ -226,6 +226,10 @@ device_added(struct udev_device *udev_device)
input_options = input_option_new(input_options, "config_info", config_info); 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", LogMessage(X_INFO, "config/udev: Adding input device %s (%s)\n",
name, path); name, path);
rc = NewInputDeviceRequest(input_options, &attrs, &dev); rc = NewInputDeviceRequest(input_options, &attrs, &dev);

4
hw/dmx/input/usb-private.h
View File

@ -102,8 +102,8 @@ typedef struct _myPrivate {
int fd; /**< File descriptor */ int fd; /**< File descriptor */
unsigned char mask[EV_MAX / 8 + 1]; /**< Mask */ unsigned char mask[EV_MAX / 8 + 1]; /**< Mask */
int numRel, numAbs, numLeds; /**< Counts */ int numRel, numAbs, numLeds; /**< Counts */
int relmap[DMX_MAX_AXES]; /**< Relative axis map */ int relmap[REL_CNT]; /**< Relative axis map */
int absmap[DMX_MAX_AXES]; /**< Absolute axis map */ int absmap[ABS_CNT]; /**< Absolute axis map */
CARD32 kbdState[NUM_STATE_ENTRIES]; /**< Keyboard state */ CARD32 kbdState[NUM_STATE_ENTRIES]; /**< Keyboard state */
DeviceIntPtr pKeyboard; /** Keyboard device */ DeviceIntPtr pKeyboard; /** Keyboard device */

1
test/.gitignore vendored
View File

@ -3,6 +3,7 @@ hashtabletest
input input
list list
misc misc
os
string string
touch touch
xfree86 xfree86