aboutsummaryrefslogtreecommitdiffstats
path: root/include/sway/output.h
diff options
context:
space:
mode:
authorLibravatar Simon Ser <contact@emersion.fr>2019-10-26 14:00:37 +0200
committerLibravatar Drew DeVault <sir@cmpwn.com>2019-10-27 10:51:02 -0400
commitec14a00e8c6751d0b73ca0ad5f756e4165092b87 (patch)
tree36a4a947b4fb9d89fec848a2e269304ded139621 /include/sway/output.h
parentFix apply_output_config return value when enabling output (diff)
downloadsway-ec14a00e8c6751d0b73ca0ad5f756e4165092b87.tar.gz
sway-ec14a00e8c6751d0b73ca0ad5f756e4165092b87.tar.zst
sway-ec14a00e8c6751d0b73ca0ad5f756e4165092b87.zip
Fix segfault in wlr_output_manager_v1_set_configuration
Calling wlr_output_manager_v1_set_configuration with an enabled output and a NULL mode is incorrect if the output doesn't support modes. When DPMS'ing an output, wlr_output_enable(output, false) is called. This de-allocates the CRTC and sets wlr_output.current_mode to NULL. Because we mark DPMS'ed outputs as enabled, we also need to provide a correct output mode. Add a field to sway_output to hold the current mode. Closes: https://github.com/swaywm/wlroots/issues/1867
Diffstat (limited to 'include/sway/output.h')
-rw-r--r--include/sway/output.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sway/output.h b/include/sway/output.h
index c52b3094..7d7057e1 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -32,6 +32,8 @@ struct sway_output {
32 int lx, ly; // layout coords 32 int lx, ly; // layout coords
33 int width, height; // transformed buffer size 33 int width, height; // transformed buffer size
34 enum wl_output_subpixel detected_subpixel; 34 enum wl_output_subpixel detected_subpixel;
35 // last applied mode when the output is DPMS'ed
36 struct wlr_output_mode *current_mode;
35 37
36 bool enabled, configured; 38 bool enabled, configured;
37 list_t *workspaces; 39 list_t *workspaces;