diff options
author | emersion <contact@emersion.fr> | 2019-01-09 10:01:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-09 10:01:17 +0100 |
commit | d06782c5e71fb1a6229c1add16bae0dbf919c5c1 (patch) | |
tree | 7a6af7be87d049433b56ea3d0f12e1b1c11611be | |
parent | Merge pull request #3390 from RedSoxFan/execute-seat (diff) | |
parent | reload: apply seat cfgs after reading entire cfg (diff) | |
download | sway-d06782c5e71fb1a6229c1add16bae0dbf919c5c1.tar.gz sway-d06782c5e71fb1a6229c1add16bae0dbf919c5c1.tar.zst sway-d06782c5e71fb1a6229c1add16bae0dbf919c5c1.zip |
Merge pull request #3386 from RedSoxFan/seat-reload-wait
reload: apply seat cfgs after reading entire cfg
-rw-r--r-- | sway/commands/seat.c | 4 | ||||
-rw-r--r-- | sway/config.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/sway/commands/seat.c b/sway/commands/seat.c index 3e7ffed9..b8db862b 100644 --- a/sway/commands/seat.c +++ b/sway/commands/seat.c | |||
@@ -35,7 +35,9 @@ struct cmd_results *cmd_seat(int argc, char **argv) { | |||
35 | 35 | ||
36 | struct seat_config *sc = | 36 | struct seat_config *sc = |
37 | store_seat_config(config->handler_context.seat_config); | 37 | store_seat_config(config->handler_context.seat_config); |
38 | input_manager_apply_seat_config(sc); | 38 | if (!config->reading) { |
39 | input_manager_apply_seat_config(sc); | ||
40 | } | ||
39 | 41 | ||
40 | config->handler_context.seat_config = NULL; | 42 | config->handler_context.seat_config = NULL; |
41 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 43 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
diff --git a/sway/config.c b/sway/config.c index 8a0b293c..dfbe4cb9 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -463,7 +463,11 @@ bool load_main_config(const char *file, bool is_active, bool validating) { | |||
463 | if (config->swaynag_config_errors.pid > 0) { | 463 | if (config->swaynag_config_errors.pid > 0) { |
464 | swaynag_show(&config->swaynag_config_errors); | 464 | swaynag_show(&config->swaynag_config_errors); |
465 | } | 465 | } |
466 | |||
466 | input_manager_verify_fallback_seat(); | 467 | input_manager_verify_fallback_seat(); |
468 | for (int i = 0; i < config->seat_configs->length; i++) { | ||
469 | input_manager_apply_seat_config(config->seat_configs->items[i]); | ||
470 | } | ||
467 | } | 471 | } |
468 | 472 | ||
469 | if (old_config) { | 473 | if (old_config) { |