commit entire output config, or fail and rollback
The wlr-output-management protocol requires that either all of the changes from an apply request be applied successfully, in which case a "succeeded" event is sent, or all of the changes are reverted and a "failed" event is sent. As written, this could partially commit changes, then fail. Test the changes first (even for an "apply" event), then commit or rollback as appropriate.
This commit is contained in:
parent
3747b3162e
commit
ab03282295
1 changed files with 8 additions and 5 deletions
13
dwl.c
13
dwl.c
|
@ -1545,11 +1545,14 @@ outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int test)
|
|||
}
|
||||
}
|
||||
|
||||
if (test) {
|
||||
ok &= wlr_output_test(wlr_output);
|
||||
wlr_output_rollback(wlr_output);
|
||||
} else
|
||||
ok &= wlr_output_commit(wlr_output);
|
||||
if (!(ok = wlr_output_test(wlr_output)))
|
||||
break;
|
||||
}
|
||||
wl_list_for_each(config_head, &config->heads, link) {
|
||||
if (ok && !test)
|
||||
wlr_output_commit(config_head->state.output);
|
||||
else
|
||||
wlr_output_rollback(config_head->state.output);
|
||||
}
|
||||
if (ok)
|
||||
wlr_output_configuration_v1_send_succeeded(config);
|
||||
|
|
Loading…
Reference in a new issue