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

Use apply_all_output_configs to light up outputs

Browse source 
This allows us to test and if necessary degrade the entire backend
configuration to light everything up.
This commit is contained in:
Kenny Levinsen 2024-03-16 01:00:46 +01:00 committed by Simon Ser
parent 923f642b70
commit 98be797356
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/commands/output.c
View file

@ -103,13 +103,13 @@ struct cmd_results *cmd_output(int argc, char **argv) {
bool background = output->background; bool background = output->background;
output = store_output_config(output); store_output_config(output);
// If reloading, the output configs will be applied after reading the // If reloading, the output configs will be applied after reading the
// entire config and before the deferred commands so that an auto generated // entire config and before the deferred commands so that an auto generated
// workspace name is not given to re-enabled outputs. // workspace name is not given to re-enabled outputs.
if (!config->reloading && !config->validating) { if (!config->reloading && !config->validating) {
apply_output_config_to_outputs(output); apply_all_output_configs();
if (background) { if (background) {
if (!spawn_swaybg()) { if (!spawn_swaybg()) {
return cmd_results_new(CMD_FAILURE, return cmd_results_new(CMD_FAILURE,

8
sway/desktop/output.c
View file

@ -521,9 +521,7 @@ void handle_new_output(struct wl_listener *listener, void *data) {
sway_session_lock_add_output(server->session_lock.lock, output); sway_session_lock_add_output(server->session_lock.lock, output);
} }
struct output_config *oc = find_output_config(output); apply_all_output_configs();
apply_output_config(oc, output);
free_output_config(oc);
transaction_commit_dirty(); transaction_commit_dirty();
@ -652,6 +650,6 @@ void handle_output_power_manager_set_mode(struct wl_listener *listener,
oc->power = 1; oc->power = 1;
break; break;
} }
oc = store_output_config(oc); store_output_config(oc);
apply_output_config(oc, output); apply_all_output_configs();
} }