Merge pull request #2353 from emersion/render-opaque-overlay

Improve rendering with a fullscreen opaque overlay surface

3 files changed, 17 insertions, 35 deletions

diff --git a/include/sway/output.h b/include/sway/output.h
index b6cda83c..c225e541 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -65,8 +65,7 @@ struct sway_container *output_by_name(const char *name);
 
 void output_enable(struct sway_output *output);
 
-bool output_has_opaque_lockscreen(struct sway_output *output,
-        struct sway_seat *seat);
+bool output_has_opaque_overlay_layer_surface(struct sway_output *output);
 
 struct sway_container *output_get_active_workspace(struct sway_output *output);
 
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 1512408e..1764b4e3 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -182,21 +182,14 @@ struct sway_container *output_get_active_workspace(struct sway_output *output) {
         return workspace;
 }
 
-bool output_has_opaque_lockscreen(struct sway_output *output,
-                struct sway_seat *seat) {
-        if (!seat->exclusive_client) {
-                return false;
-        }
-
+bool output_has_opaque_overlay_layer_surface(struct sway_output *output) {
         struct wlr_layer_surface *wlr_layer_surface;
         wl_list_for_each(wlr_layer_surface, &server.layer_shell->surfaces, link) {
-                if (wlr_layer_surface->output != output->wlr_output) {
+                if (wlr_layer_surface->output != output->wlr_output ||
+                                wlr_layer_surface->layer != ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY) {
                         continue;
                 }
                 struct wlr_surface *wlr_surface = wlr_layer_surface->surface;
-                if (wlr_surface->resource->client != seat->exclusive_client) {
-                        continue;
-                }
                 struct sway_layer_surface *sway_layer_surface =
                         layer_from_wlr_layer_surface(wlr_layer_surface);
                 pixman_box32_t output_box = {
@@ -222,16 +215,11 @@ struct send_frame_done_data {
         struct root_geometry root_geo;
         struct sway_output *output;
         struct timespec *when;
-        struct wl_client *exclusive_client;
 };
 
 static void send_frame_done_iterator(struct wlr_surface *surface,
                 int sx, int sy, void *_data) {
         struct send_frame_done_data *data = _data;
-        if (data->exclusive_client &&
-                        data->exclusive_client != surface->resource->client) {
-                return;
-        }
 
         bool intersects = output_get_surface_box(&data->root_geo, data->output, surface,
                 sx, sy, NULL);
@@ -280,14 +268,15 @@ static void send_frame_done_container(struct send_frame_done_data *data,
 }
 
 static void send_frame_done(struct sway_output *output, struct timespec *when) {
-        struct sway_seat *seat = input_manager_current_seat(input_manager);
         struct send_frame_done_data data = {
                 .output = output,
                 .when = when,
-                .exclusive_client = output_has_opaque_lockscreen(output, seat) ?
-                        seat->exclusive_client : NULL,
         };
 
+        if (output_has_opaque_overlay_layer_surface(output)) {
+                goto send_frame_overlay;
+        }
+
         struct sway_container *workspace = output_get_active_workspace(output);
         if (workspace->current.ws_fullscreen) {
                 send_frame_done_container_iterator(
@@ -315,6 +304,7 @@ static void send_frame_done(struct sway_output *output, struct timespec *when) {
                         &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]);
         }
 
+send_frame_overlay:
         send_frame_done_layer(&data,
                 &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]);
         send_frame_done_drag_icons(&data, &root_container.sway_root->drag_icons);
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index 3e7bd94b..15c5b94c 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -837,21 +837,12 @@ void output_render(struct sway_output *output, struct timespec *when,
 
         struct sway_container *workspace = output_get_active_workspace(output);
         struct sway_view *fullscreen_view = workspace->current.ws_fullscreen;
-        struct sway_seat *seat = input_manager_current_seat(input_manager);
-
-        if (output_has_opaque_lockscreen(output, seat) && seat->focused_layer) {
-                struct wlr_layer_surface *wlr_layer_surface = seat->focused_layer;
-                struct sway_layer_surface *sway_layer_surface =
-                        layer_from_wlr_layer_surface(seat->focused_layer);
-                struct render_data data = {
-                        .output = output,
-                        .damage = damage,
-                        .alpha = 1.0f,
-                };
-                output_surface_for_each_surface(wlr_layer_surface->surface,
-                        sway_layer_surface->geo.x, sway_layer_surface->geo.y,
-                        &data.root_geo, render_surface_iterator, &data);
-        } else if (fullscreen_view) {
+
+        if (output_has_opaque_overlay_layer_surface(output)) {
+                goto render_overlay;
+        }
+
+        if (fullscreen_view) {
                 float clear_color[] = {0.0f, 0.0f, 0.0f, 1.0f};
 
                 int nrects;
@@ -897,6 +888,8 @@ void output_render(struct sway_output *output, struct timespec *when,
                 render_layer(output, damage,
                         &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]);
         }
+
+render_overlay:
         render_layer(output, damage,
                 &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]);
         render_drag_icons(output, damage, &root_container.sway_root->drag_icons);