diff options
author | Simon Zeni <simon@bl4ckb0ne.ca> | 2021-10-04 10:04:46 -0400 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2021-11-25 17:48:34 +0100 |
commit | 0cd8efe0bb669e71e9cdc30d96ae466cb583e605 (patch) | |
tree | 0cc1cdf1d76347b92376fcf9087792e1b2f69a49 /sway/desktop/output.c | |
parent | Replace wlr_headless_backend_create_with_renderer call (diff) | |
download | sway-0cd8efe0bb669e71e9cdc30d96ae466cb583e605.tar.gz sway-0cd8efe0bb669e71e9cdc30d96ae466cb583e605.tar.zst sway-0cd8efe0bb669e71e9cdc30d96ae466cb583e605.zip |
sway: replace noop_output by fallback_output
wlroots removed the support for the noop backend. Instead we rely on the
headless backend to provide the fallback output.
Diffstat (limited to 'sway/desktop/output.c')
-rw-r--r-- | sway/desktop/output.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index cd9fd3a6..ed6bc064 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -733,7 +733,7 @@ static void update_output_manager_config(struct sway_server *server) { | |||
733 | 733 | ||
734 | struct sway_output *output; | 734 | struct sway_output *output; |
735 | wl_list_for_each(output, &root->all_outputs, link) { | 735 | wl_list_for_each(output, &root->all_outputs, link) { |
736 | if (output == root->noop_output) { | 736 | if (output == root->fallback_output) { |
737 | continue; | 737 | continue; |
738 | } | 738 | } |
739 | struct wlr_output_configuration_head_v1 *config_head = | 739 | struct wlr_output_configuration_head_v1 *config_head = |
@@ -838,6 +838,10 @@ static void handle_present(struct wl_listener *listener, void *data) { | |||
838 | void handle_new_output(struct wl_listener *listener, void *data) { | 838 | void handle_new_output(struct wl_listener *listener, void *data) { |
839 | struct sway_server *server = wl_container_of(listener, server, new_output); | 839 | struct sway_server *server = wl_container_of(listener, server, new_output); |
840 | struct wlr_output *wlr_output = data; | 840 | struct wlr_output *wlr_output = data; |
841 | if (wlr_output == root->fallback_output->wlr_output) { | ||
842 | return; | ||
843 | } | ||
844 | |||
841 | sway_log(SWAY_DEBUG, "New output %p: %s (non-desktop: %d)", | 845 | sway_log(SWAY_DEBUG, "New output %p: %s (non-desktop: %d)", |
842 | wlr_output, wlr_output->name, wlr_output->non_desktop); | 846 | wlr_output, wlr_output->name, wlr_output->non_desktop); |
843 | 847 | ||