From 94e7165e853cfafe9bf692ca5b009856aa0dff0f Mon Sep 17 00:00:00 2001
From: Kirill Primak <vyivel@eclair.cafe>
Date: Sun, 11 Feb 2024 10:12:07 +0300
Subject: [PATCH] backend/wayland: don't request a state too early

An xdg_toplevel configure sequence ends with xdg_surface.configure.
Wait for it before relaying the request to the guest compositor.
---
 backend/wayland/output.c  | 30 +++++++++++++++++++++---------
 include/backend/wayland.h |  3 +++
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/backend/wayland/output.c b/backend/wayland/output.c
index 1e8f92cd..ff58cc37 100644
--- a/backend/wayland/output.c
+++ b/backend/wayland/output.c
@@ -744,7 +744,22 @@ static void xdg_surface_handle_configure(void *data,
 	output->configured = true;
 	xdg_surface_ack_configure(xdg_surface, serial);
 
-	// nothing else?
+	int32_t req_width = output->wlr_output.width;
+	int32_t req_height = output->wlr_output.height;
+	if (output->requested_width > 0) {
+		req_width = output->requested_width;
+		output->requested_width = 0;
+	}
+	if (output->requested_height > 0) {
+		req_height = output->requested_height;
+		output->requested_height = 0;
+	}
+
+	struct wlr_output_state state;
+	wlr_output_state_init(&state);
+	wlr_output_state_set_custom_mode(&state, req_width, req_height, 0);
+	wlr_output_send_request_state(&output->wlr_output, &state);
+	wlr_output_state_finish(&state);
 }
 
 static const struct xdg_surface_listener xdg_surface_listener = {
@@ -757,15 +772,12 @@ static void xdg_toplevel_handle_configure(void *data,
 	struct wlr_wl_output *output = data;
 	assert(output && output->xdg_toplevel == xdg_toplevel);
 
-	if (width == 0 || height == 0) {
-		return;
+	if (width > 0) {
+		output->requested_width = width;
+	}
+	if (height > 0) {
+		output->requested_height = height;
 	}
-
-	struct wlr_output_state state;
-	wlr_output_state_init(&state);
-	wlr_output_state_set_custom_mode(&state, width, height, 0);
-	wlr_output_send_request_state(&output->wlr_output, &state);
-	wlr_output_state_finish(&state);
 }
 
 static void xdg_toplevel_handle_close(void *data,
diff --git a/include/backend/wayland.h b/include/backend/wayland.h
index bfa36b31..192891b4 100644
--- a/include/backend/wayland.h
+++ b/include/backend/wayland.h
@@ -92,6 +92,9 @@ struct wlr_wl_output {
 
 	char *title;
 
+	// 0 if not requested
+	int32_t requested_width, requested_height;
+
 	bool configured;
 	uint32_t enter_serial;