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.
This commit is contained in:
Brian Ashworth 2019-11-26 19:43:06 -05:00 committed by Simon Ser
parent 90e3d25009
commit 1a5797803a
3 changed files with 37 additions and 27 deletions

View File

@ -44,23 +44,6 @@ static struct cmd_handler input_config_handlers[] = {
{ "xkb_numlock", input_cmd_xkb_numlock }, { "xkb_numlock", input_cmd_xkb_numlock },
}; };
/**
* 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;
}
}
}
struct cmd_results *cmd_input(int argc, char **argv) { struct cmd_results *cmd_input(int argc, char **argv) {
struct cmd_results *error = NULL; struct cmd_results *error = NULL;
if ((error = checkarg(argc, "input", EXPECTED_AT_LEAST, 2))) { if ((error = checkarg(argc, "input", EXPECTED_AT_LEAST, 2))) {
@ -106,8 +89,9 @@ struct cmd_results *cmd_input(int argc, char **argv) {
return res; return res;
} }
input_manager_apply_input_config(ic); if (!config->reloading) {
retranslate_keysyms(ic); input_manager_apply_input_config(ic);
}
} else { } else {
free_input_config(config->handler_context.input_config); free_input_config(config->handler_context.input_config);
} }

View File

@ -447,15 +447,17 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
old_config->xwayland ? "enabled" : "disabled"); old_config->xwayland ? "enabled" : "disabled");
config->xwayland = old_config->xwayland; config->xwayland = old_config->xwayland;
if (old_config->swaybg_client != NULL) { if (!config->validating) {
wl_client_destroy(old_config->swaybg_client); if (old_config->swaybg_client != NULL) {
} wl_client_destroy(old_config->swaybg_client);
}
if (old_config->swaynag_config_errors.client != NULL) { if (old_config->swaynag_config_errors.client != NULL) {
wl_client_destroy(old_config->swaynag_config_errors.client); wl_client_destroy(old_config->swaynag_config_errors.client);
} }
input_manager_reset_all_inputs(); input_manager_reset_all_inputs();
}
} }
config->current_config_path = path; config->current_config_path = path;
@ -520,8 +522,13 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
return success; return success;
} }
if (is_active) { if (is_active && !validating) {
input_manager_verify_fallback_seat(); input_manager_verify_fallback_seat();
for (int i = 0; i < config->input_configs->length; i++) {
input_manager_apply_input_config(config->input_configs->items[i]);
}
for (int i = 0; i < config->seat_configs->length; i++) { for (int i = 0; i < config->seat_configs->length; i++) {
input_manager_apply_seat_config(config->seat_configs->items[i]); input_manager_apply_seat_config(config->seat_configs->items[i]);
} }

View File

@ -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) { void input_manager_apply_input_config(struct input_config *input_config) {
struct sway_input_device *input_device = NULL; struct sway_input_device *input_device = NULL;
bool wildcard = strcmp(input_config->identifier, "*") == 0; 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) { void input_manager_reset_input(struct sway_input_device *input_device) {