From ab6c1f88e6314ae0d56d5dfffc121a824175e7fd Mon Sep 17 00:00:00 2001 From: emersion Date: Mon, 2 Oct 2017 12:12:06 +0200 Subject: Add keyboard state to rootston --- include/rootston/input.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'include/rootston') diff --git a/include/rootston/input.h b/include/rootston/input.h index ecd53f3b..a9cc2014 100644 --- a/include/rootston/input.h +++ b/include/rootston/input.h @@ -10,11 +10,22 @@ #include "rootston/view.h" #include "rootston/server.h" +#define ROOTS_KEYBOARD_PRESSED_KEYS_CAP 32 + +struct roots_keyboard_key { + uint32_t keycode; + + const xkb_keysym_t *syms; + size_t syms_len; +}; + struct roots_keyboard { struct roots_input *input; struct wlr_input_device *device; struct wl_listener key; struct wl_list link; + + struct roots_keyboard_key pressed_keys[ROOTS_KEYBOARD_PRESSED_KEYS_CAP]; }; struct roots_pointer { -- cgit v1.2.3 From d32018f1ac5f3b309a01627b4338e42f668b1887 Mon Sep 17 00:00:00 2001 From: emersion Date: Mon, 2 Oct 2017 15:24:01 +0200 Subject: Use keysyms instead of keycodes --- include/rootston/input.h | 11 ++----- rootston/keyboard.c | 78 +++++++++++++++++++----------------------------- 2 files changed, 32 insertions(+), 57 deletions(-) (limited to 'include/rootston') diff --git a/include/rootston/input.h b/include/rootston/input.h index a9cc2014..6161eb7a 100644 --- a/include/rootston/input.h +++ b/include/rootston/input.h @@ -10,14 +10,7 @@ #include "rootston/view.h" #include "rootston/server.h" -#define ROOTS_KEYBOARD_PRESSED_KEYS_CAP 32 - -struct roots_keyboard_key { - uint32_t keycode; - - const xkb_keysym_t *syms; - size_t syms_len; -}; +#define ROOTS_KEYBOARD_PRESSED_KEYSYMS_CAP 32 struct roots_keyboard { struct roots_input *input; @@ -25,7 +18,7 @@ struct roots_keyboard { struct wl_listener key; struct wl_list link; - struct roots_keyboard_key pressed_keys[ROOTS_KEYBOARD_PRESSED_KEYS_CAP]; + xkb_keysym_t pressed_keysyms[ROOTS_KEYBOARD_PRESSED_KEYSYMS_CAP]; }; struct roots_pointer { diff --git a/rootston/keyboard.c b/rootston/keyboard.c index 84e5213c..81d564d5 100644 --- a/rootston/keyboard.c +++ b/rootston/keyboard.c @@ -10,54 +10,49 @@ #include #include "rootston/input.h" -static ssize_t keyboard_pressed_key_index(struct roots_keyboard *keyboard, - uint32_t keycode) { - for (size_t i = 0; i < ROOTS_KEYBOARD_PRESSED_KEYS_CAP; i++) { - if (keyboard->pressed_keys[i].keycode == keycode) { +static ssize_t keyboard_pressed_keysym_index(struct roots_keyboard *keyboard, + xkb_keysym_t keysym) { + for (size_t i = 0; i < ROOTS_KEYBOARD_PRESSED_KEYSYMS_CAP; i++) { + if (keyboard->pressed_keysyms[i] == keysym) { return i; } } return -1; } -static void keyboard_key_press(struct roots_keyboard *keyboard, - struct roots_keyboard_key *key) { +static void keyboard_keysym_press(struct roots_keyboard *keyboard, + xkb_keysym_t keysym) { struct roots_server *server = keyboard->input->server; - ssize_t i = keyboard_pressed_key_index(keyboard, key->keycode); + ssize_t i = keyboard_pressed_keysym_index(keyboard, keysym); if (i < 0) { - i = keyboard_pressed_key_index(keyboard, 0); + i = keyboard_pressed_keysym_index(keyboard, 0); if (i >= 0) { - memcpy(&keyboard->pressed_keys[i], key, - sizeof(struct roots_keyboard_key)); + keyboard->pressed_keysyms[i] = keysym; } } - for (size_t i = 0; i < key->syms_len; i++) { - xkb_keysym_t sym = key->syms[i]; - if (sym == XKB_KEY_Escape) { - // TEMPORARY, probably - wl_display_terminate(server->wl_display); - } else if (sym >= XKB_KEY_XF86Switch_VT_1 && - sym <= XKB_KEY_XF86Switch_VT_12) { - if (wlr_backend_is_multi(server->backend)) { - struct wlr_session *session = - wlr_multi_get_session(server->backend); - if (session) { - unsigned vt = sym - XKB_KEY_XF86Switch_VT_1 + 1; - wlr_session_change_vt(session, vt); - } + if (keysym == XKB_KEY_Escape) { + // TEMPORARY, probably + wl_display_terminate(server->wl_display); + } else if (keysym >= XKB_KEY_XF86Switch_VT_1 && + keysym <= XKB_KEY_XF86Switch_VT_12) { + if (wlr_backend_is_multi(server->backend)) { + struct wlr_session *session = + wlr_multi_get_session(server->backend); + if (session) { + unsigned vt = keysym - XKB_KEY_XF86Switch_VT_1 + 1; + wlr_session_change_vt(session, vt); } } } } -static void keyboard_key_release(struct roots_keyboard *keyboard, - struct roots_keyboard_key *key) { - ssize_t i = keyboard_pressed_key_index(keyboard, key->keycode); +static void keyboard_keysym_release(struct roots_keyboard *keyboard, + xkb_keysym_t keysym) { + ssize_t i = keyboard_pressed_keysym_index(keyboard, keysym); if (i >= 0) { - struct roots_keyboard_key *pressed_key = &keyboard->pressed_keys[i]; - memset(pressed_key, 0, sizeof(struct roots_keyboard_key)); + keyboard->pressed_keysyms[i] = 0; } } @@ -69,26 +64,13 @@ static void keyboard_key_notify(struct wl_listener *listener, void *data) { const xkb_keysym_t *syms; int syms_len = xkb_state_key_get_syms(keyboard->device->keyboard->xkb_state, keycode, &syms); - - struct roots_keyboard_key *key = calloc(1, - sizeof(struct roots_keyboard_key)); - if (key == NULL) { - return; - } - key->keycode = keycode; - key->syms = syms; - key->syms_len = syms_len; - - switch (event->state) { - case WLR_KEY_PRESSED: - keyboard_key_press(keyboard, key); - break; - case WLR_KEY_RELEASED: - keyboard_key_release(keyboard, key); - break; + for (int i = 0; i < syms_len; i++) { + if (event->state == WLR_KEY_PRESSED) { + keyboard_keysym_press(keyboard, syms[i]); + } else { // WLR_KEY_RELEASED + keyboard_keysym_release(keyboard, syms[i]); + } } - - free(key); } void keyboard_add(struct wlr_input_device *device, struct roots_input *input) { -- cgit v1.2.3 From 97d0fe89768697ff2f6f19f0c9a900591c1d1a13 Mon Sep 17 00:00:00 2001 From: emersion Date: Mon, 2 Oct 2017 16:25:48 +0200 Subject: Parse bindings in config, execute bindings --- include/rootston/config.h | 12 ++++++++++++ rootston/config.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ rootston/keyboard.c | 40 +++++++++++++++++++++++++++++-------- 3 files changed, 94 insertions(+), 8 deletions(-) (limited to 'include/rootston') diff --git a/include/rootston/config.h b/include/rootston/config.h index 0832d88d..deff7578 100644 --- a/include/rootston/config.h +++ b/include/rootston/config.h @@ -18,6 +18,17 @@ struct device_config { struct wl_list link; }; +enum binding_config_action { + BINDING_CONFIG_ACTION_QUIT, +}; + +struct binding_config { + xkb_keysym_t *keysyms; + size_t keysyms_len; + enum binding_config_action action; + struct wl_list link; +}; + struct roots_config { // TODO: Multiple cursors, multiseat struct { @@ -27,6 +38,7 @@ struct roots_config { struct wl_list outputs; struct wl_list devices; + struct wl_list bindings; char *config_path; }; diff --git a/rootston/config.c b/rootston/config.c index 3280c6d1..5c889975 100644 --- a/rootston/config.c +++ b/rootston/config.c @@ -171,6 +171,45 @@ static int config_ini_handler(void *user, const char *section, const char *name, } else { wlr_log(L_ERROR, "got unknown device config: %s", name); } + } else if (strcmp(section, "bindings") == 0) { + struct binding_config *bc = calloc(1, sizeof(struct binding_config)); + wl_list_insert(&config->bindings, &bc->link); + + if (strcmp(value, "quit") == 0) { + bc->action = BINDING_CONFIG_ACTION_QUIT; + } else { + wlr_log(L_ERROR, "got unknown key binding action: %s", value); + wl_list_remove(&bc->link); + free(bc); + return 1; + } + + bc->keysyms_len = 1; + char *symnames = strdup(name); + for (char *c = symnames; *c != '\0'; c++) { + if (*c == '+') { + *c = '\0'; + bc->keysyms_len++; + } + } + + bc->keysyms = calloc(1, bc->keysyms_len * sizeof(xkb_keysym_t)); + char *symname = symnames; + for (size_t i = 0; i < bc->keysyms_len; i++) { + xkb_keysym_t sym = xkb_keysym_from_name(symname, + XKB_KEYSYM_NO_FLAGS); + if (sym == XKB_KEY_NoSymbol) { + wlr_log(L_ERROR, "got unknown key binding symbol: %s", symname); + wl_list_remove(&bc->link); + free(bc->keysyms); + free(bc); + break; + } + bc->keysyms[i] = sym; + symname += strlen(symname) + 1; + } + + free(symnames); } else { wlr_log(L_ERROR, "got unknown config section: %s", section); } @@ -182,6 +221,15 @@ struct roots_config *parse_args(int argc, char *argv[]) { struct roots_config *config = calloc(1, sizeof(struct roots_config)); wl_list_init(&config->outputs); wl_list_init(&config->devices); + wl_list_init(&config->bindings); + + // TEMPORARY, probably + struct binding_config *bc = calloc(1, sizeof(struct binding_config)); + wl_list_insert(&config->bindings, &bc->link); + bc->action = BINDING_CONFIG_ACTION_QUIT; + bc->keysyms_len = 1; + bc->keysyms = calloc(1, sizeof(xkb_keysym_t)); + bc->keysyms[0] = XKB_KEY_Escape; int c; while ((c = getopt(argc, argv, "C:h")) != -1) { @@ -238,6 +286,8 @@ void roots_config_destroy(struct roots_config *config) { free(dc); } + // TODO: free bindings + free(config->config_path); free(config->cursor.mapped_output); free(config->cursor.mapped_box); diff --git a/rootston/keyboard.c b/rootston/keyboard.c index 81d564d5..79295ab4 100644 --- a/rootston/keyboard.c +++ b/rootston/keyboard.c @@ -20,23 +20,29 @@ static ssize_t keyboard_pressed_keysym_index(struct roots_keyboard *keyboard, return -1; } -static void keyboard_keysym_press(struct roots_keyboard *keyboard, - xkb_keysym_t keysym) { +static void keyboard_binding_execute(struct roots_keyboard *keyboard, + struct binding_config *bc) { struct roots_server *server = keyboard->input->server; + switch (bc->action) { + case BINDING_CONFIG_ACTION_QUIT: + wl_display_terminate(server->wl_display); + break; + } +} +static void keyboard_keysym_press(struct roots_keyboard *keyboard, + xkb_keysym_t keysym) { ssize_t i = keyboard_pressed_keysym_index(keyboard, keysym); if (i < 0) { - i = keyboard_pressed_keysym_index(keyboard, 0); + i = keyboard_pressed_keysym_index(keyboard, XKB_KEY_NoSymbol); if (i >= 0) { keyboard->pressed_keysyms[i] = keysym; } } - if (keysym == XKB_KEY_Escape) { - // TEMPORARY, probably - wl_display_terminate(server->wl_display); - } else if (keysym >= XKB_KEY_XF86Switch_VT_1 && + if (keysym >= XKB_KEY_XF86Switch_VT_1 && keysym <= XKB_KEY_XF86Switch_VT_12) { + struct roots_server *server = keyboard->input->server; if (wlr_backend_is_multi(server->backend)) { struct wlr_session *session = wlr_multi_get_session(server->backend); @@ -45,6 +51,24 @@ static void keyboard_keysym_press(struct roots_keyboard *keyboard, wlr_session_change_vt(session, vt); } } + return; + } + + struct wl_list *bindings = &keyboard->input->server->config->bindings; + struct binding_config *bc; + wl_list_for_each(bc, bindings, link) { + bool ok = true; + for (size_t i = 0; i < bc->keysyms_len; i++) { + ssize_t j = keyboard_pressed_keysym_index(keyboard, bc->keysyms[i]); + if (j < 0) { + ok = false; + break; + } + } + + if (ok) { + keyboard_binding_execute(keyboard, bc); + } } } @@ -52,7 +76,7 @@ static void keyboard_keysym_release(struct roots_keyboard *keyboard, xkb_keysym_t keysym) { ssize_t i = keyboard_pressed_keysym_index(keyboard, keysym); if (i >= 0) { - keyboard->pressed_keysyms[i] = 0; + keyboard->pressed_keysyms[i] = XKB_KEY_NoSymbol; } } -- cgit v1.2.3 From 238ded1578925a1c80cba1d838ff428c25249e6a Mon Sep 17 00:00:00 2001 From: emersion Date: Mon, 2 Oct 2017 17:53:30 +0200 Subject: Use a command string rather than an action enum --- include/rootston/config.h | 6 +----- rootston/config.c | 11 ++--------- rootston/keyboard.c | 8 +++----- 3 files changed, 6 insertions(+), 19 deletions(-) (limited to 'include/rootston') diff --git a/include/rootston/config.h b/include/rootston/config.h index deff7578..ef101f2d 100644 --- a/include/rootston/config.h +++ b/include/rootston/config.h @@ -18,14 +18,10 @@ struct device_config { struct wl_list link; }; -enum binding_config_action { - BINDING_CONFIG_ACTION_QUIT, -}; - struct binding_config { xkb_keysym_t *keysyms; size_t keysyms_len; - enum binding_config_action action; + char *command; struct wl_list link; }; diff --git a/rootston/config.c b/rootston/config.c index 5c889975..1f524ab2 100644 --- a/rootston/config.c +++ b/rootston/config.c @@ -175,14 +175,7 @@ static int config_ini_handler(void *user, const char *section, const char *name, struct binding_config *bc = calloc(1, sizeof(struct binding_config)); wl_list_insert(&config->bindings, &bc->link); - if (strcmp(value, "quit") == 0) { - bc->action = BINDING_CONFIG_ACTION_QUIT; - } else { - wlr_log(L_ERROR, "got unknown key binding action: %s", value); - wl_list_remove(&bc->link); - free(bc); - return 1; - } + bc->command = strdup(value); bc->keysyms_len = 1; char *symnames = strdup(name); @@ -226,7 +219,7 @@ struct roots_config *parse_args(int argc, char *argv[]) { // TEMPORARY, probably struct binding_config *bc = calloc(1, sizeof(struct binding_config)); wl_list_insert(&config->bindings, &bc->link); - bc->action = BINDING_CONFIG_ACTION_QUIT; + bc->command = strdup("exit"); bc->keysyms_len = 1; bc->keysyms = calloc(1, sizeof(xkb_keysym_t)); bc->keysyms[0] = XKB_KEY_Escape; diff --git a/rootston/keyboard.c b/rootston/keyboard.c index 79295ab4..d3f0bc67 100644 --- a/rootston/keyboard.c +++ b/rootston/keyboard.c @@ -21,12 +21,10 @@ static ssize_t keyboard_pressed_keysym_index(struct roots_keyboard *keyboard, } static void keyboard_binding_execute(struct roots_keyboard *keyboard, - struct binding_config *bc) { + char *command) { struct roots_server *server = keyboard->input->server; - switch (bc->action) { - case BINDING_CONFIG_ACTION_QUIT: + if (strcmp(command, "exit") == 0) { wl_display_terminate(server->wl_display); - break; } } @@ -67,7 +65,7 @@ static void keyboard_keysym_press(struct roots_keyboard *keyboard, } if (ok) { - keyboard_binding_execute(keyboard, bc); + keyboard_binding_execute(keyboard, bc->command); } } } -- cgit v1.2.3 From d3d9aca40cfccf7f3d03a3111f732c884aab8766 Mon Sep 17 00:00:00 2001 From: emersion Date: Tue, 3 Oct 2017 08:40:10 +0200 Subject: Add modifiers support in wayland backend, parse modifiers in rootston config --- backend/wayland/wl_seat.c | 4 +++ include/rootston/config.h | 1 + include/wlr/interfaces/wlr_keyboard.h | 3 +++ rootston/config.c | 48 +++++++++++++++++++++++++---------- rootston/keyboard.c | 5 ++++ types/wlr_keyboard.c | 9 +++++++ 6 files changed, 57 insertions(+), 13 deletions(-) (limited to 'include/rootston') diff --git a/backend/wayland/wl_seat.c b/backend/wayland/wl_seat.c index ba3feb8d..44ce6028 100644 --- a/backend/wayland/wl_seat.c +++ b/backend/wayland/wl_seat.c @@ -155,7 +155,11 @@ static void keyboard_handle_key(void *data, struct wl_keyboard *wl_keyboard, static void keyboard_handle_modifiers(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial, uint32_t mods_depressed, uint32_t mods_latched, uint32_t mods_locked, uint32_t group) { + struct wlr_input_device *dev = data; + assert(dev && dev->keyboard); + wlr_keyboard_update_modifiers(dev->keyboard, mods_depressed, mods_latched, + mods_locked, group); } static void keyboard_handle_repeat_info(void *data, struct wl_keyboard *wl_keyboard, diff --git a/include/rootston/config.h b/include/rootston/config.h index ef101f2d..ece11829 100644 --- a/include/rootston/config.h +++ b/include/rootston/config.h @@ -19,6 +19,7 @@ struct device_config { }; struct binding_config { + uint32_t modifiers; xkb_keysym_t *keysyms; size_t keysyms_len; char *command; diff --git a/include/wlr/interfaces/wlr_keyboard.h b/include/wlr/interfaces/wlr_keyboard.h index 78c1f753..9755267a 100644 --- a/include/wlr/interfaces/wlr_keyboard.h +++ b/include/wlr/interfaces/wlr_keyboard.h @@ -13,5 +13,8 @@ void wlr_keyboard_init(struct wlr_keyboard *keyboard, struct wlr_keyboard_impl * void wlr_keyboard_destroy(struct wlr_keyboard *keyboard); void wlr_keyboard_update_state(struct wlr_keyboard *keyboard, struct wlr_event_keyboard_key *event); +void wlr_keyboard_update_modifiers(struct wlr_keyboard *keyboard, + uint32_t mods_depressed, uint32_t mods_latched, uint32_t mods_locked, + uint32_t group); #endif diff --git a/rootston/config.c b/rootston/config.c index a80a8304..3a21aff3 100644 --- a/rootston/config.c +++ b/rootston/config.c @@ -177,28 +177,49 @@ static int config_ini_handler(void *user, const char *section, const char *name, bc->command = strdup(value); - bc->keysyms_len = 1; + size_t keysyms_len = 1; char *symnames = strdup(name); for (char *c = symnames; *c != '\0'; c++) { if (*c == '+') { *c = '\0'; - bc->keysyms_len++; + keysyms_len++; } } - bc->keysyms = calloc(1, bc->keysyms_len * sizeof(xkb_keysym_t)); + // TODO: bc->keysyms is larger than needed + bc->keysyms = calloc(1, keysyms_len * sizeof(xkb_keysym_t)); char *symname = symnames; - for (size_t i = 0; i < bc->keysyms_len; i++) { - xkb_keysym_t sym = xkb_keysym_from_name(symname, - XKB_KEYSYM_NO_FLAGS); - if (sym == XKB_KEY_NoSymbol) { - wlr_log(L_ERROR, "got unknown key binding symbol: %s", symname); - wl_list_remove(&bc->link); - free(bc->keysyms); - free(bc); - break; + for (size_t i = 0; i < keysyms_len; i++) { + if (strcmp(symname, "Shift") == 0) { + bc->modifiers |= WLR_MODIFIER_SHIFT; + } else if (strcmp(symname, "Caps") == 0) { + bc->modifiers |= WLR_MODIFIER_CAPS; + } else if (strcmp(symname, "Ctrl") == 0) { + bc->modifiers |= WLR_MODIFIER_CTRL; + } else if (strcmp(symname, "Alt") == 0) { + bc->modifiers |= WLR_MODIFIER_ALT; + } else if (strcmp(symname, "Mod2") == 0) { + bc->modifiers |= WLR_MODIFIER_MOD2; + } else if (strcmp(symname, "Mod3") == 0) { + bc->modifiers |= WLR_MODIFIER_MOD3; + } else if (strcmp(symname, "Logo") == 0) { + bc->modifiers |= WLR_MODIFIER_LOGO; + } else if (strcmp(symname, "Mod5") == 0) { + bc->modifiers |= WLR_MODIFIER_MOD5; + } else { + xkb_keysym_t sym = xkb_keysym_from_name(symname, + XKB_KEYSYM_NO_FLAGS); + if (sym == XKB_KEY_NoSymbol) { + wlr_log(L_ERROR, "got unknown key binding symbol: %s", + symname); + wl_list_remove(&bc->link); + free(bc->keysyms); + free(bc); + break; + } + bc->keysyms[bc->keysyms_len] = sym; + bc->keysyms_len++; } - bc->keysyms[i] = sym; symname += strlen(symname) + 1; } @@ -249,6 +270,7 @@ struct roots_config *parse_args(int argc, char *argv[]) { struct binding_config *bc = calloc(1, sizeof(struct binding_config)); wl_list_insert(&config->bindings, &bc->link); bc->command = strdup("exit"); + bc->modifiers = WLR_MODIFIER_LOGO; bc->keysyms_len = 2; bc->keysyms = calloc(1, bc->keysyms_len * sizeof(xkb_keysym_t)); bc->keysyms[0] = XKB_KEY_Meta_L; diff --git a/rootston/keyboard.c b/rootston/keyboard.c index 5ac6e59b..6f6fa0e8 100644 --- a/rootston/keyboard.c +++ b/rootston/keyboard.c @@ -61,9 +61,14 @@ static void keyboard_keysym_press(struct roots_keyboard *keyboard, return; } + uint32_t modifiers = wlr_keyboard_get_modifiers(keyboard->device->keyboard); struct wl_list *bindings = &keyboard->input->server->config->bindings; struct binding_config *bc; wl_list_for_each(bc, bindings, link) { + if (modifiers ^ bc->modifiers) { + continue; + } + bool ok = true; for (size_t i = 0; i < bc->keysyms_len; i++) { ssize_t j = keyboard_pressed_keysym_index(keyboard, bc->keysyms[i]); diff --git a/types/wlr_keyboard.c b/types/wlr_keyboard.c index 4d7f215c..9c111af4 100644 --- a/types/wlr_keyboard.c +++ b/types/wlr_keyboard.c @@ -30,6 +30,15 @@ void wlr_keyboard_update_state(struct wlr_keyboard *keyboard, wl_signal_emit(&keyboard->events.key, event); } +void wlr_keyboard_update_modifiers(struct wlr_keyboard *keyboard, + uint32_t mods_depressed, uint32_t mods_latched, uint32_t mods_locked, + uint32_t group) { + keyboard->modifiers.depressed = mods_depressed; + keyboard->modifiers.latched = mods_latched; + keyboard->modifiers.locked = mods_locked; + keyboard->modifiers.group = group; +} + void wlr_keyboard_init(struct wlr_keyboard *kb, struct wlr_keyboard_impl *impl) { kb->impl = impl; -- cgit v1.2.3