autocommit 2022-02-21 23:21:13 CET

src/render/renderer/renderer.rs

@@ -21,6 +21,7 @@ use crate::State;
 use std::ops::Deref;
 use std::rc::Rc;
 use std::slice;
+use crate::ifs::wl_surface::zwlr_layer_surface_v1::ZwlrLayerSurfaceV1;
 
 const NON_COLOR: Color = Color::from_rgbaf(0.2, 0.2, 0.2, 1.0);
 const CHILD_COLOR: Color = Color::from_rgbaf(0.8, 0.8, 0.8, 1.0);
@@ -42,9 +43,21 @@ pub struct Renderer<'a> {
 
 impl Renderer<'_> {
     pub fn render_output(&mut self, output: &OutputNode, x: i32, y: i32) {
+        macro_rules! render_layer {
+            ($layer:expr) => {
+                for ls in $layer.iter() {
+                    let pos = ls.position();
+                    self.render_layer_surface(ls.deref(), pos.x1(), pos.y1());
+                }
+            }
+        }
+        render_layer!(output.layers[0]);
+        render_layer!(output.layers[1]);
         if let Some(ws) = output.workspace.get() {
             self.render_workspace(&ws, x, y);
         }
+        render_layer!(output.layers[2]);
+        render_layer!(output.layers[3]);
     }
 
     pub fn render_workspace(&mut self, workspace: &WorkspaceNode, x: i32, y: i32) {
@@ -392,4 +405,13 @@ impl Renderer<'_> {
             });
         }
     }
+
+    pub fn render_layer_surface(&mut self, surface: &ZwlrLayerSurfaceV1, x: i32, y: i32) {
+        unsafe {
+            let body = surface.position();
+            with_scissor(&body, || {
+                self.render_surface(&surface.surface, x, y);
+            });
+        }
+    }
 }