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 /include/sway | |
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 'include/sway')
-rw-r--r-- | include/sway/commands.h | 1 | ||||
-rw-r--r-- | include/sway/config.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h index ddee2994..7ff3b651 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h | |||
@@ -257,6 +257,7 @@ sway_cmd input_cmd_scroll_method; | |||
257 | sway_cmd input_cmd_tap; | 257 | sway_cmd input_cmd_tap; |
258 | sway_cmd input_cmd_tap_button_map; | 258 | sway_cmd input_cmd_tap_button_map; |
259 | sway_cmd input_cmd_xkb_capslock; | 259 | sway_cmd input_cmd_xkb_capslock; |
260 | sway_cmd input_cmd_xkb_file; | ||
260 | sway_cmd input_cmd_xkb_layout; | 261 | sway_cmd input_cmd_xkb_layout; |
261 | sway_cmd input_cmd_xkb_model; | 262 | sway_cmd input_cmd_xkb_model; |
262 | sway_cmd input_cmd_xkb_numlock; | 263 | sway_cmd input_cmd_xkb_numlock; |
diff --git a/include/sway/config.h b/include/sway/config.h index c5558c0d..f1426453 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -138,6 +138,9 @@ struct input_config { | |||
138 | char *xkb_options; | 138 | char *xkb_options; |
139 | char *xkb_rules; | 139 | char *xkb_rules; |
140 | char *xkb_variant; | 140 | char *xkb_variant; |
141 | char *xkb_file; | ||
142 | |||
143 | bool xkb_file_is_set; | ||
141 | 144 | ||
142 | int xkb_numlock; | 145 | int xkb_numlock; |
143 | int xkb_capslock; | 146 | int xkb_capslock; |