Fix maximize delay in xdg-shell

4 files changed, 23 insertions, 5 deletions

diff --git a/include/rootston/view.h b/include/rootston/view.h
index 1b0fb831..956ba1d3 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -27,6 +27,7 @@ struct roots_xdg_surface_v6 {
 	struct wl_listener destroy;
 	struct wl_listener request_move;
 	struct wl_listener request_resize;
+	struct wl_listener request_maximize;
 };
 
 struct roots_xwayland_surface {
diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h
index b0de41e2..bc78428b 100644
--- a/include/wlr/types/wlr_xdg_shell_v6.h
+++ b/include/wlr/types/wlr_xdg_shell_v6.h
@@ -126,6 +126,8 @@ struct wlr_xdg_surface_v6 {
 		struct wl_signal ack_configure;
 		struct wl_signal ping_timeout;
 
+		struct wl_signal request_maximize;
+		struct wl_signal request_fullscreen;
 		struct wl_signal request_minimize;
 		struct wl_signal request_move;
 		struct wl_signal request_resize;
diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c
index 45691d16..a86899be 100644
--- a/rootston/xdg_shell_v6.c
+++ b/rootston/xdg_shell_v6.c
@@ -128,9 +128,9 @@ static void handle_request_resize(struct wl_listener *listener, void *data) {
 	view_begin_resize(input, event->cursor, view, e->edges);
 }
 
-static void handle_commit(struct wl_listener *listener, void *data) {
+static void handle_request_maximize(struct wl_listener *listener, void *data) {
 	struct roots_xdg_surface_v6 *roots_xdg_surface =
-		wl_container_of(listener, roots_xdg_surface, commit);
+		wl_container_of(listener, roots_xdg_surface, request_maximize);
 	struct roots_view *view = roots_xdg_surface->view;
 	struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
 
@@ -138,9 +138,15 @@ static void handle_commit(struct wl_listener *listener, void *data) {
 		return;
 	}
 
-	if (view->maximized != surface->toplevel_state->current.maximized) {
-		view_maximize(view, surface->toplevel_state->current.maximized);
-	}
+	view_maximize(view, surface->toplevel_state->next.maximized);
+}
+
+static void handle_commit(struct wl_listener *listener, void *data) {
+	//struct roots_xdg_surface_v6 *roots_xdg_surface =
+	//	wl_container_of(listener, roots_xdg_surface, commit);
+	//struct roots_view *view = roots_xdg_surface->view;
+	//struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
+	// TODO
 }
 
 static void handle_destroy(struct wl_listener *listener, void *data) {
@@ -185,6 +191,9 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
 	roots_surface->request_resize.notify = handle_request_resize;
 	wl_signal_add(&surface->events.request_resize,
 		&roots_surface->request_resize);
+	roots_surface->request_maximize.notify = handle_request_maximize;
+	wl_signal_add(&surface->events.request_maximize,
+		&roots_surface->request_maximize);
 
 	struct roots_view *view = calloc(1, sizeof(struct roots_view));
 	if (!view) {
diff --git a/types/wlr_xdg_shell_v6.c b/types/wlr_xdg_shell_v6.c
index fc45bc17..c260fd5e 100644
--- a/types/wlr_xdg_shell_v6.c
+++ b/types/wlr_xdg_shell_v6.c
@@ -667,24 +667,28 @@ static void xdg_toplevel_protocol_set_maximized(struct wl_client *client,
 		struct wl_resource *resource) {
 	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
 	surface->toplevel_state->next.maximized = true;
+	wl_signal_emit(&surface->events.request_maximize, surface);
 }
 
 static void xdg_toplevel_protocol_unset_maximized(struct wl_client *client,
 		struct wl_resource *resource) {
 	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
 	surface->toplevel_state->next.maximized = false;
+	wl_signal_emit(&surface->events.request_maximize, surface);
 }
 
 static void xdg_toplevel_protocol_set_fullscreen(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *output_resource) {
 	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
 	surface->toplevel_state->next.fullscreen = true;
+	wl_signal_emit(&surface->events.request_fullscreen, surface);
 }
 
 static void xdg_toplevel_protocol_unset_fullscreen(struct wl_client *client,
 		struct wl_resource *resource) {
 	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
 	surface->toplevel_state->next.fullscreen = false;
+	wl_signal_emit(&surface->events.request_fullscreen, surface);
 }
 
 static void xdg_toplevel_protocol_set_minimized(struct wl_client *client,
@@ -1146,6 +1150,8 @@ static void xdg_shell_get_xdg_surface(struct wl_client *wl_client,
 	wl_list_init(&surface->configure_list);
 	wl_list_init(&surface->popups);
 
+	wl_signal_init(&surface->events.request_maximize);
+	wl_signal_init(&surface->events.request_fullscreen);
 	wl_signal_init(&surface->events.request_minimize);
 	wl_signal_init(&surface->events.request_move);
 	wl_signal_init(&surface->events.request_resize);