mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-25 06:59:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

config/output: don't change output state before commit

Browse source 
Previously, we called output_disable prior to wlr_output_commit. This
mutates Sway's output state before the output commit actually succeeds.
This results in Sway's state getting out-of-sync with wlroots'.

An alternative fix [1] was to revert the changes made by output_disable
in case of failure. This is a little complicated. Instead, this patch
makes it so Sway's internal state is never changed before a successful
wlr_output commit.

We had two output flags: enabled and configured. However enabled was set
prior to the output becoming enabled, and was used to prevent the output
event handlers (specifically, the mode handler) from calling
apply_output_config again (infinite loop).

Rename enabled to enabling and use it exclusively for this purpose.
Rename configure to enabled, because that's what it really means.

[1]: https://github.com/swaywm/sway/pull/5521

Closes: https://github.com/swaywm/sway/issues/5483
This commit is contained in:
Simon Ser 2020-07-10 18:04:45 +02:00 • committed by Brian Ashworth
parent ea3ba203cc
commit 5432f00adf
5 changed files with 23 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sway/input/cursor.c
View file

@ -99,8 +99,8 @@ struct sway_node *node_at_coords(
return NULL;
}
struct sway_output *output = wlr_output->data;
if (!output || !output->configured) {
// output is being destroyed or is being configured
if (!output || !output->enabled) {
// output is being destroyed or is being enabled
return NULL;
}
double ox = lx, oy = ly;