aboutsummaryrefslogtreecommitdiff
path: root/rootston
diff options
context:
space:
mode:
Diffstat (limited to 'rootston')
-rw-r--r--rootston/config.c67
-rw-r--r--rootston/cursor.c12
-rw-r--r--rootston/keyboard.c30
-rw-r--r--rootston/rootston.ini.example2
4 files changed, 97 insertions, 14 deletions
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
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-22 15:36:27 +0000