Implement fullscreen.

3 files changed, 76 insertions, 8 deletions

diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 1b3143d0..b86f20e8 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -273,17 +273,25 @@ static void render_output(struct sway_output *output, struct timespec *when,
         float clear_color[] = {0.25f, 0.25f, 0.25f, 1.0f};
         wlr_renderer_clear(renderer, clear_color);
 
-        render_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND]);
-        render_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM]);
-
         struct sway_container *workspace = output_get_active_workspace(output);
-        render_container(output, workspace);
 
-        render_unmanaged(output, &root_container.sway_root->xwayland_unmanaged);
+        if (workspace->fullscreen) {
+                wlr_output_set_fullscreen_surface(wlr_output,
+                                workspace->fullscreen->surface);
+        } else {
+                wlr_output_set_fullscreen_surface(wlr_output, NULL);
+                render_layer(output,
+                                &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND]);
+                render_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM]);
+
+                render_container(output, workspace);
 
-        // TODO: consider revising this when fullscreen windows are supported
-        render_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]);
-        render_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]);
+                render_unmanaged(output, &root_container.sway_root->xwayland_unmanaged);
+
+                render_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]);
+                render_layer(output,
+                                &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]);
+        }
 
 renderer_end:
         if (root_container.sway_root->debug_tree) {
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index e4703040..133b60c3 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -118,6 +118,14 @@ static void set_activated(struct sway_view *view, bool activated) {
         }
 }
 
+static void set_fullscreen(struct sway_view *view, bool fullscreen) {
+        if (xdg_shell_v6_view_from_view(view) == NULL) {
+                return;
+        }
+        struct wlr_xdg_surface_v6 *surface = view->wlr_xdg_surface_v6;
+        wlr_xdg_toplevel_v6_set_fullscreen(surface, fullscreen);
+}
+
 static void for_each_surface(struct sway_view *view,
                 wlr_surface_iterator_func_t iterator, void *user_data) {
         if (xdg_shell_v6_view_from_view(view) == NULL) {
@@ -146,6 +154,7 @@ static void destroy(struct sway_view *view) {
         wl_list_remove(&xdg_shell_v6_view->destroy.link);
         wl_list_remove(&xdg_shell_v6_view->map.link);
         wl_list_remove(&xdg_shell_v6_view->unmap.link);
+        wl_list_remove(&xdg_shell_v6_view->request_fullscreen.link);
         free(xdg_shell_v6_view);
 }
 
@@ -153,6 +162,7 @@ static const struct sway_view_impl view_impl = {
         .get_prop = get_prop,
         .configure = configure,
         .set_activated = set_activated,
+        .set_fullscreen = set_fullscreen,
         .for_each_surface = for_each_surface,
         .close = _close,
         .destroy = destroy,
@@ -210,6 +220,18 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
         view_destroy(&xdg_shell_v6_view->view);
 }
 
+static void handle_request_fullscreen(struct wl_listener *listener, void *data) {
+        struct sway_xdg_shell_v6_view *xdg_shell_v6_view =
+                wl_container_of(listener, xdg_shell_v6_view, request_fullscreen);
+        struct wlr_xdg_toplevel_v6_set_fullscreen_event *e = data;
+
+        if (xdg_shell_v6_view->view.wlr_xdg_surface_v6->role != WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
+                return;
+        }
+
+        view_set_fullscreen(&xdg_shell_v6_view->view, e->fullscreen);
+}
+
 void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
         struct sway_server *server = wl_container_of(listener, server,
                 xdg_shell_v6_surface);
@@ -246,4 +268,8 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
 
         xdg_shell_v6_view->destroy.notify = handle_destroy;
         wl_signal_add(&xdg_surface->events.destroy, &xdg_shell_v6_view->destroy);
+
+        xdg_shell_v6_view->request_fullscreen.notify = handle_request_fullscreen;
+        wl_signal_add(&xdg_surface->toplevel->events.request_fullscreen,
+                        &xdg_shell_v6_view->request_fullscreen);
 }
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index 69166af0..716d8882 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -25,6 +25,15 @@ static void unmanaged_handle_request_configure(struct wl_listener *listener,
                 ev->width, ev->height);
 }
 
+static void unmanaged_handle_request_fullscreen(struct wl_listener *listener,
+                void *data) {
+        struct sway_xwayland_view *xwayland_view =
+                wl_container_of(listener, xwayland_view, request_fullscreen);
+        struct sway_view *view = &xwayland_view->view;
+        struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
+        view_set_fullscreen(view, xsurface->fullscreen);
+}
+
 static void unmanaged_handle_commit(struct wl_listener *listener, void *data) {
         struct sway_xwayland_unmanaged *surface =
                 wl_container_of(listener, surface, commit);
@@ -106,6 +115,9 @@ static struct sway_xwayland_unmanaged *create_unmanaged(
         wl_signal_add(&xsurface->events.request_configure,
                 &surface->request_configure);
         surface->request_configure.notify = unmanaged_handle_request_configure;
+        wl_signal_add(&xsurface->events.request_fullscreen,
+                &surface->request_fullscreen);
+        surface->request_fullscreen.notify = unmanaged_handle_request_fullscreen;
         wl_signal_add(&xsurface->events.map, &surface->map);
         surface->map.notify = unmanaged_handle_map;
         wl_signal_add(&xsurface->events.unmap, &surface->unmap);
@@ -179,6 +191,14 @@ static void set_activated(struct sway_view *view, bool activated) {
         wlr_xwayland_surface_activate(surface, activated);
 }
 
+static void set_fullscreen(struct sway_view *view, bool fullscreen) {
+        if (xwayland_view_from_view(view) == NULL) {
+                return;
+        }
+        struct wlr_xwayland_surface *surface = view->wlr_xwayland_surface;
+        wlr_xwayland_surface_set_fullscreen(surface, fullscreen);
+}
+
 static void _close(struct sway_view *view) {
         if (xwayland_view_from_view(view) == NULL) {
                 return;
@@ -193,6 +213,7 @@ static void destroy(struct sway_view *view) {
         }
         wl_list_remove(&xwayland_view->destroy.link);
         wl_list_remove(&xwayland_view->request_configure.link);
+        wl_list_remove(&xwayland_view->request_fullscreen.link);
         wl_list_remove(&xwayland_view->map.link);
         wl_list_remove(&xwayland_view->unmap.link);
         free(xwayland_view);
@@ -202,6 +223,7 @@ static const struct sway_view_impl view_impl = {
         .get_prop = get_prop,
         .configure = configure,
         .set_activated = set_activated,
+        .set_fullscreen = set_fullscreen,
         .close = _close,
         .destroy = destroy,
 };
@@ -263,6 +285,14 @@ static void handle_request_configure(struct wl_listener *listener, void *data) {
                 ev->width, ev->height);
 }
 
+static void handle_request_fullscreen(struct wl_listener *listener, void *data) {
+        struct sway_xwayland_view *xwayland_view =
+                wl_container_of(listener, xwayland_view, request_fullscreen);
+        struct sway_view *view = &xwayland_view->view;
+        struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
+        view_set_fullscreen(view, xsurface->fullscreen);
+}
+
 void handle_xwayland_surface(struct wl_listener *listener, void *data) {
         struct sway_server *server = wl_container_of(listener, server,
                 xwayland_surface);
@@ -298,6 +328,10 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
                 &xwayland_view->request_configure);
         xwayland_view->request_configure.notify = handle_request_configure;
 
+        wl_signal_add(&xsurface->events.request_fullscreen,
+                &xwayland_view->request_fullscreen);
+        xwayland_view->request_fullscreen.notify = handle_request_fullscreen;
+
         wl_signal_add(&xsurface->events.unmap, &xwayland_view->unmap);
         xwayland_view->unmap.notify = handle_unmap;