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

desktop/output: Use apply_output_configs for output mgmt

Browse source
This commit is contained in:
Kenny Levinsen 2024-03-16 01:01:56 +01:00 committed by Simon Ser
parent 98be797356
commit 3b419020a3
1 changed files with 69 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
sway/desktop/output.c
View file

@ -550,39 +550,15 @@ void handle_gamma_control_set_gamma(struct wl_listener *listener, void *data) {
wlr_output_schedule_frame(output->wlr_output); wlr_output_schedule_frame(output->wlr_output);
} }
static void output_manager_apply(struct sway_server *server, static struct output_config *output_config_for_config_head(
struct wlr_output_configuration_v1 *config, bool test_only) { struct wlr_output_configuration_head_v1 *config_head,
// TODO: perform atomic tests on the whole backend atomically struct sway_output *output) {
struct wlr_output_configuration_head_v1 *config_head;
// First disable outputs we need to disable
bool ok = true;
wl_list_for_each(config_head, &config->heads, link) {
struct wlr_output *wlr_output = config_head->state.output;
struct sway_output *output = wlr_output->data;
if (!output->enabled || config_head->state.enabled) {
continue;
}
struct output_config *oc = new_output_config(output->wlr_output->name); struct output_config *oc = new_output_config(output->wlr_output->name);
oc->enabled = false; oc->enabled = config_head->state.enabled;
if (!oc->enabled) {
if (test_only) { return oc;
ok &= test_output_config(oc, output);
} else {
oc = store_output_config(oc);
ok &= apply_output_config(oc, output);
}
} }
// Then enable outputs that need to
wl_list_for_each(config_head, &config->heads, link) {
struct wlr_output *wlr_output = config_head->state.output;
struct sway_output *output = wlr_output->data;
if (!config_head->state.enabled) {
continue;
}
struct output_config *oc = new_output_config(output->wlr_output->name);
oc->enabled = true;
if (config_head->state.mode != NULL) { if (config_head->state.mode != NULL) {
struct wlr_output_mode *mode = config_head->state.mode; struct wlr_output_mode *mode = config_head->state.mode;
oc->width = mode->width; oc->width = mode->width;
@ -599,14 +575,63 @@ static void output_manager_apply(struct sway_server *server,
oc->transform = config_head->state.transform; oc->transform = config_head->state.transform;
oc->scale = config_head->state.scale; oc->scale = config_head->state.scale;
oc->adaptive_sync = config_head->state.adaptive_sync_enabled; oc->adaptive_sync = config_head->state.adaptive_sync_enabled;
return oc;
}
if (test_only) { static void output_manager_apply(struct sway_server *server,
ok &= test_output_config(oc, output); struct wlr_output_configuration_v1 *config, bool test_only) {
size_t configs_len = wl_list_length(&root->all_outputs);
struct matched_output_config *configs = calloc(configs_len, sizeof(*configs));
if (!configs) {
return;
}
int config_idx = 0;
struct sway_output *sway_output;
wl_list_for_each(sway_output, &root->all_outputs, link) {
if (sway_output == root->fallback_output) {
configs_len--;
continue;
}
struct matched_output_config *cfg = &configs[config_idx++];
cfg->output = sway_output;
struct wlr_output_configuration_head_v1 *config_head;
wl_list_for_each(config_head, &config->heads, link) {
if (config_head->state.output == sway_output->wlr_output) {
cfg->config = output_config_for_config_head(config_head, sway_output);
break;
}
}
if (!cfg->config) {
cfg->config = find_output_config(sway_output);
}
}
bool ok = apply_output_configs(configs, configs_len, test_only);
for (size_t idx = 0; idx < configs_len; idx++) {
struct matched_output_config *cfg = &configs[idx];
// Only store new configs for successful non-test commits. Old configs,
// test-only and failed commits just get freed.
bool store_config = false;
if (!test_only && ok) {
struct wlr_output_configuration_head_v1 *config_head;
wl_list_for_each(config_head, &config->heads, link) {
if (config_head->state.output == sway_output->wlr_output) {
store_config = true;
break;
}
}
}
if (store_config) {
store_output_config(cfg->config);
} else { } else {
oc = store_output_config(oc); free_output_config(cfg->config);
ok &= apply_output_config(oc, output);
} }
} }
free(configs);
if (ok) { if (ok) {
wlr_output_configuration_v1_send_succeeded(config); wlr_output_configuration_v1_send_succeeded(config);