From aa294330ea9475f5f29a97093492975384618640 Mon Sep 17 00:00:00 2001 From: Johan Malm Date: Fri, 29 May 2020 21:44:50 +0100 Subject: [PATCH] Add keyboard.c --- include/labwc.h | 2 + src/keyboard.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++++ src/meson.build | 1 + src/server.c | 140 ------------------------------------------------ 4 files changed, 143 insertions(+), 140 deletions(-) create mode 100644 src/keyboard.c diff --git a/include/labwc.h b/include/labwc.h index a8382613..89c6366d 100644 --- a/include/labwc.h +++ b/include/labwc.h @@ -174,6 +174,8 @@ void server_cursor_axis(struct wl_listener *listener, void *data); void server_cursor_frame(struct wl_listener *listener, void *data); void server_new_output(struct wl_listener *listener, void *data); +void server_new_keyboard(struct server *server, struct wlr_input_device *device); + void output_frame(struct wl_listener *listener, void *data); void dbg_show_one_view(struct view *view); diff --git a/src/keyboard.c b/src/keyboard.c new file mode 100644 index 00000000..2412492e --- /dev/null +++ b/src/keyboard.c @@ -0,0 +1,140 @@ +#include "labwc.h" + +static void keyboard_handle_modifiers(struct wl_listener *listener, void *data) +{ + /* + * This event is raised when a modifier key, such as shift or alt, is + * pressed. We simply communicate this to the client. + */ + struct keyboard *keyboard = + wl_container_of(listener, keyboard, modifiers); + /* + * A seat can only have one keyboard, but this is a limitation of the + * Wayland protocol - not wlroots. We assign all connected keyboards to + * the same seat. You can swap out the underlying wlr_keyboard like + * this and wlr_seat handles this transparently. + */ + wlr_seat_set_keyboard(keyboard->server->seat, keyboard->device); + /* Send modifiers to the client. */ + wlr_seat_keyboard_notify_modifiers( + keyboard->server->seat, &keyboard->device->keyboard->modifiers); +} + +static bool handle_keybinding(struct server *server, xkb_keysym_t sym) +{ + /* + * Here we handle compositor keybindings. This is when the compositor is + * processing keys, rather than passing them on to the client for its + * own processing. + * + * This function assumes Alt is held down. + */ + switch (sym) { + case XKB_KEY_Escape: + wl_display_terminate(server->wl_display); + break; + case XKB_KEY_F1: + case XKB_KEY_F2: + server->cycle_view = next_toplevel(view_front_toplevel(server)); + fprintf(stderr, "cycle_view=%p\n", (void *)server->cycle_view); + break; + case XKB_KEY_F3: + if (fork() == 0) { + execl("/bin/dmenu_run", "/bin/dmenu_run", (void *)NULL); + } + break; + case XKB_KEY_F6: + interactive_begin(view_front_toplevel(server), + TINYWL_CURSOR_MOVE, 0); + break; + case XKB_KEY_F12: + dbg_show_views(server); + break; + default: + return false; + } + return true; +} + +static void keyboard_handle_key(struct wl_listener *listener, void *data) +{ + /* This event is raised when a key is pressed or released. */ + struct keyboard *keyboard = wl_container_of(listener, keyboard, key); + struct server *server = keyboard->server; + struct wlr_event_keyboard_key *event = data; + struct wlr_seat *seat = server->seat; + + /* Translate libinput keycode -> xkbcommon */ + uint32_t keycode = event->keycode + 8; + /* Get a list of keysyms based on the keymap for this keyboard */ + const xkb_keysym_t *syms; + int nsyms = xkb_state_key_get_syms( + keyboard->device->keyboard->xkb_state, keycode, &syms); + + bool handled = false; + uint32_t modifiers = + wlr_keyboard_get_modifiers(keyboard->device->keyboard); + + if (server->cycle_view) { + if ((syms[0] == XKB_KEY_Alt_L) && + event->state == WLR_KEY_RELEASED) { + /* end cycle */ + view_focus(server->cycle_view); + server->cycle_view = NULL; + } else if (event->state == WLR_KEY_PRESSED) { + /* cycle to next */ + server->cycle_view = next_toplevel(server->cycle_view); + fprintf(stderr, "cycle_view=%p\n", + (void *)server->cycle_view); + return; + } + } + + /* Handle compositor key bindings */ + if ((modifiers & WLR_MODIFIER_ALT) && event->state == WLR_KEY_PRESSED) { + /* If alt is held down and this button was _pressed_, we attempt + * to process it as a compositor keybinding. */ + for (int i = 0; i < nsyms; i++) { + handled = handle_keybinding(server, syms[i]); + } + } + if (!handled) { + /* Otherwise, we pass it along to the client. */ + wlr_seat_set_keyboard(seat, keyboard->device); + wlr_seat_keyboard_notify_key(seat, event->time_msec, + event->keycode, event->state); + } +} + +void server_new_keyboard(struct server *server, struct wlr_input_device *device) +{ + struct keyboard *keyboard = calloc(1, sizeof(struct keyboard)); + keyboard->server = server; + keyboard->device = device; + + /* + * We need to prepare an XKB keymap and assign it to the keyboard. This + * assumes the defaults (e.g. layout = "us"). + */ + struct xkb_rule_names rules = { 0 }; + struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); + struct xkb_keymap *keymap = xkb_map_new_from_names( + context, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS); + + wlr_keyboard_set_keymap(device->keyboard, keymap); + xkb_keymap_unref(keymap); + xkb_context_unref(context); + wlr_keyboard_set_repeat_info(device->keyboard, 25, 600); + + /* Here we set up listeners for keyboard events. */ + keyboard->modifiers.notify = keyboard_handle_modifiers; + wl_signal_add(&device->keyboard->events.modifiers, + &keyboard->modifiers); + keyboard->key.notify = keyboard_handle_key; + wl_signal_add(&device->keyboard->events.key, &keyboard->key); + + wlr_seat_set_keyboard(server->seat, device); + + /* And add the keyboard to our list of keyboards */ + wl_list_insert(&server->keyboards, &keyboard->link); +} diff --git a/src/meson.build b/src/meson.build index fcbce31d..e68751fe 100644 --- a/src/meson.build +++ b/src/meson.build @@ -2,6 +2,7 @@ labwc_sources = files( 'cursor.c', 'deco.c', 'interactive.c', + 'keyboard.c', 'main.c', 'output.c', 'server.c', diff --git a/src/server.c b/src/server.c index be047f44..d32ac1b4 100644 --- a/src/server.c +++ b/src/server.c @@ -1,145 +1,5 @@ #include "labwc.h" -static void keyboard_handle_modifiers(struct wl_listener *listener, void *data) -{ - /* - * This event is raised when a modifier key, such as shift or alt, is - * pressed. We simply communicate this to the client. - */ - struct keyboard *keyboard = - wl_container_of(listener, keyboard, modifiers); - /* - * A seat can only have one keyboard, but this is a limitation of the - * Wayland protocol - not wlroots. We assign all connected keyboards to - * the same seat. You can swap out the underlying wlr_keyboard like - * this and wlr_seat handles this transparently. - */ - wlr_seat_set_keyboard(keyboard->server->seat, keyboard->device); - /* Send modifiers to the client. */ - wlr_seat_keyboard_notify_modifiers( - keyboard->server->seat, &keyboard->device->keyboard->modifiers); -} - -static bool handle_keybinding(struct server *server, xkb_keysym_t sym) -{ - /* - * Here we handle compositor keybindings. This is when the compositor is - * processing keys, rather than passing them on to the client for its - * own processing. - * - * This function assumes Alt is held down. - */ - switch (sym) { - case XKB_KEY_Escape: - wl_display_terminate(server->wl_display); - break; - case XKB_KEY_F1: - case XKB_KEY_F2: - server->cycle_view = next_toplevel(view_front_toplevel(server)); - fprintf(stderr, "cycle_view=%p\n", (void *)server->cycle_view); - break; - case XKB_KEY_F3: - if (fork() == 0) { - execl("/bin/dmenu_run", "/bin/dmenu_run", (void *)NULL); - } - break; - case XKB_KEY_F6: - interactive_begin(view_front_toplevel(server), - TINYWL_CURSOR_MOVE, 0); - break; - case XKB_KEY_F12: - dbg_show_views(server); - break; - default: - return false; - } - return true; -} - -static void keyboard_handle_key(struct wl_listener *listener, void *data) -{ - /* This event is raised when a key is pressed or released. */ - struct keyboard *keyboard = wl_container_of(listener, keyboard, key); - struct server *server = keyboard->server; - struct wlr_event_keyboard_key *event = data; - struct wlr_seat *seat = server->seat; - - /* Translate libinput keycode -> xkbcommon */ - uint32_t keycode = event->keycode + 8; - /* Get a list of keysyms based on the keymap for this keyboard */ - const xkb_keysym_t *syms; - int nsyms = xkb_state_key_get_syms( - keyboard->device->keyboard->xkb_state, keycode, &syms); - - bool handled = false; - uint32_t modifiers = - wlr_keyboard_get_modifiers(keyboard->device->keyboard); - - if (server->cycle_view) { - if ((syms[0] == XKB_KEY_Alt_L) && - event->state == WLR_KEY_RELEASED) { - /* end cycle */ - view_focus(server->cycle_view); - server->cycle_view = NULL; - } else if (event->state == WLR_KEY_PRESSED) { - /* cycle to next */ - server->cycle_view = next_toplevel(server->cycle_view); - fprintf(stderr, "cycle_view=%p\n", - (void *)server->cycle_view); - return; - } - } - - /* Handle compositor key bindings */ - if ((modifiers & WLR_MODIFIER_ALT) && event->state == WLR_KEY_PRESSED) { - /* If alt is held down and this button was _pressed_, we attempt - * to process it as a compositor keybinding. */ - for (int i = 0; i < nsyms; i++) { - handled = handle_keybinding(server, syms[i]); - } - } - if (!handled) { - /* Otherwise, we pass it along to the client. */ - wlr_seat_set_keyboard(seat, keyboard->device); - wlr_seat_keyboard_notify_key(seat, event->time_msec, - event->keycode, event->state); - } -} - -static void server_new_keyboard(struct server *server, - struct wlr_input_device *device) -{ - struct keyboard *keyboard = calloc(1, sizeof(struct keyboard)); - keyboard->server = server; - keyboard->device = device; - - /* - * We need to prepare an XKB keymap and assign it to the keyboard. This - * assumes the defaults (e.g. layout = "us"). - */ - struct xkb_rule_names rules = { 0 }; - struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); - struct xkb_keymap *keymap = xkb_map_new_from_names( - context, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS); - - wlr_keyboard_set_keymap(device->keyboard, keymap); - xkb_keymap_unref(keymap); - xkb_context_unref(context); - wlr_keyboard_set_repeat_info(device->keyboard, 25, 600); - - /* Here we set up listeners for keyboard events. */ - keyboard->modifiers.notify = keyboard_handle_modifiers; - wl_signal_add(&device->keyboard->events.modifiers, - &keyboard->modifiers); - keyboard->key.notify = keyboard_handle_key; - wl_signal_add(&device->keyboard->events.key, &keyboard->key); - - wlr_seat_set_keyboard(server->seat, device); - - /* And add the keyboard to our list of keyboards */ - wl_list_insert(&server->keyboards, &keyboard->link); -} - static void server_new_pointer(struct server *server, struct wlr_input_device *device) { -- 2.52.0