From f5fa0c7124dde3438a22550aae017f824d20c93b Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Tue, 11 Feb 2020 14:17:33 +0100 Subject: 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 --- include/sway/output.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/sway') 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); void output_sort_workspaces(struct sway_output *output); -bool output_enable(struct sway_output *output, struct output_config *oc); +void output_enable(struct sway_output *output); void output_disable(struct sway_output *output); -- cgit v1.2.3-54-g00ecf