mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-25 01:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

config/output: Split apply_output_config

Browse source 
Applying an output config has two stages: Atomic application of
wlr_output_state, and applicaiton of non-atomic state like output
layout.

Split the latter out into finalize_output_config for use in a later
commit.
This commit is contained in:
Kenny Levinsen 2024-03-16 00:37:06 +01:00 committed by Simon Ser
parent 125c74338a
commit e2f3ebad8c
1 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
sway/config/output.c
View file

@ -503,25 +503,12 @@ static void queue_output_config(struct output_config *oc,
} }
} }
bool apply_output_config(struct output_config *oc, struct sway_output *output) { static bool finalize_output_config(struct output_config *oc, struct sway_output *output) {
if (output == root->fallback_output) { if (output == root->fallback_output) {
return false; return false;
} }
struct wlr_output *wlr_output = output->wlr_output; struct wlr_output *wlr_output = output->wlr_output;
struct wlr_output_state pending = {0};
queue_output_config(oc, output, &pending);
sway_log(SWAY_DEBUG, "Committing output %s", wlr_output->name);
if (!wlr_output_commit_state(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", wlr_output->name);
return false;
}
if (oc && !oc->enabled) { if (oc && !oc->enabled) {
sway_log(SWAY_DEBUG, "Disabling output %s", oc->name); sway_log(SWAY_DEBUG, "Disabling output %s", oc->name);
if (output->enabled) { if (output->enabled) {
@ -577,6 +564,30 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
output->max_render_time = oc->max_render_time; output->max_render_time = oc->max_render_time;
} }
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 // Reconfigure all devices, since input config may have been applied before
// this output came online, and some config items (like map_to_output) are // this output came online, and some config items (like map_to_output) are
// dependent on an output being present. // dependent on an output being present.