diff options
author | Simon Ser <contact@emersion.fr> | 2020-02-11 14:17:33 +0100 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2020-02-11 20:52:02 -0500 |
commit | f5fa0c7124dde3438a22550aae017f824d20c93b (patch) | |
tree | 4da13f1062a73c8b6db9c31f795fc31df3379fe3 /include | |
parent | Call apply_output_config instead of output_enable (diff) | |
download | sway-f5fa0c7124dde3438a22550aae017f824d20c93b.tar.gz sway-f5fa0c7124dde3438a22550aae017f824d20c93b.tar.zst sway-f5fa0c7124dde3438a22550aae017f824d20c93b.zip |
Stop calling apply_output_config from output_enable
The only output_enable caller is now apply_output_config. Stop calling
apply_output_config from output_enable to simplify the code and avoid
the back-and-forth between these two functions.
output_enable is now the symmetric of output_disable: it just marks the
output as enabled and performs bookkeeping (e.g. creating teh default
workspace). It is called from apply_output_config after the output
commit, so that it can read the current output state and act
accordingly.
This change also allows us to avoid an extraneous wlr_output_commit.
References: https://github.com/swaywm/sway/issues/4921
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/output.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sway/output.h b/include/sway/output.h index b1c74258..53e77420 100644 --- a/include/sway/output.h +++ b/include/sway/output.h | |||
@@ -101,7 +101,7 @@ struct sway_output *all_output_by_name_or_id(const char *name_or_id); | |||
101 | 101 | ||
102 | void output_sort_workspaces(struct sway_output *output); | 102 | void output_sort_workspaces(struct sway_output *output); |
103 | 103 | ||
104 | bool output_enable(struct sway_output *output, struct output_config *oc); | 104 | void output_enable(struct sway_output *output); |
105 | 105 | ||
106 | void output_disable(struct sway_output *output); | 106 | void output_disable(struct sway_output *output); |
107 | 107 | ||