Check for subsurfaces and popups before using wlr_output_set_fullscreen_surface

2 files changed, 4 insertions, 3 deletions

diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h
index c245eb09..8bf1f6eb 100644
--- a/include/rootston/desktop.h
+++ b/include/rootston/desktop.h
@@ -19,13 +19,14 @@ struct roots_output {
 	struct wlr_output *wlr_output;
 	struct wl_listener frame;
 	struct timespec last_frame;
-	struct wl_list link;
+	struct wl_list link; // roots_desktop:outputs
+	struct roots_view *fullscreen_view;
 };
 
 struct roots_desktop {
 	struct wl_list views; // roots_view::link
 
-	struct wl_list outputs;
+	struct wl_list outputs; // roots_output::link
 	struct timespec last_frame;
 
 	struct roots_server *server;
diff --git a/include/rootston/view.h b/include/rootston/view.h
index 77bbfbec..44a98115 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -57,7 +57,7 @@ struct roots_view {
 	float rotation;
 
 	bool maximized;
-	struct wlr_output *fullscreen_output;
+	struct roots_output *fullscreen_output;
 	struct {
 		double x, y;
 		uint32_t width, height;