Merge pull request #341 from emersion/per-keyboard-config

Per-keyboard configuration

include/rootston/config.h

@@ -26,6 +26,17 @@ struct binding_config {
 	struct wl_list link;
 };
 
+struct keyboard_config {
+	char *name;
+	uint32_t meta_key;
+	char *rules;
+	char *model;
+	char *layout;
+	char *variant;
+	char *options;
+	struct wl_list link;
+};
+
 struct roots_config {
 	bool xwayland;
 	// TODO: Multiple cursors, multiseat
@@ -34,13 +45,10 @@ struct roots_config {
 		struct wlr_box *mapped_box;
 	} cursor;
 
-	struct {
-		uint32_t meta_key;
-	} keyboard;
-
 	struct wl_list outputs;
 	struct wl_list devices;
 	struct wl_list bindings;
+	struct wl_list keyboards;
 	char *config_path;
 	char *startup_cmd;
 };
@@ -54,13 +62,20 @@ void roots_config_destroy(struct roots_config *config);
  * NULL.
  */
 struct output_config *config_get_output(struct roots_config *config,
-		struct wlr_output *output);
+	struct wlr_output *output);
 
 /**
  * Get configuration for the device. If the device is not configured, returns
  * NULL.
  */
 struct device_config *config_get_device(struct roots_config *config,
-		struct wlr_input_device *device);
+	struct wlr_input_device *device);
+
+/**
+ * Get configuration for the keyboard. If the keyboard is not configured,
+ * 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);
 
 #endif

rootston/config.c

@@ -147,8 +147,46 @@ 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:";
 
 static int config_ini_handler(void *user, const char *section, const char *name,
 		const char *value) {
@@ -219,9 +257,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;
@@ -245,14 +283,10 @@ static int config_ini_handler(void *user, const char *section, const char *name,
 			wlr_log(L_ERROR, "got unknown device config: %s", name);
 		}
 	} else if (strcmp(section, "keyboard") == 0) {
-		if (strcmp(name, "meta-key") == 0) {
+		config_handle_keyboard(config, "", name, value);
-			config->keyboard.meta_key = parse_modifier(value);
+	} else if (strncmp(keyboard_prefix, section, strlen(keyboard_prefix)) == 0) {
-			if (config->keyboard.meta_key == 0) {
+		const char *device_name = section + strlen(keyboard_prefix);
-				wlr_log(L_ERROR, "got unknown meta key: %s", name);
+		config_handle_keyboard(config, device_name, name, value);
-			}
-		} else {
-			wlr_log(L_ERROR, "got unknown keyboard config: %s", name);
-		}
 	} else if (strcmp(section, "bindings") == 0) {
 		add_binding_config(&config->bindings, name, value);
 	} else {
@@ -271,6 +305,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 +340,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 +372,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 +419,16 @@ 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;
+	wl_list_for_each(kc, &config->keyboards, link) {
+		if ((device != NULL && strcmp(kc->name, device->name) == 0) ||
+				(device == NULL && strcmp(kc->name, "") == 0)) {
+			return kc;
+		}
+	}
+
+	return NULL;
+}

rootston/cursor.c

@@ -215,8 +215,16 @@ static void handle_cursor_axis(struct wl_listener *listener, void *data) {
 		event->orientation, event->delta);
 }
 
-static bool is_meta_pressed(struct roots_input *input) {
+static bool is_meta_pressed(struct roots_input *input,
-	uint32_t meta_key = input->server->config->keyboard.meta_key;
+		struct wlr_input_device *device) {
+	uint32_t meta_key = 0;
+	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) {
 		return false;
 	}
@@ -241,7 +249,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) {

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,13 +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;
+	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));
-	rules.rules = getenv("XKB_DEFAULT_RULES");
+	rules.rules = config.rules;
-	rules.model = getenv("XKB_DEFAULT_MODEL");
+	rules.model = config.model;
-	rules.layout = getenv("XKB_DEFAULT_LAYOUT");
+	rules.layout = config.layout;
-	rules.variant = getenv("XKB_DEFAULT_VARIANT");
+	rules.variant = config.variant;
-	rules.options = getenv("XKB_DEFAULT_OPTIONS");
+	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");