aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenny Levinsen <kl@kl.wtf>2024-03-16 01:03:37 +0100
committerSimon Ser <contact@emersion.fr>2024-03-28 10:45:20 +0100
commit56e97b7d60e3723f79fd972061191117bf544f08 (patch)
tree4c698e533d50e056bbb57e30fcc6fcc161a09f02
parent3b419020a32f4f8385e49d2137ceb4d9b8262176 (diff)
config/output: Remove apply_output_config
-rw-r--r--include/sway/config.h2
-rw-r--r--sway/config/output.c30
2 files changed, 0 insertions, 32 deletions
diff --git a/include/sway/config.h b/include/sway/config.h
index eff7cfbb..69b14446 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -690,8 +690,6 @@ struct output_config *new_output_config(const char *name);
void merge_output_config(struct output_config *dst, struct output_config *src);
-bool apply_output_config(struct output_config *oc, struct sway_output *output);
-
bool apply_output_configs(struct matched_output_config *configs,
size_t configs_len, bool test_only);
diff --git a/sway/config/output.c b/sway/config/output.c
index 5bf5bed5..cb12683d 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -568,36 +568,6 @@ static bool finalize_output_config(struct output_config *oc, struct sway_output
return true;
}
-bool apply_output_config(struct output_config *oc, struct sway_output *output) {
- if (output == root->fallback_output) {
- return false;
- }
-
- struct wlr_output_state pending = {0};
- queue_output_config(oc, output, &pending);
-
- sway_log(SWAY_DEBUG, "Committing output %s", output->wlr_output->name);
- if (!wlr_output_commit_state(output->wlr_output, &pending)) {
- // Failed to commit output changes, maybe the output is missing a CRTC.
- // Leave the output disabled for now and try again when the output gets
- // the mode we asked for.
- sway_log(SWAY_ERROR, "Failed to commit output %s", output->wlr_output->name);
- return false;
- }
-
- if (!finalize_output_config(oc, output)) {
- return false;
- }
-
- // Reconfigure all devices, since input config may have been applied before
- // this output came online, and some config items (like map_to_output) are
- // dependent on an output being present.
- input_manager_configure_all_input_mappings();
- // Reconfigure the cursor images, since the scale may have changed.
- input_manager_configure_xcursor();
- return true;
-}
-
bool test_output_config(struct output_config *oc, struct sway_output *output) {
if (output == root->fallback_output) {
return false;