From 2a3c62b4d28ec7a69473e9c18c42f1ed26c74bbf Mon Sep 17 00:00:00 2001 From: Ryan Walklin Date: Wed, 14 Nov 2018 23:24:55 +0000 Subject: [PATCH] [WIP][DONTMERGE]Add support for libinput_switch input devices These are used primarily by laptops to signal the state of the lid (open/closed) and tablet mode if supported, based on ACPI events. --- backend/headless/input_device.c | 8 ++++ backend/libinput/events.c | 15 +++++++- backend/libinput/switch.c | 55 ++++++++++++++++++++++++++++ backend/meson.build | 1 + include/backend/libinput.h | 5 +++ include/rootston/config.h | 10 +++++ include/rootston/seat.h | 10 +++++ include/wlr/interfaces/meson.build | 1 + include/wlr/interfaces/wlr_switch.h | 22 +++++++++++ include/wlr/types/meson.build | 1 + include/wlr/types/wlr_input_device.h | 3 ++ include/wlr/types/wlr_switch.h | 46 +++++++++++++++++++++++ rootston/config.c | 8 ++++ rootston/input.c | 2 + rootston/seat.c | 48 ++++++++++++++++++++++++ types/meson.build | 1 + types/wlr_input_device.c | 4 ++ types/wlr_switch.c | 22 +++++++++++ 18 files changed, 261 insertions(+), 1 deletion(-) create mode 100644 backend/libinput/switch.c create mode 100644 include/wlr/interfaces/wlr_switch.h create mode 100644 include/wlr/types/wlr_switch.h create mode 100644 types/wlr_switch.c diff --git a/backend/headless/input_device.c b/backend/headless/input_device.c index ba251dd7..827c6ee4 100644 --- a/backend/headless/input_device.c +++ b/backend/headless/input_device.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include "backend/headless.h" #include "util/signal.h" @@ -76,6 +77,13 @@ struct wlr_input_device *wlr_headless_add_input_device( } wlr_tablet_pad_init(wlr_device->tablet_pad, NULL); break; + case WLR_INPUT_DEVICE_SWITCH: + wlr_device->lid_switch = calloc(1, sizeof(struct wlr_switch)); + if (wlr_device->lid_switch == NULL) { + wlr_log(WLR_ERROR, "Unable to allocate wlr_switch"); + goto error; + } + wlr_switch_init(wlr_device->lid_switch, NULL); } wl_list_insert(&backend->input_devices, &wlr_device->link); diff --git a/backend/libinput/events.c b/backend/libinput/events.c index 9ce62d6f..a7a6c114 100644 --- a/backend/libinput/events.c +++ b/backend/libinput/events.c @@ -169,7 +169,17 @@ static void handle_device_added(struct wlr_libinput_backend *backend, } if (libinput_device_has_capability( libinput_dev, LIBINPUT_DEVICE_CAP_SWITCH)) { - // TODO + struct wlr_input_device *wlr_dev = allocate_device(backend, + libinput_dev, wlr_devices, WLR_INPUT_DEVICE_SWITCH); + if (!wlr_dev) { + goto fail; + } + wlr_dev->lid_switch = create_libinput_switch(libinput_dev); + if (!wlr_dev->lid_switch) { + free(wlr_dev); + goto fail; + } + wlr_signal_emit_safe(&backend->backend.events.new_input, wlr_dev); } if (!wl_list_empty(wlr_devices)) { @@ -274,6 +284,9 @@ void handle_libinput_event(struct wlr_libinput_backend *backend, case LIBINPUT_EVENT_TABLET_PAD_STRIP: handle_tablet_pad_strip(event, libinput_dev); break; + case LIBINPUT_EVENT_SWITCH_TOGGLE: + handle_switch_toggle(event, libinput_dev); + break; default: wlr_log(WLR_DEBUG, "Unknown libinput event %d", event_type); break; diff --git a/backend/libinput/switch.c b/backend/libinput/switch.c new file mode 100644 index 00000000..393460b0 --- /dev/null +++ b/backend/libinput/switch.c @@ -0,0 +1,55 @@ +#include +#include +#include +#include +#include +#include +#include +#include "backend/libinput.h" +#include "util/signal.h" + +struct wlr_switch *create_libinput_switch( + struct libinput_device *libinput_dev) { + assert(libinput_dev); + struct wlr_switch *wlr_switch = calloc(1, sizeof(struct wlr_switch)); + if (!wlr_switch) { + wlr_log(WLR_ERROR, "Unable to allocate wlr_switch"); + return NULL; + } + wlr_switch_init(wlr_switch, NULL); + wlr_log(WLR_DEBUG, "Created switch for device %s", libinput_device_get_name(libinput_dev)); + return wlr_switch; +} + +void handle_switch_toggle(struct libinput_event *event, + struct libinput_device *libinput_dev) { + struct wlr_input_device *wlr_dev = + get_appropriate_device(WLR_INPUT_DEVICE_SWITCH, libinput_dev); + if (!wlr_dev) { + wlr_log(WLR_DEBUG, "Got a switch event for a device with no switch?"); + return; + } + struct libinput_event_switch *sevent = + libinput_event_get_switch_event (event); + struct wlr_event_switch_toggle wlr_event = { 0 }; + wlr_event.device = wlr_dev; + switch (libinput_event_switch_get_switch(sevent)) { + case LIBINPUT_SWITCH_LID: + wlr_event.switch_type = WLR_SWITCH_TYPE_LID; + break; + case LIBINPUT_SWITCH_TABLET_MODE: + wlr_event.switch_type = WLR_SWITCH_TYPE_TABLET_MODE; + break; + } + switch (libinput_event_switch_get_switch_state(sevent)) { + case LIBINPUT_SWITCH_STATE_OFF: + wlr_event.switch_state = WLR_SWITCH_STATE_OFF; + break; + case LIBINPUT_SWITCH_STATE_ON: + wlr_event.switch_state = WLR_SWITCH_STATE_ON; + break; + } + wlr_event.time_msec = + usec_to_msec(libinput_event_switch_get_time_usec(sevent)); + wlr_signal_emit_safe(&wlr_dev->lid_switch->events.toggle, &wlr_event); +} diff --git a/backend/meson.build b/backend/meson.build index 03f8ea7d..bf9b4f83 100644 --- a/backend/meson.build +++ b/backend/meson.build @@ -15,6 +15,7 @@ backend_files = files( 'libinput/events.c', 'libinput/keyboard.c', 'libinput/pointer.c', + 'libinput/switch.c', 'libinput/tablet_pad.c', 'libinput/tablet_tool.c', 'libinput/touch.c', diff --git a/include/backend/libinput.h b/include/backend/libinput.h index 9531091f..f4886956 100644 --- a/include/backend/libinput.h +++ b/include/backend/libinput.h @@ -55,6 +55,11 @@ void handle_pointer_button(struct libinput_event *event, void handle_pointer_axis(struct libinput_event *event, struct libinput_device *device); +struct wlr_switch *create_libinput_switch( + struct libinput_device *device); +void handle_switch_toggle(struct libinput_event *event, + struct libinput_device *device); + struct wlr_touch *create_libinput_touch( struct libinput_device *device); void handle_touch_down(struct libinput_event *event, diff --git a/include/rootston/config.h b/include/rootston/config.h index 86699c6a..a95b8377 100644 --- a/include/rootston/config.h +++ b/include/rootston/config.h @@ -3,6 +3,7 @@ #include #include +#include #include #define ROOTS_CONFIG_DEFAULT_SEAT_NAME "seat0" @@ -65,6 +66,14 @@ struct roots_cursor_config { struct wl_list link; }; +struct roots_switch_config { + enum wlr_switch_type switch_type; + enum wlr_switch_state switch_state; + bool run_on_toggle; + char *command; + struct wl_list link; +}; + struct roots_config { bool xwayland; bool xwayland_lazy; @@ -74,6 +83,7 @@ struct roots_config { struct wl_list bindings; struct wl_list keyboards; struct wl_list cursors; + struct wl_list switches; char *config_path; char *startup_cmd; diff --git a/include/rootston/seat.h b/include/rootston/seat.h index 0187c6cc..7e6b63bf 100644 --- a/include/rootston/seat.h +++ b/include/rootston/seat.h @@ -32,6 +32,7 @@ struct roots_seat { struct wl_list keyboards; struct wl_list pointers; + struct wl_list switches; struct wl_list touch; struct wl_list tablets; struct wl_list tablet_pads; @@ -74,6 +75,15 @@ struct roots_pointer { struct wl_list link; }; +struct roots_switch { + struct roots_seat *seat; + struct wlr_input_device *device; + struct wl_listener device_destroy; + + struct wl_listener toggle; + struct wl_list link; +}; + struct roots_touch { struct roots_seat *seat; struct wlr_input_device *device; diff --git a/include/wlr/interfaces/meson.build b/include/wlr/interfaces/meson.build index 207896b5..7d4d811d 100644 --- a/include/wlr/interfaces/meson.build +++ b/include/wlr/interfaces/meson.build @@ -3,6 +3,7 @@ install_headers( 'wlr_keyboard.h', 'wlr_output.h', 'wlr_pointer.h', + 'wlr_switch.h', 'wlr_tablet_pad.h', 'wlr_tablet_tool.h', 'wlr_touch.h', diff --git a/include/wlr/interfaces/wlr_switch.h b/include/wlr/interfaces/wlr_switch.h new file mode 100644 index 00000000..0b0454f5 --- /dev/null +++ b/include/wlr/interfaces/wlr_switch.h @@ -0,0 +1,22 @@ +/* + * This an unstable interface of wlroots. No guarantees are made regarding the + * future consistency of this API. + */ +#ifndef WLR_USE_UNSTABLE +#error "Add -DWLR_USE_UNSTABLE to enable unstable wlroots features" +#endif + +#ifndef WLR_INTERFACES_WLR_SWITCH_H +#define WLR_INTERFACES_WLR_SWITCH_H + +#include + +struct wlr_switch_impl { + void (*destroy)(struct wlr_switch *lid_switch); +}; + +void wlr_switch_init(struct wlr_switch *lid_switch, + struct wlr_switch_impl *impl); +void wlr_switch_destroy(struct wlr_switch *lid_switch); + +#endif diff --git a/include/wlr/types/meson.build b/include/wlr/types/meson.build index e2ce86e3..752c0dea 100644 --- a/include/wlr/types/meson.build +++ b/include/wlr/types/meson.build @@ -32,6 +32,7 @@ install_headers( 'wlr_seat.h', 'wlr_server_decoration.h', 'wlr_surface.h', + 'wlr_switch.h', 'wlr_tablet_pad.h', 'wlr_tablet_tool.h', 'wlr_tablet_v2.h', diff --git a/include/wlr/types/wlr_input_device.h b/include/wlr/types/wlr_input_device.h index ab0aecb6..f948d55b 100644 --- a/include/wlr/types/wlr_input_device.h +++ b/include/wlr/types/wlr_input_device.h @@ -20,6 +20,7 @@ enum wlr_input_device_type { WLR_INPUT_DEVICE_TOUCH, WLR_INPUT_DEVICE_TABLET_TOOL, WLR_INPUT_DEVICE_TABLET_PAD, + WLR_INPUT_DEVICE_SWITCH, }; /* Note: these are circular dependencies */ @@ -28,6 +29,7 @@ enum wlr_input_device_type { #include #include #include +#include struct wlr_input_device_impl; @@ -46,6 +48,7 @@ struct wlr_input_device { void *_device; struct wlr_keyboard *keyboard; struct wlr_pointer *pointer; + struct wlr_switch *lid_switch; struct wlr_touch *touch; struct wlr_tablet *tablet; struct wlr_tablet_pad *tablet_pad; diff --git a/include/wlr/types/wlr_switch.h b/include/wlr/types/wlr_switch.h new file mode 100644 index 00000000..52b631b5 --- /dev/null +++ b/include/wlr/types/wlr_switch.h @@ -0,0 +1,46 @@ +/* + * This an unstable interface of wlroots. No guarantees are made regarding the + * future consistency of this API. + */ +#ifndef WLR_USE_UNSTABLE +#error "Add -DWLR_USE_UNSTABLE to enable unstable wlroots features" +#endif + +#ifndef WLR_TYPES_WLR_SWITCH_H +#define WLR_TYPES_WLR_SWITCH_H + +#include +#include +#include +#include + +struct wlr_switch_impl; + +struct wlr_switch { + struct wlr_switch_impl *impl; + + struct { + struct wl_signal toggle; + } events; + + void *data; +}; + +enum wlr_switch_type { + WLR_SWITCH_TYPE_LID = 1, + WLR_SWITCH_TYPE_TABLET_MODE, +}; + +enum wlr_switch_state { + WLR_SWITCH_STATE_OFF = 0, + WLR_SWITCH_STATE_ON = 1, +}; + +struct wlr_event_switch_toggle { + struct wlr_input_device *device; + uint32_t time_msec; + enum wlr_switch_type switch_type; + enum wlr_switch_state switch_state; +}; + +#endif diff --git a/rootston/config.c b/rootston/config.c index 119a9e2c..53b3718f 100644 --- a/rootston/config.c +++ b/rootston/config.c @@ -201,6 +201,11 @@ void add_binding_config(struct wl_list *bindings, const char* combination, } } +void add_switch_config(struct wl_list *switches, const char *switch_name, + const char* command) { + wlr_log(WLR_DEBUG, "config switch %s: %s", switch_name, command); +} + static void config_handle_cursor(struct roots_config *config, const char *seat_name, const char *name, const char *value) { struct roots_cursor_config *cc; @@ -436,6 +441,8 @@ static int config_ini_handler(void *user, const char *section, const char *name, config_handle_keyboard(config, device_name, name, value); } else if (strcmp(section, "bindings") == 0) { add_binding_config(&config->bindings, name, value); + } else if (strcmp(section, "switches") == 0) { + add_switch_config(&config->bindings, name, value); } else { wlr_log(WLR_ERROR, "got unknown config section: %s", section); } @@ -456,6 +463,7 @@ struct roots_config *roots_config_create_from_args(int argc, char *argv[]) { wl_list_init(&config->keyboards); wl_list_init(&config->cursors); wl_list_init(&config->bindings); + wl_list_init(&config->switches); int c; unsigned int log_verbosity = WLR_DEBUG; diff --git a/rootston/input.c b/rootston/input.c index 7b4001b3..a863b919 100644 --- a/rootston/input.c +++ b/rootston/input.c @@ -23,6 +23,8 @@ static const char *device_type(enum wlr_input_device_type type) { return "keyboard"; case WLR_INPUT_DEVICE_POINTER: return "pointer"; + case WLR_INPUT_DEVICE_SWITCH: + return "switch"; case WLR_INPUT_DEVICE_TOUCH: return "touch"; case WLR_INPUT_DEVICE_TABLET_TOOL: diff --git a/rootston/seat.c b/rootston/seat.c index e91278c5..101c4ebe 100644 --- a/rootston/seat.c +++ b/rootston/seat.c @@ -9,6 +9,7 @@ #include #include #include +#include "wlr/types/wlr_switch.h" #include #include #include @@ -75,6 +76,16 @@ static void handle_cursor_axis(struct wl_listener *listener, void *data) { roots_cursor_handle_axis(cursor, event); } +static void handle_switch_toggle(struct wl_listener *listener, void *data) { + struct roots_switch *lid_switch = + wl_container_of(listener, lid_switch, toggle); + struct roots_desktop *desktop = lid_switch->seat->input->server->desktop; + wlr_idle_notify_activity(desktop->idle, lid_switch->seat->seat); + struct wlr_event_switch_toggle *event = data; + wlr_log(WLR_DEBUG, "Switch event %s: type %i state %i", event->device->name, event->switch_type, event->switch_state); + //roots_switch_handle_toggle(lid_switch, event); +} + static void handle_touch_down(struct wl_listener *listener, void *data) { struct roots_cursor *cursor = wl_container_of(listener, cursor, touch_down); @@ -587,6 +598,7 @@ struct roots_seat *roots_seat_create(struct roots_input *input, char *name) { wl_list_init(&seat->touch); wl_list_init(&seat->tablets); wl_list_init(&seat->tablet_pads); + wl_list_init(&seat->switches); wl_list_init(&seat->views); wl_list_init(&seat->drag_icons); @@ -710,6 +722,39 @@ static void seat_add_pointer(struct roots_seat *seat, roots_seat_configure_cursor(seat); } +static void handle_switch_destroy(struct wl_listener *listener, void *data) { + struct roots_switch *lid_switch = + wl_container_of(listener, lid_switch, device_destroy); + struct roots_seat *seat = lid_switch->seat; + + wl_list_remove(&lid_switch->link); + wl_list_remove(&lid_switch->device_destroy.link); + free(lid_switch); + + seat_update_capabilities(seat); +} + +static void seat_add_switch(struct roots_seat *seat, + struct wlr_input_device *device) { + assert(device->type == WLR_INPUT_DEVICE_SWITCH); + struct roots_switch *lid_switch = calloc(1, sizeof(struct roots_switch)); + if (!lid_switch) { + wlr_log(WLR_ERROR, "could not allocate switch for seat"); + return; + } + + device->data = lid_switch; + lid_switch->device = device; + lid_switch->seat = seat; + wl_list_insert(&seat->switches, &lid_switch->link); + lid_switch->device_destroy.notify = handle_switch_destroy; + + lid_switch->toggle.notify = handle_switch_toggle; + wl_signal_add(&lid_switch->device->lid_switch->events.toggle, &lid_switch->toggle); + + wl_signal_add(&lid_switch->device->events.destroy, &lid_switch->device_destroy); +} + static void handle_touch_destroy(struct wl_listener *listener, void *data) { struct roots_pointer *touch = wl_container_of(listener, touch, device_destroy); @@ -953,6 +998,9 @@ void roots_seat_add_device(struct roots_seat *seat, case WLR_INPUT_DEVICE_POINTER: seat_add_pointer(seat, device); break; + case WLR_INPUT_DEVICE_SWITCH: + seat_add_switch(seat, device); + break; case WLR_INPUT_DEVICE_TOUCH: seat_add_touch(seat, device); break; diff --git a/types/meson.build b/types/meson.build index 643db233..1813b144 100644 --- a/types/meson.build +++ b/types/meson.build @@ -54,6 +54,7 @@ lib_wlr_types = static_library( 'wlr_screenshooter.c', 'wlr_server_decoration.c', 'wlr_surface.c', + 'wlr_switch.c', 'wlr_tablet_pad.c', 'wlr_tablet_tool.c', 'wlr_text_input_v3.c', diff --git a/types/wlr_input_device.c b/types/wlr_input_device.c index e10e34f5..f7e5f04a 100644 --- a/types/wlr_input_device.c +++ b/types/wlr_input_device.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -40,6 +41,9 @@ void wlr_input_device_destroy(struct wlr_input_device *dev) { case WLR_INPUT_DEVICE_POINTER: wlr_pointer_destroy(dev->pointer); break; + case WLR_INPUT_DEVICE_SWITCH: + wlr_switch_destroy(dev->lid_switch); + break; case WLR_INPUT_DEVICE_TOUCH: wlr_touch_destroy(dev->touch); break; diff --git a/types/wlr_switch.c b/types/wlr_switch.c new file mode 100644 index 00000000..68cdde9e --- /dev/null +++ b/types/wlr_switch.c @@ -0,0 +1,22 @@ +#include +#include +#include +#include +#include + +void wlr_switch_init(struct wlr_switch *lid_switch, + struct wlr_switch_impl *impl) { + lid_switch->impl = impl; + wl_signal_init(&lid_switch->events.toggle); +} + +void wlr_switch_destroy(struct wlr_switch *lid_switch) { + if (!lid_switch) { + return; + } + if (lid_switch->impl && lid_switch->impl->destroy) { + lid_switch->impl->destroy(lid_switch); + } else { + free(lid_switch); + } +}