mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

output: ignore wlr_output_state.mode/custom_mode except for client request

Browse source 
The wlr_output_state passed to the new_output signal sometimes has a
non-preferred mode set, which we were ignoring before 03be489eb9.
Ignore it again to prevent the wrong mode from being set.
This commit is contained in:
John Lindgren 2025-01-01 05:18:41 -05:00 • committed by Johan Malm
parent 96b2ad569d
commit 398ca6f267
1 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/output.c
View file

@ -291,18 +291,24 @@ add_output_to_layout(struct server *server, struct output *output)
} }
static bool static bool
output_test_auto(struct wlr_output *wlr_output, struct wlr_output_state *state) output_test_auto(struct wlr_output *wlr_output, struct wlr_output_state *state,
bool is_client_request)
{ {
wlr_log(WLR_DEBUG, "testing modes for %s", wlr_output->name); wlr_log(WLR_DEBUG, "testing modes for %s", wlr_output->name);
/* /*
* If a specific mode is requested, test only that mode. Here we * When a client requests a specific mode, test only that mode. Here
* interpret a custom_mode of all zeroes as "none/any"; this is * we interpret a custom_mode of all zeroes as "none/any"; this is
* seen e.g. with kanshi configs containing no "mode" field. In * seen e.g. with kanshi configs containing no "mode" field. In
* theory, (state->committed & WLR_OUTPUT_STATE_MODE) should be * theory, (state->committed & WLR_OUTPUT_STATE_MODE) should be zero
* zero in this case, but this is not seen in practice. * in this case, but this is not seen in practice.
*
* If the wlr_output_state did not come from a client request, then
* ignore the mode/custom_mode fields which are not meaningful.
*/ */
if (state->mode || state->custom_mode.width || state->custom_mode.height if (is_client_request && (state->mode
|| state->custom_mode.refresh) { || state->custom_mode.width
|| state->custom_mode.height
|| state->custom_mode.refresh)) {
if (state->mode) { if (state->mode) {
wlr_log(WLR_DEBUG, "testing requested mode %dx%d@%d", wlr_log(WLR_DEBUG, "testing requested mode %dx%d@%d",
state->mode->width, state->mode->height, state->mode->width, state->mode->height,
@ -374,7 +380,8 @@ configure_new_output(struct server *server, struct output *output)
wlr_log(WLR_DEBUG, "enable output %s", wlr_output->name); wlr_log(WLR_DEBUG, "enable output %s", wlr_output->name);
wlr_output_state_set_enabled(&output->pending, true); wlr_output_state_set_enabled(&output->pending, true);
if (!output_test_auto(wlr_output, &output->pending)) { if (!output_test_auto(wlr_output, &output->pending,
/* is_client_request */ false)) {
wlr_log(WLR_INFO, "mode test failed for output %s", wlr_log(WLR_INFO, "mode test failed for output %s",
wlr_output->name); wlr_output->name);
/* /*
@ -605,7 +612,8 @@ output_config_apply(struct server *server,
* Try to ensure a valid mode. Ignore failures * Try to ensure a valid mode. Ignore failures
* here and just check the commit below. * here and just check the commit below.
*/ */
(void)output_test_auto(o, os); (void)output_test_auto(o, os,
/* is_client_request */ true);
wlr_output_state_set_scale(os, head->state.scale); wlr_output_state_set_scale(os, head->state.scale);
wlr_output_state_set_transform(os, head->state.transform); wlr_output_state_set_transform(os, head->state.transform);
output_enable_adaptive_sync(output, output_enable_adaptive_sync(output,
@ -712,7 +720,8 @@ verify_output_config_v1(const struct wlr_output_configuration_v1 *config)
wlr_output_state_init(&output_state); wlr_output_state_init(&output_state);
wlr_output_head_v1_state_apply(&head->state, &output_state); wlr_output_head_v1_state_apply(&head->state, &output_state);
if (!output_test_auto(head->state.output, &output_state)) { if (!output_test_auto(head->state.output, &output_state,
/* is_client_request */ true)) {
wlr_output_state_finish(&output_state); wlr_output_state_finish(&output_state);
return false; return false;
} }