aboutsummaryrefslogtreecommitdiff
path: root/sway/input
diff options
context:
space:
mode:
authorBrian Ashworth <bosrsf04@gmail.com>2019-11-26 19:43:06 -0500
committerSimon Ser <contact@emersion.fr>2019-11-27 02:04:13 +0100
commit1a5797803a48fb71515e6bd6335d684a6cae6b6d (patch)
tree528f75121271960a271709f495a75754916ee42f /sway/input
parent90e3d25009a201363e5cbe001f344f97f7f7c579 (diff)
config: improvements to the reload validation
For the validation pass of reloading, there is no need to touch swaybg, swaynag, inputs, outputs, or seats. This drastically improves the speed of a reload by skipping over the expensive I/O configuration and handling of wayland clients. As long as the syntax is valid, the CMD_FAILURE's can be relayed during the actual reload.
Diffstat (limited to 'sway/input')
-rw-r--r--sway/input/input-manager.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
index cfd39bab..3d7f9e8b 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -359,6 +359,23 @@ void input_manager_set_focus(struct sway_node *node) {
}
}
+/**
+ * Re-translate keysyms if a change in the input config could affect them.
+ */
+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 || ic->xkb_file) {
+ // this is the first config with xkb_layout or xkb_file
+ if (ic->identifier == input_config->identifier) {
+ translate_keysyms(ic);
+ }
+
+ return;
+ }
+ }
+}
+
void input_manager_apply_input_config(struct input_config *input_config) {
struct sway_input_device *input_device = NULL;
bool wildcard = strcmp(input_config->identifier, "*") == 0;
@@ -376,6 +393,8 @@ void input_manager_apply_input_config(struct input_config *input_config) {
}
}
}
+
+ retranslate_keysyms(input_config);
}
void input_manager_reset_input(struct sway_input_device *input_device) {