diff options
author | Ed Younis <edyounis123@gmail.com> | 2019-07-12 19:04:29 -0700 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2019-07-17 19:26:58 -0400 |
commit | eb770e88b7396e892898d6a71867d2a603e707ff (patch) | |
tree | b4f04a7316b1c25286daabee57025fb1e7307919 /sway/commands/input.c | |
parent | Add missing description for focus_on_window_activation command in docs. (diff) | |
download | sway-eb770e88b7396e892898d6a71867d2a603e707ff.tar.gz sway-eb770e88b7396e892898d6a71867d2a603e707ff.tar.zst sway-eb770e88b7396e892898d6a71867d2a603e707ff.zip |
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.c | 5 |
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[] = { | |||
28 | { "scroll_method", input_cmd_scroll_method }, | 28 | { "scroll_method", input_cmd_scroll_method }, |
29 | { "tap", input_cmd_tap }, | 29 | { "tap", input_cmd_tap }, |
30 | { "tap_button_map", input_cmd_tap_button_map }, | 30 | { "tap_button_map", input_cmd_tap_button_map }, |
31 | { "xkb_file", input_cmd_xkb_file }, | ||
31 | { "xkb_layout", input_cmd_xkb_layout }, | 32 | { "xkb_layout", input_cmd_xkb_layout }, |
32 | { "xkb_model", input_cmd_xkb_model }, | 33 | { "xkb_model", input_cmd_xkb_model }, |
33 | { "xkb_options", input_cmd_xkb_options }, | 34 | { "xkb_options", input_cmd_xkb_options }, |
@@ -48,8 +49,8 @@ static struct cmd_handler input_config_handlers[] = { | |||
48 | static void retranslate_keysyms(struct input_config *input_config) { | 49 | static void retranslate_keysyms(struct input_config *input_config) { |
49 | for (int i = 0; i < config->input_configs->length; ++i) { | 50 | for (int i = 0; i < config->input_configs->length; ++i) { |
50 | struct input_config *ic = config->input_configs->items[i]; | 51 | struct input_config *ic = config->input_configs->items[i]; |
51 | if (ic->xkb_layout) { | 52 | if (ic->xkb_layout || ic->xkb_file) { |
52 | // this is the first config with xkb_layout | 53 | // this is the first config with xkb_layout or xkb_file |
53 | if (ic->identifier == input_config->identifier) { | 54 | if (ic->identifier == input_config->identifier) { |
54 | translate_keysyms(ic); | 55 | translate_keysyms(ic); |
55 | } | 56 | } |