diff options
| author | Furkan Sahin <furkan-dev@proton.me> | 2024-09-09 20:04:17 +0200 |
|---|---|---|
| committer | Furkan Sahin <furkan-dev@proton.me> | 2024-09-09 20:04:17 +0200 |
| commit | e54056509e34d3cbf3cf72fdd88a9475804c62db (patch) | |
| tree | 7dd35fd12b270951df2f0b78f711aae9d17603bb | |
| parent | 96bba944660350f97f0bce1cf04cabac76d7cb01 (diff) | |
config/output: Rename to apply_stored_output_configs
(cherry-picked from d7a76d381bbe4321578bc3a95fbc82d76b67ef05)
| -rw-r--r-- | include/sway/config.h | 2 | ||||
| -rw-r--r-- | sway/commands/output.c | 2 | ||||
| -rw-r--r-- | sway/config.c | 2 | ||||
| -rw-r--r-- | sway/config/output.c | 2 | ||||
| -rw-r--r-- | sway/desktop/output.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/include/sway/config.h b/include/sway/config.h index 33cebe2a..3cd59722 100644 --- a/include/sway/config.h +++ b/include/sway/config.h @@ -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 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 diff --git a/sway/commands/output.c b/sway/commands/output.c index 9478e0ba..3f65b909 100644 --- a/sway/commands/output.c +++ b/sway/commands/output.c @@ -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 // workspace name is not given to re-enabled outputs. if (!config->reloading && !config->validating) { - apply_all_output_configs(); + apply_stored_output_configs(); if (background) { if (!spawn_swaybg()) { return cmd_results_new(CMD_FAILURE, diff --git a/sway/config.c b/sway/config.c index 5058efcc..5fc414a1 100644 --- a/sway/config.c +++ b/sway/config.c @@ -533,7 +533,7 @@ bool load_main_config(const char *file, bool is_active, bool validating) { } sway_switch_retrigger_bindings_for_all(); - apply_all_output_configs(); + apply_stored_output_configs(); spawn_swaybg(); config->reloading = false; diff --git a/sway/config/output.c b/sway/config/output.c index 60718bf0..84d0c6dd 100644 --- a/sway/config/output.c +++ b/sway/config/output.c @@ -1029,7 +1029,7 @@ bool apply_output_configs(struct output_config **ocs, size_t ocs_len, return ok; } -void apply_all_output_configs(void) { +void apply_stored_output_configs(void) { apply_output_configs((struct output_config **)config->output_configs->items, config->output_configs->length, false, true); } diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 1fd2f693..24ea019a 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -404,7 +404,7 @@ static int timer_modeset_handle(void *data) { wl_event_source_remove(server->delayed_modeset); server->delayed_modeset = NULL; - apply_all_output_configs(); + apply_stored_output_configs(); return 0; } |