From 6f7b548589feead7c3c3ae8d619f23770fd65fb0 Mon Sep 17 00:00:00 2001 From: Tudor Brindus Date: Thu, 28 May 2020 03:36:38 -0400 Subject: [PATCH] ipc: invert output transformation when necessary After swaywm/wlroots#2023, #4996 inverted configuration transformations. For consistency, we should undo (double-apply) the inversion when communicating via IPC. Closes #5356. --- sway/ipc-json.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sway/ipc-json.c b/sway/ipc-json.c index 67f0eed7..c2e43f6e 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c @@ -68,19 +68,24 @@ static const char *ipc_json_output_transform_description(enum wl_output_transfor case WL_OUTPUT_TRANSFORM_NORMAL: return "normal"; case WL_OUTPUT_TRANSFORM_90: - return "90"; + // Sway uses clockwise transforms, while WL_OUTPUT_TRANSFORM_* describes + // anti-clockwise transforms. + return "270"; case WL_OUTPUT_TRANSFORM_180: return "180"; case WL_OUTPUT_TRANSFORM_270: - return "270"; + // Transform also inverted here. + return "90"; case WL_OUTPUT_TRANSFORM_FLIPPED: return "flipped"; case WL_OUTPUT_TRANSFORM_FLIPPED_90: - return "flipped-90"; + // Inverted. + return "flipped-270"; case WL_OUTPUT_TRANSFORM_FLIPPED_180: return "flipped-180"; case WL_OUTPUT_TRANSFORM_FLIPPED_270: - return "flipped-270"; + // Inverted. + return "flipped-90"; } return NULL; }