Implement input_cmd_xkb_file (swaywm#3999)

Adds a new commend "xkb_file", which constructs the internal xkb_keymap from a xkb file rather than an RMLVO configuration. This allows greater flexibility when specifying xkb configurations. An xkb file can be dumped with the xkbcomp program.
edyounis · Jul 13, 2019 · 08ec244 · 08ec244
1 parent c312a10
commit 08ec244
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 8 deletions.
diff --git a/include/sway/commands.h b/include/sway/commands.h
@@ -257,6 +257,7 @@ sway_cmd input_cmd_scroll_method;
 sway_cmd input_cmd_tap;
 sway_cmd input_cmd_tap_button_map;
 sway_cmd input_cmd_xkb_capslock;
+sway_cmd input_cmd_xkb_file;
 sway_cmd input_cmd_xkb_layout;
 sway_cmd input_cmd_xkb_model;
 sway_cmd input_cmd_xkb_numlock;

diff --git a/include/sway/config.h b/include/sway/config.h
@@ -138,6 +138,7 @@ struct input_config {
 	char *xkb_options;
 	char *xkb_rules;
 	char *xkb_variant;
+	char *xkb_file;
 
 	int xkb_numlock;
 	int xkb_capslock;

diff --git a/sway/commands.c b/sway/commands.c
@@ -263,7 +263,7 @@ list_t *execute_command(char *_exec, struct sway_seat *seat,
 		struct cmd_handler *handler = find_core_handler(argv[0]);
 		if (!handler) {
 			list_add(res_list, cmd_results_new(CMD_INVALID,
-					"Unknown/invalid command '%s'", argv[0]));
+					"Unknown/invalid comma7nd '%s'", argv[0]));
 			free_argv(argc, argv);
 			goto cleanup;
 		}

diff --git a/sway/commands/input.c b/sway/commands/input.c
@@ -28,6 +28,7 @@ static struct cmd_handler input_handlers[] = {
 	{ "scroll_method", input_cmd_scroll_method },
 	{ "tap", input_cmd_tap },
 	{ "tap_button_map", input_cmd_tap_button_map },
+	{ "xkb_file", input_cmd_xkb_file },
 	{ "xkb_layout", input_cmd_xkb_layout },
 	{ "xkb_model", input_cmd_xkb_model },
 	{ "xkb_options", input_cmd_xkb_options },
@@ -48,8 +49,8 @@ static struct cmd_handler input_config_handlers[] = {
 static void retranslate_keysyms(struct input_config *input_config) {
 	for (int i = 0; i < config->input_configs->length; ++i) {
 		struct input_config *ic = config->input_configs->items[i];
-		if (ic->xkb_layout) {
-			// this is the first config with xkb_layout
+		if (ic->xkb_layout || ic->xkb_file) {
+			// this is the first config with xkb_layout or xkb_file
 			if (ic->identifier == input_config->identifier) {
 				translate_keysyms(ic);
 			}

diff --git a/sway/commands/input/xkb_file.c b/sway/commands/input/xkb_file.c
@@ -0,0 +1,22 @@
+#define _POSIX_C_SOURCE 200809L
+#include "sway/config.h"
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+#include "log.h"
+
+struct cmd_results *input_cmd_xkb_file(int argc, char **argv) {
+	struct cmd_results *error = NULL;
+	if ((error = checkarg(argc, "xkb_file", EXPECTED_EQUAL_TO, 1))) {
+		return error;
+	}
+	struct input_config *ic = config->handler_context.input_config;
+	if (!ic) {
+		return cmd_results_new(CMD_FAILURE, "No input device defined.");
+	}
+
+	ic->xkb_file = strdup(argv[0]);
+
+	sway_log(SWAY_DEBUG, "set-xkb_file for config: %s file: %s",
+			ic->identifier, ic->xkb_file);
+	return cmd_results_new(CMD_SUCCESS, NULL);
+}
diff --git a/sway/config/input.c b/sway/config/input.c
@@ -95,6 +95,10 @@ void merge_input_config(struct input_config *dst, struct input_config *src) {
 	if (src->tap_button_map != INT_MIN) {
 		dst->tap_button_map = src->tap_button_map;
 	}
+	if (src->xkb_file) {
+		free(dst->xkb_file);
+		dst->xkb_file = strdup(src->xkb_file);
+	}
 	if (src->xkb_layout) {
 		free(dst->xkb_layout);
 		dst->xkb_layout = strdup(src->xkb_layout);
@@ -307,6 +311,7 @@ void free_input_config(struct input_config *ic) {
 		return;
 	}
 	free(ic->identifier);
+	free(ic->xkb_file);
 	free(ic->xkb_layout);
 	free(ic->xkb_model);
 	free(ic->xkb_options);

diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
@@ -534,18 +534,32 @@ static void handle_xkb_context_log(struct xkb_context *context,
 
 struct xkb_keymap *sway_keyboard_compile_keymap(struct input_config *ic,
 		char **error) {
-	struct xkb_rule_names rules = {0};
-	if (ic) {
-		input_config_fill_rule_names(ic, &rules);
-	}
-
 	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
 	if (!sway_assert(context, "cannot create XKB context")) {
 		return NULL;
 	}
 	xkb_context_set_user_data(context, error);
 	xkb_context_set_log_fn(context, handle_xkb_context_log);
 
+	if (ic->xkb_file) {
+		FILE *keymap_file = fopen(ic->xkb_file, "r");
+		if (!sway_assert(keymap_file, "cannot open XKB file")) {
+			return NULL;
+		}
+		struct xkb_keymap *keymap =
+			xkb_keymap_new_from_file(context, keymap_file,
+				XKB_KEYMAP_FORMAT_TEXT_V1,
+				XKB_KEYMAP_COMPILE_NO_FLAGS);
+		xkb_context_set_user_data(context, NULL);
+		xkb_context_unref(context);
+		return keymap;
+	}
+
+	struct xkb_rule_names rules = {0};
+	if (ic) {
+		input_config_fill_rule_names(ic, &rules);
+	}
+
 	struct xkb_keymap *keymap =
 		xkb_keymap_new_from_names(context, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
 	xkb_context_set_user_data(context, NULL);

diff --git a/sway/meson.build b/sway/meson.build
@@ -160,6 +160,7 @@ sway_sources = files(
 	'commands/input/tap.c',
 	'commands/input/tap_button_map.c',
 	'commands/input/xkb_capslock.c',
+	'commands/input/xkb_file.c',
 	'commands/input/xkb_layout.c',
 	'commands/input/xkb_model.c',
 	'commands/input/xkb_numlock.c',

diff --git a/sway/sway-input.5.scd b/sway/sway-input.5.scd
@@ -44,6 +44,11 @@ on top of the existing device configurations.
 For more information on these xkb configuration options, see
 *xkeyboard-config*(7).
 
+*input* <identifier> xkb_file <file_name>
+	Sets all xkb configurations from a complete .xkb file. This file can be
+	dumped from xkbcomp -xkb. This setting overrides xkb_layout, xkb_model,
+	xkb_options, xkb_rules, and xkb_variant settings.
+
 *input* <identifier> xkb_layout <layout_name>
 	Sets the layout of the keyboard like _us_ or _de_.