XLibre/xf86-input-evdev
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-evdev.git synced 2026-03-25 10:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

evdev: Add support for server managed fds

Browse Source 
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Hans de Goede
2014-03-08 10:28:00 +01:00
committed by Peter Hutterer
parent f6fcad8b10
commit ae67f64f02
1 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/evdev.c
View File

@@ -97,6 +97,10 @@
#define ABS_MT_TRACKING_ID 0x39
#endif
#ifndef XI86_SERVER_FD
#define XI86_SERVER_FD 0x20
#endif
static const char *evdevDefaults[] = {
"XkbRules", "evdev",
"XkbModel", "pc104", /* the right model for 'us' */
@@ -2478,33 +2482,33 @@ EvdevOpenDevice(InputInfoPtr pInfo)
xf86IDrvMsg(pInfo, X_CONFIG, "Device: \"%s\"\n", device);
}
if (pInfo->fd < 0)
if (!(pInfo->flags & XI86_SERVER_FD) && pInfo->fd < 0)
{
do {
pInfo->fd = open(device, O_RDWR | O_NONBLOCK, 0);
} while (pInfo->fd < 0 && errno == EINTR);
}
if (pInfo->fd < 0) {
xf86IDrvMsg(pInfo, X_ERROR, "Unable to open evdev device \"%s\".\n", device);
if (pInfo->fd < 0) {
xf86IDrvMsg(pInfo, X_ERROR, "Unable to open evdev device \"%s\".\n", device);
return BadValue;
}
if (libevdev_get_fd(pEvdev->dev) != -1) {
struct input_event ev;
libevdev_change_fd(pEvdev->dev, pInfo->fd);
/* re-sync libevdev's view of the device, but
we don't care about the actual events here */
libevdev_next_event(pEvdev->dev, LIBEVDEV_READ_FLAG_FORCE_SYNC, &ev);
while (libevdev_next_event(pEvdev->dev, LIBEVDEV_READ_FLAG_SYNC, &ev) == LIBEVDEV_READ_STATUS_SYNC)
;
} else {
int rc = libevdev_set_fd(pEvdev->dev, pInfo->fd);
if (rc < 0) {
xf86IDrvMsg(pInfo, X_ERROR, "Unable to query fd: %s\n", strerror(-rc));
return BadValue;
}
if (libevdev_get_fd(pEvdev->dev) != -1) {
struct input_event ev;
libevdev_change_fd(pEvdev->dev, pInfo->fd);
/* re-sync libevdev's view of the device, but
we don't care about the actual events here */
libevdev_next_event(pEvdev->dev, LIBEVDEV_READ_FLAG_FORCE_SYNC, &ev);
while (libevdev_next_event(pEvdev->dev, LIBEVDEV_READ_FLAG_SYNC, &ev) == LIBEVDEV_READ_STATUS_SYNC)
;
} else {
int rc = libevdev_set_fd(pEvdev->dev, pInfo->fd);
if (rc < 0) {
xf86IDrvMsg(pInfo, X_ERROR, "Unable to query fd: %s\n", strerror(-rc));
return BadValue;
}
}
}
/* Check major/minor of device node to avoid adding duplicate devices. */
@@ -2531,7 +2535,7 @@ static void
EvdevCloseDevice(InputInfoPtr pInfo)
{
EvdevPtr pEvdev = pInfo->private;
if (pInfo->fd >= 0)
if (!(pInfo->flags & XI86_SERVER_FD) && pInfo->fd >= 0)
{
close(pInfo->fd);
pInfo->fd = -1;
@@ -2679,7 +2683,10 @@ _X_EXPORT InputDriverRec EVDEV = {
EvdevPreInit,
EvdevUnInit,
NULL,
evdevDefaults
evdevDefaults,
#ifdef XI86_DRV_CAP_SERVER_FD
XI86_DRV_CAP_SERVER_FD
#endif
};
static void