mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-24 06:46:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix segfault in wlr_output_manager_v1_set_configuration

Browse source 
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
This commit is contained in:
Simon Ser 2019-10-26 14:00:37 +02:00 • committed by Drew DeVault
parent 58a40ce07b
commit ec14a00e8c
4 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sway/desktop/output.c
View file

@ -662,6 +662,7 @@ static void update_output_manager_config(struct sway_server *server) {
root->output_layout, output->wlr_output);
// We mark the output enabled even if it is switched off by DPMS
config_head->state.enabled = output->enabled;
config_head->state.mode = output->current_mode;
if (output_box) {
config_head->state.x = output_box->x;
config_head->state.y = output_box->y;