mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-10-31 21:47:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

config/output: Remove apply_output_config

Browse source
This commit is contained in:
Kenny Levinsen 2024-03-16 01:03:37 +01:00 committed by Simon Ser
parent 3b419020a3
commit 56e97b7d60
2 changed files with 0 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sway/config.h
View file

@ -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); 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, bool apply_output_configs(struct matched_output_config *configs,
size_t configs_len, bool test_only); size_t configs_len, bool test_only);

30
sway/config/output.c
View file

@ -568,36 +568,6 @@ static bool finalize_output_config(struct output_config *oc, struct sway_output
return true; 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) { bool test_output_config(struct output_config *oc, struct sway_output *output) {
if (output == root->fallback_output) { if (output == root->fallback_output) {
return false; return false;