mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-29 16:36:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

reload: apply seat cfgs after reading entire cfg

Browse source 
Wait until all seat configs have been read before applying them on
reload. This prevents unnecessary attachment/detachment of input
devices and therefore creation/destruction of seat devices as
individual lines are read.
This commit is contained in:
Brian Ashworth 2019-01-09 00:57:23 -05:00
parent da8f24de1d
commit f33969358c
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/commands/seat.c
View file

@ -35,7 +35,9 @@ struct cmd_results *cmd_seat(int argc, char **argv) {
struct seat_config *sc =
store_seat_config(config->handler_context.seat_config);
input_manager_apply_seat_config(sc);
if (!config->reading) {
input_manager_apply_seat_config(sc);
}
config->handler_context.seat_config = NULL;
return cmd_results_new(CMD_SUCCESS, NULL, NULL);

4
sway/config.c
View file

@ -463,7 +463,11 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
if (config->swaynag_config_errors.pid > 0) {
swaynag_show(&config->swaynag_config_errors);
}
input_manager_verify_fallback_seat();
for (int i = 0; i < config->seat_configs->length; i++) {
input_manager_apply_seat_config(config->seat_configs->items[i]);
}
}
if (old_config) {