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

config/output: Rename to apply_stored_output_configs

Browse source 
(cherry-picked from d7a76d381b)
This commit is contained in:
Kenny Levinsen 2024-09-09 20:04:17 +02:00 committed by Simon Ser
parent a9c295fd67
commit 5686be82c6
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sway/config.h
View file

@ -689,7 +689,7 @@ struct output_config *new_output_config(const char *name);
bool apply_output_configs(struct output_config **ocs, size_t ocs_len, bool apply_output_configs(struct output_config **ocs, size_t ocs_len,
bool test_only, bool degrade_to_off); bool test_only, bool degrade_to_off);
void apply_all_output_configs(void); void apply_stored_output_configs(void);
/** /**
* store_output_config stores a new output config. An output may be matched by * store_output_config stores a new output config. An output may be matched by

2
sway/commands/output.c
View file

@ -111,7 +111,7 @@ struct cmd_results *cmd_output(int argc, char **argv) {
// 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_all_output_configs(); apply_stored_output_configs();
if (background) { if (background) {
if (!spawn_swaybg()) { if (!spawn_swaybg()) {
return cmd_results_new(CMD_FAILURE, return cmd_results_new(CMD_FAILURE,

2
sway/config.c
View file

@ -533,7 +533,7 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
} }
sway_switch_retrigger_bindings_for_all(); sway_switch_retrigger_bindings_for_all();
apply_all_output_configs(); apply_stored_output_configs();
spawn_swaybg(); spawn_swaybg();
config->reloading = false; config->reloading = false;

2
sway/config/output.c
View file

@ -1029,7 +1029,7 @@ bool apply_output_configs(struct output_config **ocs, size_t ocs_len,
return ok; return ok;
} }
void apply_all_output_configs(void) { void apply_stored_output_configs(void) {
apply_output_configs((struct output_config **)config->output_configs->items, apply_output_configs((struct output_config **)config->output_configs->items,
config->output_configs->length, false, true); config->output_configs->length, false, true);
} }

2
sway/desktop/output.c
View file

@ -404,7 +404,7 @@ static int timer_modeset_handle(void *data) {
wl_event_source_remove(server->delayed_modeset); wl_event_source_remove(server->delayed_modeset);
server->delayed_modeset = NULL; server->delayed_modeset = NULL;
apply_all_output_configs(); apply_stored_output_configs();
return 0; return 0;
} }