XLibre/xf86-input-libinput
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-libinput.git synced 2026-03-25 09:59:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Keep track of the enabled devices

Browse Source 
All libinput devices share the same file descriptor so make sure we don't
remove from the server's select loop until the last device is disabled.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
2014-02-04 08:45:18 +10:00
parent 54da516906
commit 17826b06dc
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libinput.c
View File

@@ -54,6 +54,7 @@
struct xf86libinput_driver {
struct libinput *libinput;
int device_count;
int device_enabled_count;
};
static struct xf86libinput_driver driver_context;
@@ -91,8 +92,13 @@ xf86libinput_on(DeviceIntPtr dev)
driver_data->device = device;
pInfo->fd = libinput_get_fd(libinput);
/* Can't use xf86AddEnabledDevice on an epollfd */
AddEnabledDevice(pInfo->fd);
if (driver_context.device_enabled_count == 0) {
/* Can't use xf86AddEnabledDevice on an epollfd */
AddEnabledDevice(pInfo->fd);
}
driver_context.device_enabled_count++;
dev->public.on = TRUE;
return Success;
@@ -104,7 +110,10 @@ xf86libinput_off(DeviceIntPtr dev)
InputInfoPtr pInfo = dev->public.devicePrivate;
struct xf86libinput *driver_data = pInfo->private;
RemoveEnabledDevice(pInfo->fd);
if (--driver_context.device_enabled_count == 0) {
RemoveEnabledDevice(pInfo->fd);
}
pInfo->fd = -1;
dev->public.on = FALSE;
@@ -433,6 +442,9 @@ xf86libinput_handle_event(struct libinput_event *event)
device = libinput_event_get_device(event);
pInfo = libinput_device_get_user_data(device);
if (pInfo && !pInfo->dev->public.on)
return;
switch (libinput_event_get_type(event)) {
case LIBINPUT_EVENT_NONE:
case LIBINPUT_EVENT_DEVICE_ADDED: