mirror of
https://github.com/swaywm/sway.git
synced 2024-11-21 15:31:28 +00:00
config/output: Rename to apply_stored_output_configs
This commit is contained in:
parent
29b3f00e6f
commit
d7a76d381b
|
@ -688,7 +688,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
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -1012,7 +1012,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);
|
||||
}
|
||||
|
|
|
@ -386,7 +386,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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue