diff options
author | Simon Ser <contact@emersion.fr> | 2020-07-10 18:04:45 +0200 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2020-07-15 19:27:12 +0200 |
commit | d5f5885c941d9f74f131734b253133108c759e20 (patch) | |
tree | 59b5e3e01b63e7a8a8d5c794f776dc24913565b5 /sway/input/cursor.c | |
parent | Reload command now matches i3's implementation (diff) | |
download | sway-d5f5885c941d9f74f131734b253133108c759e20.tar.gz sway-d5f5885c941d9f74f131734b253133108c759e20.tar.zst sway-d5f5885c941d9f74f131734b253133108c759e20.zip |
config/output: don't change output state before commit
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
(cherry picked from commit 5432f00adfdd8375fb422ad9033253d17f04efc7)
Diffstat (limited to 'sway/input/cursor.c')
-rw-r--r-- | sway/input/cursor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index d10ba444..0d5b076b 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c | |||
@@ -99,8 +99,8 @@ struct sway_node *node_at_coords( | |||
99 | return NULL; | 99 | return NULL; |
100 | } | 100 | } |
101 | struct sway_output *output = wlr_output->data; | 101 | struct sway_output *output = wlr_output->data; |
102 | if (!output || !output->configured) { | 102 | if (!output || !output->enabled) { |
103 | // output is being destroyed or is being configured | 103 | // output is being destroyed or is being enabled |
104 | return NULL; | 104 | return NULL; |
105 | } | 105 | } |
106 | double ox = lx, oy = ly; | 106 | double ox = lx, oy = ly; |