2 files changed, 54 insertions, 0 deletions

diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index dd2eaf08..18367a1c 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -275,6 +275,25 @@ static void for_each_surface_container_iterator(struct sway_container *con,
 
 static void output_for_each_surface(struct sway_output *output,
                 sway_surface_iterator_func_t iterator, void *user_data) {
+        if (server.session_lock.locked) {
+                if (server.session_lock.lock == NULL) {
+                        return;
+                }
+                struct wlr_session_lock_surface_v1 *lock_surface;
+                wl_list_for_each(lock_surface, &server.session_lock.lock->surfaces, link) {
+                        if (lock_surface->output != output->wlr_output) {
+                                continue;
+                        }
+                        if (!lock_surface->mapped) {
+                                continue;
+                        }
+
+                        output_surface_for_each_surface(output, lock_surface->surface,
+                                0.0, 0.0, iterator, user_data);
+                }
+                return;
+        }
+
         if (output_has_opaque_overlay_layer_surface(output)) {
                 goto overlay;
         }
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index 02397c05..ed9ad490 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -1056,6 +1056,41 @@ void output_render(struct sway_output *output, struct timespec *when,
                 wlr_renderer_clear(renderer, (float[]){1, 1, 0, 1});
         }
 
+        if (server.session_lock.locked) {
+                float clear_color[] = {0.0f, 0.0f, 0.0f, 1.0f};
+                if (server.session_lock.lock == NULL) {
+                        // abandoned lock -> red BG
+                        clear_color[0] = 1.f;
+                }
+                int nrects;
+                pixman_box32_t *rects = pixman_region32_rectangles(damage, &nrects);
+                for (int i = 0; i < nrects; ++i) {
+                        scissor_output(wlr_output, &rects[i]);
+                        wlr_renderer_clear(renderer, clear_color);
+                }
+
+                if (server.session_lock.lock != NULL) {
+                        struct render_data data = {
+                                .damage = damage,
+                                .alpha = 1.0f,
+                        };
+
+                        struct wlr_session_lock_surface_v1 *lock_surface;
+                        wl_list_for_each(lock_surface, &server.session_lock.lock->surfaces, link) {
+                                if (lock_surface->output != wlr_output) {
+                                        continue;
+                                }
+                                if (!lock_surface->mapped) {
+                                        continue;
+                                }
+
+                                output_surface_for_each_surface(output, lock_surface->surface,
+                                        0.0, 0.0, render_surface_iterator, &data);
+                        }
+                }
+                goto renderer_end;
+        }
+
         if (output_has_opaque_overlay_layer_surface(output)) {
                 goto render_overlay;
         }