From 3e93d913bef339311976a927091674fb7f1f4987 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 22 Aug 2014 13:40:40 +1000 Subject: [PATCH] evdev: hook up a generic enable/disable interface for devices The evdev fallback dispatch supports enabling and disabling devices. That's fairly easy to support since we don't (yet) have extra event generation within the fallback backend. Thus, we can simply close the fd and re-open it again later. Touchpads are currently excluded here, they generate extra events on tapping, scrolling, and software buttons and need a more complex implementation. Signed-off-by: Peter Hutterer Reviewed-by: Hans de Goede --- src/evdev.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++- src/evdev.h | 8 +++++ 2 files changed, 100 insertions(+), 1 deletion(-) diff --git a/src/evdev.c b/src/evdev.c index f7f8f088..996ce32e 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -624,14 +624,63 @@ struct evdev_dispatch_interface fallback_interface = { fallback_destroy }; +static uint32_t +evdev_sendevents_get_modes(struct libinput_device *device) +{ + return LIBINPUT_CONFIG_SEND_EVENTS_ENABLED | + LIBINPUT_CONFIG_SEND_EVENTS_DISABLED; +} + +static enum libinput_config_status +evdev_sendevents_set_mode(struct libinput_device *device, + enum libinput_config_send_events_mode mode) +{ + struct evdev_device *evdev = (struct evdev_device*)device; + struct evdev_dispatch *dispatch = evdev->dispatch; + + if (mode == dispatch->sendevents.current_mode) + return LIBINPUT_CONFIG_STATUS_SUCCESS; + + switch(mode) { + case LIBINPUT_CONFIG_SEND_EVENTS_ENABLED: + evdev_device_resume(evdev); + break; + case LIBINPUT_CONFIG_SEND_EVENTS_DISABLED: + evdev_device_suspend(evdev); + break; + default: + return LIBINPUT_CONFIG_STATUS_UNSUPPORTED; + } + + dispatch->sendevents.current_mode = mode; + + return LIBINPUT_CONFIG_STATUS_SUCCESS; +} + +static enum libinput_config_send_events_mode +evdev_sendevents_get_mode(struct libinput_device *device) +{ + struct evdev_device *evdev = (struct evdev_device*)device; + struct evdev_dispatch *dispatch = evdev->dispatch; + + return dispatch->sendevents.current_mode; +} + +static enum libinput_config_send_events_mode +evdev_sendevents_get_default_mode(struct libinput_device *device) +{ + return LIBINPUT_CONFIG_SEND_EVENTS_ENABLED; +} + static struct evdev_dispatch * fallback_dispatch_create(struct libinput_device *device) { - struct evdev_dispatch *dispatch = malloc(sizeof *dispatch); + struct evdev_dispatch *dispatch = zalloc(sizeof *dispatch); if (dispatch == NULL) return NULL; dispatch->interface = &fallback_interface; + device->config.calibration = &dispatch->calibration; dispatch->calibration.has_matrix = evdev_calibration_has_matrix; @@ -639,6 +688,14 @@ fallback_dispatch_create(struct libinput_device *device) dispatch->calibration.get_matrix = evdev_calibration_get_matrix; dispatch->calibration.get_default_matrix = evdev_calibration_get_default_matrix; + device->config.sendevents = &dispatch->sendevents.config; + + dispatch->sendevents.current_mode = LIBINPUT_CONFIG_SEND_EVENTS_ENABLED; + dispatch->sendevents.config.get_modes = evdev_sendevents_get_modes; + dispatch->sendevents.config.set_mode = evdev_sendevents_set_mode; + dispatch->sendevents.config.get_mode = evdev_sendevents_get_mode; + dispatch->sendevents.config.get_default_mode = evdev_sendevents_get_default_mode; + return dispatch; } @@ -1198,6 +1255,40 @@ evdev_device_suspend(struct evdev_device *device) return 0; } +int +evdev_device_resume(struct evdev_device *device) +{ + struct libinput *libinput = device->base.seat->libinput; + int fd; + + if (device->fd != -1) + return 0; + + fd = open_restricted(libinput, device->devnode, O_RDWR | O_NONBLOCK); + + if (fd < 0) + return -errno; + + device->fd = fd; + + if (evdev_need_mtdev(device)) { + device->mtdev = mtdev_new_open(device->fd); + if (!device->mtdev) + return -ENODEV; + } + + device->source = + libinput_add_fd(libinput, fd, evdev_device_dispatch, device); + if (!device->source) { + mtdev_close_delete(device->mtdev); + return -ENOMEM; + } + + memset(device->hw_key_mask, 0, sizeof(device->hw_key_mask)); + + return 0; +} + void evdev_device_remove(struct evdev_device *device) { diff --git a/src/evdev.h b/src/evdev.h index ef02491c..2af68289 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -124,6 +124,11 @@ struct evdev_dispatch_interface { struct evdev_dispatch { struct evdev_dispatch_interface *interface; struct libinput_device_config_calibration calibration; + + struct { + struct libinput_device_config_send_events config; + enum libinput_config_send_events_mode current_mode; + } sendevents; }; struct evdev_device * @@ -189,6 +194,9 @@ evdev_device_transform_y(struct evdev_device *device, int evdev_device_suspend(struct evdev_device *device); +int +evdev_device_resume(struct evdev_device *device); + void evdev_keyboard_notify_key(struct evdev_device *device, uint32_t time, -- 2.34.1