Fix reload freeze when not modsetting current mode

This fixes the issue of the display freezing on reload with
wlroots#1545.

On master, all output configs are applied on reload. This may cause an
output to have its config applied up to three times, instead of just
once. The three cases are: output name, output identifier, and wildcard.
Not only is this inefficient, but it can cause swaybg to be spawned and
immediately killed.

However, swaybg requires two roundtrips of wl_display (to obtain needed
globals) before it enters its normal event loop. Modesetting will
roundtrip the wl_display. Without modesetting, waitpid for killing
swaybg could block infinitely due to swaybg being blocked by
wl_display_roundtrip.

This only configured an output once. It either uses the wildcard config
or creates an empty wildcard config and applies that. This also fixes a
bug where an output would not be reset when there is no output config to
apply to it.

1 files changed, 2 insertions, 3 deletions

diff --git a/sway/config.c b/sway/config.c
index cd2d18a2..206ca95c 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -471,9 +471,8 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
         }
 
         if (is_active) {
-                for (int i = 0; i < config->output_configs->length; i++) {
-                        apply_output_config_to_outputs(config->output_configs->items[i]);
-                }
+                reset_outputs();
+
                 config->reloading = false;
                 if (config->swaynag_config_errors.pid > 0) {
                         swaynag_show(&config->swaynag_config_errors);