From 4e5d23daa9b4d70bf8b614d5375ee1ccdab6771f Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 26 Oct 2017 19:59:32 +0200 Subject: Per-keyboard configuration --- rootston/config.c | 67 +++++++++++++++++++++++++++++++++++++++---- rootston/cursor.c | 12 ++++++-- rootston/keyboard.c | 30 +++++++++++++++---- rootston/rootston.ini.example | 2 +- 4 files changed, 97 insertions(+), 14 deletions(-) (limited to 'rootston') diff --git a/rootston/config.c b/rootston/config.c index c9c892f9..863adc60 100644 --- a/rootston/config.c +++ b/rootston/config.c @@ -149,6 +149,7 @@ void add_binding_config(struct wl_list *bindings, const char* combination, static const char *output_prefix = "output:"; static const char *device_prefix = "device:"; +static const char *keyboard_prefix = "keyboard:"; static int config_ini_handler(void *user, const char *section, const char *name, const char *value) { @@ -219,9 +220,9 @@ static int config_ini_handler(void *user, const char *section, const char *name, } } else if (strncmp(device_prefix, section, strlen(device_prefix)) == 0) { const char *device_name = section + strlen(device_prefix); + struct device_config *dc; bool found = false; - wl_list_for_each(dc, &config->devices, link) { if (strcmp(dc->name, device_name) == 0) { found = true; @@ -244,12 +245,39 @@ 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, "keyboard") == 0) { + } else if (strncmp(keyboard_prefix, section, strlen(keyboard_prefix)) == 0) { + const char *device_name = section + strlen(keyboard_prefix); + + struct keyboard_config *kc; + bool found = false; + wl_list_for_each(kc, &config->keyboards, link) { + if (strcmp(kc->name, device_name) == 0) { + found = true; + break; + } + } + + if (!found) { + kc = calloc(1, sizeof(struct keyboard_config)); + kc->name = strdup(device_name); + wl_list_insert(&config->keyboards, &kc->link); + } + if (strcmp(name, "meta-key") == 0) { - config->keyboard.meta_key = parse_modifier(value); - if (config->keyboard.meta_key == 0) { + kc->meta_key = parse_modifier(value); + if (kc->meta_key == 0) { wlr_log(L_ERROR, "got unknown meta key: %s", name); } + } else if (strcmp(name, "rules") == 0) { + kc->rules = strdup(value); + } else if (strcmp(name, "model") == 0) { + kc->model = strdup(value); + } else if (strcmp(name, "layout") == 0) { + kc->layout = strdup(value); + } else if (strcmp(name, "variant") == 0) { + kc->variant = strdup(value); + } else if (strcmp(name, "options") == 0) { + kc->options = strdup(value); } else { wlr_log(L_ERROR, "got unknown keyboard config: %s", name); } @@ -271,6 +299,7 @@ struct roots_config *parse_args(int argc, char *argv[]) { config->xwayland = true; wl_list_init(&config->outputs); wl_list_init(&config->devices); + wl_list_init(&config->keyboards); wl_list_init(&config->bindings); int c; @@ -305,10 +334,12 @@ struct roots_config *parse_args(int argc, char *argv[]) { if (result == -1) { wlr_log(L_DEBUG, "No config file found. Using sensible defaults."); - config->keyboard.meta_key = WLR_MODIFIER_LOGO; add_binding_config(&config->bindings, "Logo+Shift+E", "exit"); add_binding_config(&config->bindings, "Ctrl+q", "close"); add_binding_config(&config->bindings, "Alt+Tab", "next_window"); + struct keyboard_config *kc = calloc(1, sizeof(struct keyboard_config)); + kc->meta_key = WLR_MODIFIER_LOGO; + wl_list_insert(&config->keyboards, &kc->link); } else if (result == -2) { wlr_log(L_ERROR, "Could not allocate memory to parse config file"); exit(1); @@ -335,6 +366,17 @@ void roots_config_destroy(struct roots_config *config) { free(dc); } + struct keyboard_config *kc, *ktmp = NULL; + wl_list_for_each_safe(kc, ktmp, &config->bindings, link) { + free(kc->name); + free(kc->rules); + free(kc->model); + free(kc->layout); + free(kc->variant); + free(kc->options); + free(kc); + } + struct binding_config *bc, *btmp = NULL; wl_list_for_each_safe(bc, btmp, &config->bindings, link) { free(bc->keysyms); @@ -371,3 +413,18 @@ struct device_config *config_get_device(struct roots_config *config, return NULL; } + +struct keyboard_config *config_get_keyboard(struct roots_config *config, + struct wlr_input_device *device) { + struct keyboard_config *kc; + struct keyboard_config *default_kc = NULL; + wl_list_for_each(kc, &config->keyboards, link) { + if (strcmp(kc->name, "*") == 0) { + default_kc = kc; + } else if (strcmp(kc->name, device->name) == 0) { + return kc; + } + } + + return default_kc; +} diff --git a/rootston/cursor.c b/rootston/cursor.c index b55eab3f..0cbca9f8 100644 --- a/rootston/cursor.c +++ b/rootston/cursor.c @@ -215,8 +215,14 @@ static void handle_cursor_axis(struct wl_listener *listener, void *data) { event->orientation, event->delta); } -static bool is_meta_pressed(struct roots_input *input) { - uint32_t meta_key = input->server->config->keyboard.meta_key; +static bool is_meta_pressed(struct roots_input *input, + struct wlr_input_device *device) { + struct keyboard_config *config = config_get_keyboard(input->server->config, + device); + uint32_t meta_key = 0; + if (config != NULL) { + meta_key = config->meta_key; + } if (meta_key == 0) { return false; } @@ -241,7 +247,7 @@ static void do_cursor_button_press(struct roots_input *input, struct roots_view *view = view_at(desktop, input->cursor->x, input->cursor->y, &surface, &sx, &sy); - if (state == WLR_BUTTON_PRESSED && view && is_meta_pressed(input)) { + if (state == WLR_BUTTON_PRESSED && view && is_meta_pressed(input, device)) { set_view_focus(input, desktop, view); switch (button) { diff --git a/rootston/keyboard.c b/rootston/keyboard.c index 61604da0..008fba2d 100644 --- a/rootston/keyboard.c +++ b/rootston/keyboard.c @@ -137,13 +137,33 @@ void keyboard_add(struct wlr_input_device *device, struct roots_input *input) { wl_signal_add(&device->keyboard->events.key, &keyboard->key); wl_list_insert(&input->keyboards, &keyboard->link); + struct keyboard_config *config = config_get_keyboard(input->config, + device); + struct xkb_rule_names rules; memset(&rules, 0, sizeof(rules)); - rules.rules = getenv("XKB_DEFAULT_RULES"); - rules.model = getenv("XKB_DEFAULT_MODEL"); - rules.layout = getenv("XKB_DEFAULT_LAYOUT"); - rules.variant = getenv("XKB_DEFAULT_VARIANT"); - rules.options = getenv("XKB_DEFAULT_OPTIONS"); + if (config != NULL) { + rules.rules = config->rules; + rules.model = config->model; + rules.layout = config->layout; + rules.variant = config->variant; + rules.options = config->options; + } + if (rules.rules == NULL) { + rules.rules = getenv("XKB_DEFAULT_RULES"); + } + if (rules.model == NULL) { + rules.model = getenv("XKB_DEFAULT_MODEL"); + } + if (rules.layout == NULL) { + rules.layout = getenv("XKB_DEFAULT_LAYOUT"); + } + if (rules.variant == NULL) { + rules.variant = getenv("XKB_DEFAULT_VARIANT"); + } + if (rules.options == NULL) { + rules.options = getenv("XKB_DEFAULT_OPTIONS"); + } struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); if (context == NULL) { wlr_log(L_ERROR, "Cannot create XKB context"); diff --git a/rootston/rootston.ini.example b/rootston/rootston.ini.example index 433dc78f..63fa897c 100644 --- a/rootston/rootston.ini.example +++ b/rootston/rootston.ini.example @@ -29,7 +29,7 @@ map-to-output = VGA-1 # Restrict cursor movements for this mouse to concrete rectangle geometry = 2500x800 -[keyboard] +[keyboard:*] meta-key = Logo # Keybindings -- cgit v1.2.3 From c0c4816b132649d1ffc5435720578286d83a19ef Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 26 Oct 2017 22:38:03 +0200 Subject: Fix fallback when there are two config blocks for a keyboard --- include/rootston/config.h | 2 +- rootston/config.c | 8 +++--- rootston/cursor.c | 8 +++--- rootston/keyboard.c | 64 +++++++++++++++++++++++++++++------------------ 4 files changed, 49 insertions(+), 33 deletions(-) (limited to 'rootston') diff --git a/include/rootston/config.h b/include/rootston/config.h index 792146fb..ecbdd88b 100644 --- a/include/rootston/config.h +++ b/include/rootston/config.h @@ -73,7 +73,7 @@ struct device_config *config_get_device(struct roots_config *config, /** * Get configuration for the keyboard. If the keyboard is not configured, - * returns NULL. + * returns NULL. A NULL device returns the default config for keyboards. */ struct keyboard_config *config_get_keyboard(struct roots_config *config, struct wlr_input_device *device); diff --git a/rootston/config.c b/rootston/config.c index 863adc60..7a443151 100644 --- a/rootston/config.c +++ b/rootston/config.c @@ -417,14 +417,12 @@ struct device_config *config_get_device(struct roots_config *config, struct keyboard_config *config_get_keyboard(struct roots_config *config, struct wlr_input_device *device) { struct keyboard_config *kc; - struct keyboard_config *default_kc = NULL; wl_list_for_each(kc, &config->keyboards, link) { - if (strcmp(kc->name, "*") == 0) { - default_kc = kc; - } else if (strcmp(kc->name, device->name) == 0) { + if ((device != NULL && strcmp(kc->name, device->name) == 0) || + (device == NULL && strcmp(kc->name, "*") == 0)) { return kc; } } - return default_kc; + return NULL; } diff --git a/rootston/cursor.c b/rootston/cursor.c index 0cbca9f8..7d2548eb 100644 --- a/rootston/cursor.c +++ b/rootston/cursor.c @@ -217,10 +217,12 @@ static void handle_cursor_axis(struct wl_listener *listener, void *data) { static bool is_meta_pressed(struct roots_input *input, struct wlr_input_device *device) { - struct keyboard_config *config = config_get_keyboard(input->server->config, - device); uint32_t meta_key = 0; - if (config != NULL) { + struct keyboard_config *config; + if ((config = config_get_keyboard(input->server->config, device))) { + meta_key = config->meta_key; + } else if (!meta_key && (config = config_get_keyboard(input->server->config, + NULL))) { meta_key = config->meta_key; } if (meta_key == 0) { diff --git a/rootston/keyboard.c b/rootston/keyboard.c index 008fba2d..142e9c71 100644 --- a/rootston/keyboard.c +++ b/rootston/keyboard.c @@ -125,6 +125,28 @@ static void keyboard_key_notify(struct wl_listener *listener, void *data) { } } +static void keyboard_config_merge(struct keyboard_config *config, + struct keyboard_config *fallback) { + if (fallback == NULL) { + return; + } + if (config->rules == NULL) { + config->rules = fallback->rules; + } + if (config->model == NULL) { + config->model = fallback->model; + } + if (config->layout == NULL) { + config->layout = fallback->layout; + } + if (config->variant == NULL) { + config->variant = fallback->variant; + } + if (config->options == NULL) { + config->options = fallback->options; + } +} + void keyboard_add(struct wlr_input_device *device, struct roots_input *input) { struct roots_keyboard *keyboard = calloc(sizeof(struct roots_keyboard), 1); if (keyboard == NULL) { @@ -137,33 +159,27 @@ void keyboard_add(struct wlr_input_device *device, struct roots_input *input) { wl_signal_add(&device->keyboard->events.key, &keyboard->key); wl_list_insert(&input->keyboards, &keyboard->link); - struct keyboard_config *config = config_get_keyboard(input->config, - device); + struct keyboard_config config; + memset(&config, 0, sizeof(config)); + keyboard_config_merge(&config, config_get_keyboard(input->config, device)); + keyboard_config_merge(&config, config_get_keyboard(input->config, NULL)); + + struct keyboard_config env_config = { + .rules = getenv("XKB_DEFAULT_RULES"), + .model = getenv("XKB_DEFAULT_MODEL"), + .layout = getenv("XKB_DEFAULT_LAYOUT"), + .variant = getenv("XKB_DEFAULT_VARIANT"), + .options = getenv("XKB_DEFAULT_OPTIONS"), + }; + keyboard_config_merge(&config, &env_config); struct xkb_rule_names rules; memset(&rules, 0, sizeof(rules)); - if (config != NULL) { - rules.rules = config->rules; - rules.model = config->model; - rules.layout = config->layout; - rules.variant = config->variant; - rules.options = config->options; - } - if (rules.rules == NULL) { - rules.rules = getenv("XKB_DEFAULT_RULES"); - } - if (rules.model == NULL) { - rules.model = getenv("XKB_DEFAULT_MODEL"); - } - if (rules.layout == NULL) { - rules.layout = getenv("XKB_DEFAULT_LAYOUT"); - } - if (rules.variant == NULL) { - rules.variant = getenv("XKB_DEFAULT_VARIANT"); - } - if (rules.options == NULL) { - rules.options = getenv("XKB_DEFAULT_OPTIONS"); - } + rules.rules = config.rules; + rules.model = config.model; + rules.layout = config.layout; + rules.variant = config.variant; + rules.options = config.options; struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); if (context == NULL) { wlr_log(L_ERROR, "Cannot create XKB context"); -- cgit v1.2.3 From 882bda066402b19ac4d8b7470d7fbc63347733e7 Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 26 Oct 2017 23:02:24 +0200 Subject: Rename default keyboard section --- rootston/config.c | 76 +++++++++++++++++++++++-------------------- rootston/rootston.ini.example | 2 +- 2 files changed, 42 insertions(+), 36 deletions(-) (limited to 'rootston') diff --git a/rootston/config.c b/rootston/config.c index 7a443151..6f81170b 100644 --- a/rootston/config.c +++ b/rootston/config.c @@ -147,6 +147,43 @@ void add_binding_config(struct wl_list *bindings, const char* combination, } } +static void config_handle_keyboard(struct roots_config *config, + const char *device_name, const char *name, const char *value) { + struct keyboard_config *kc; + bool found = false; + wl_list_for_each(kc, &config->keyboards, link) { + if (strcmp(kc->name, device_name) == 0) { + found = true; + break; + } + } + + if (!found) { + kc = calloc(1, sizeof(struct keyboard_config)); + kc->name = strdup(device_name); + wl_list_insert(&config->keyboards, &kc->link); + } + + if (strcmp(name, "meta-key") == 0) { + kc->meta_key = parse_modifier(value); + if (kc->meta_key == 0) { + wlr_log(L_ERROR, "got unknown meta key: %s", name); + } + } else if (strcmp(name, "rules") == 0) { + kc->rules = strdup(value); + } else if (strcmp(name, "model") == 0) { + kc->model = strdup(value); + } else if (strcmp(name, "layout") == 0) { + kc->layout = strdup(value); + } else if (strcmp(name, "variant") == 0) { + kc->variant = strdup(value); + } else if (strcmp(name, "options") == 0) { + kc->options = strdup(value); + } else { + wlr_log(L_ERROR, "got unknown keyboard config: %s", name); + } +} + static const char *output_prefix = "output:"; static const char *device_prefix = "device:"; static const char *keyboard_prefix = "keyboard:"; @@ -245,42 +282,11 @@ 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, "keyboard") == 0) { + config_handle_keyboard(config, "", name, value); } else if (strncmp(keyboard_prefix, section, strlen(keyboard_prefix)) == 0) { const char *device_name = section + strlen(keyboard_prefix); - - struct keyboard_config *kc; - bool found = false; - wl_list_for_each(kc, &config->keyboards, link) { - if (strcmp(kc->name, device_name) == 0) { - found = true; - break; - } - } - - if (!found) { - kc = calloc(1, sizeof(struct keyboard_config)); - kc->name = strdup(device_name); - wl_list_insert(&config->keyboards, &kc->link); - } - - if (strcmp(name, "meta-key") == 0) { - kc->meta_key = parse_modifier(value); - if (kc->meta_key == 0) { - wlr_log(L_ERROR, "got unknown meta key: %s", name); - } - } else if (strcmp(name, "rules") == 0) { - kc->rules = strdup(value); - } else if (strcmp(name, "model") == 0) { - kc->model = strdup(value); - } else if (strcmp(name, "layout") == 0) { - kc->layout = strdup(value); - } else if (strcmp(name, "variant") == 0) { - kc->variant = strdup(value); - } else if (strcmp(name, "options") == 0) { - kc->options = strdup(value); - } else { - wlr_log(L_ERROR, "got unknown keyboard config: %s", name); - } + config_handle_keyboard(config, device_name, name, value); } else if (strcmp(section, "bindings") == 0) { add_binding_config(&config->bindings, name, value); } else { @@ -419,7 +425,7 @@ struct keyboard_config *config_get_keyboard(struct roots_config *config, struct keyboard_config *kc; wl_list_for_each(kc, &config->keyboards, link) { if ((device != NULL && strcmp(kc->name, device->name) == 0) || - (device == NULL && strcmp(kc->name, "*") == 0)) { + (device == NULL && strcmp(kc->name, "") == 0)) { return kc; } } diff --git a/rootston/rootston.ini.example b/rootston/rootston.ini.example index 63fa897c..433dc78f 100644 --- a/rootston/rootston.ini.example +++ b/rootston/rootston.ini.example @@ -29,7 +29,7 @@ map-to-output = VGA-1 # Restrict cursor movements for this mouse to concrete rectangle geometry = 2500x800 -[keyboard:*] +[keyboard] meta-key = Logo # Keybindings -- cgit v1.2.3