From 727df0a74e75982f4352f0a3e574fcf6db3372f7 Mon Sep 17 00:00:00 2001 From: Roman Gilg Date: Mon, 10 Aug 2020 19:14:28 +0200 Subject: [PATCH] xwayland: Replace need_rotate boolean with simple check on xdg-output The need_rotate variable is only used once anymore and had semantics which lead to errors in the past. In particular when negated we are dealing with a double negation. The variable gets replaced with a simple check on the xdg-output directly. Signed-off-by: Roman Gilg --- hw/xwayland/xwayland-output.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/xwayland/xwayland-output.c b/hw/xwayland/xwayland-output.c index 05e6ddcfc..d4634467d 100644 --- a/hw/xwayland/xwayland-output.c +++ b/hw/xwayland/xwayland-output.c @@ -503,17 +503,16 @@ apply_output_change(struct xwl_output *xwl_output) int mode_width, mode_height, count; int width = 0, height = 0, has_this_output = 0; RRModePtr *randr_modes; - Bool need_rotate; /* Clear out the "done" received flags */ xwl_output->wl_output_done = FALSE; xwl_output->xdg_output_done = FALSE; - /* xdg-output sends output size in compositor space. so already rotated */ - need_rotate = (xwl_output->xdg_output == NULL); - - /* We need to rotate back the logical size for the mode */ - if (need_rotate || xwl_output->rotation & (RR_Rotate_0 | RR_Rotate_180)) { + /* When we have received an xdg-output for the mode size we might need to + * rotate back the stored logical size it provided. + */ + if (xwl_output->xdg_output == NULL + || xwl_output->rotation & (RR_Rotate_0 | RR_Rotate_180)) { mode_width = xwl_output->width; mode_height = xwl_output->height; } else {