Skip to content

Commit

Permalink
config/output: Rename to apply_stored_output_configs
Browse files Browse the repository at this point in the history
  • Loading branch information
kennylevinsen authored and Nefsen402 committed Sep 10, 2024
1 parent 29b3f00 commit d7a76d3
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion include/sway/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sway/commands/output.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion sway/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sway/config/output.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion sway/desktop/output.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit d7a76d3

Please sign in to comment.