don't use fullscreen event in fullscreennotify()

2 files changed, 14 insertions, 3 deletions

diff --git a/client.h b/client.h
index 56e3089..f955688 100644
--- a/client.h
+++ b/client.h
@@ -96,6 +96,16 @@ client_is_float_type(Client *c)
 }
 
 static inline int
+client_wants_fullscreen(Client *c)
+{
+#ifdef XWAYLAND
+	if (client_is_x11(c))
+		return c->surface.xwayland->fullscreen;
+#endif
+	return c->surface.xdg->toplevel->requested.fullscreen;
+}
+
+static inline int
 client_is_unmanaged(Client *c)
 {
 #ifdef XWAYLAND
diff --git a/dwl.c b/dwl.c
index f99fc9a..612f3d7 100644
--- a/dwl.c
+++ b/dwl.c
@@ -1042,13 +1042,14 @@ void
 fullscreennotify(struct wl_listener *listener, void *data)
 {
 	Client *c = wl_container_of(listener, c, fullscreen);
-	struct wlr_xdg_toplevel_set_fullscreen_event *event = data;
+	int fullscreen = client_wants_fullscreen(c);
+
 	if (!c->mon) {
 		/* if the client is not mapped yet, let mapnotify() call setfullscreen() */
-		c->isfullscreen = event->fullscreen;
+		c->isfullscreen = fullscreen;
 		return;
 	}
-	setfullscreen(c, event->fullscreen);
+	setfullscreen(c, fullscreen);
 }
 
 Monitor *