summaryrefslogtreecommitdiff
path: root/sway/commands/input.c
diff options
context:
space:
mode:
authorEd Younis <[email protected]>2019-07-12 19:04:29 -0700
committerBrian Ashworth <[email protected]>2019-07-17 19:26:58 -0400
commiteb770e88b7396e892898d6a71867d2a603e707ff (patch)
treeb4f04a7316b1c25286daabee57025fb1e7307919 /sway/commands/input.c
parent3716c53d358fce7503ed0f59fcb5622c5e1a5a8f (diff)
Implement input_cmd_xkb_file (#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.
Diffstat (limited to 'sway/commands/input.c')
-rw-r--r--sway/commands/input.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sway/commands/input.c b/sway/commands/input.c
index 588ef2d5..2289ede5 100644
--- 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);
}