Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

layer-shell: render all popups over top layer

Browse Source 
This means the popups belonging to e.g. a surface in the background
layer will be rendered over views.
This commit is contained in:
Isaac Freund 2020-11-10 12:12:56 +01:00
parent a90ddd305b
commit 77d3eb1bf0
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
river/render.zig
View File

@ -75,8 +75,8 @@ pub fn renderOutput(output: *Output) void {
// No fullscreen view, so render normal layers/views // No fullscreen view, so render normal layers/views
c.wlr_renderer_clear(wlr_renderer, &config.background_color); c.wlr_renderer_clear(wlr_renderer, &config.background_color);
renderLayer(output.*, output.layers[c.ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND], &now); renderLayer(output.*, output.layers[c.ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND], &now, .toplevels);
renderLayer(output.*, output.layers[c.ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM], &now); renderLayer(output.*, output.layers[c.ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM], &now, .toplevels);
// The first view in the list is "on top" so iterate in reverse. // The first view in the list is "on top" so iterate in reverse.
it = ViewStack(View).iter(output.views.last, .reverse, output.current.tags, renderFilter); it = ViewStack(View).iter(output.views.last, .reverse, output.current.tags, renderFilter);
@ -100,11 +100,16 @@ pub fn renderOutput(output: *Output) void {
if (build_options.xwayland) renderXwaylandUnmanaged(output.*, &now); if (build_options.xwayland) renderXwaylandUnmanaged(output.*, &now);
renderLayer(output.*, output.layers[c.ZWLR_LAYER_SHELL_V1_LAYER_TOP], &now); renderLayer(output.*, output.layers[c.ZWLR_LAYER_SHELL_V1_LAYER_TOP], &now, .toplevels);
renderLayer(output.*, output.layers[c.ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND], &now, .popups);
renderLayer(output.*, output.layers[c.ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM], &now, .popups);
renderLayer(output.*, output.layers[c.ZWLR_LAYER_SHELL_V1_LAYER_TOP], &now, .popups);
} }
// The overlay layer is rendered in both fullscreen and normal cases // The overlay layer is rendered in both fullscreen and normal cases
renderLayer(output.*, output.layers[c.ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY], &now); renderLayer(output.*, output.layers[c.ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY], &now, .toplevels);
renderLayer(output.*, output.layers[c.ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY], &now, .popups);
renderDragIcons(output.*, &now); renderDragIcons(output.*, &now);
@ -134,7 +139,12 @@ fn renderFilter(view: *View, filter_tags: u32) bool {
} }
/// Render all surfaces on the passed layer /// Render all surfaces on the passed layer
fn renderLayer(output: Output, layer: std.TailQueue(LayerSurface), now: *c.timespec) void { fn renderLayer(
output: Output,
layer: std.TailQueue(LayerSurface),
now: *c.timespec,
role: enum { toplevels, popups },
) void {
var it = layer.first; var it = layer.first;
while (it) |node| : (it = node.next) { while (it) |node| : (it = node.next) {
const layer_surface = &node.data; const layer_surface = &node.data;
@ -145,11 +155,18 @@ fn renderLayer(output: Output, layer: std.TailQueue(LayerSurface), now: *c.times
.when = now, .when = now,
.opacity = 1.0, .opacity = 1.0,
}; };
c.wlr_layer_surface_v1_for_each_surface( switch (role) {
layer_surface.wlr_layer_surface, .toplevels => c.wlr_surface_for_each_surface(
renderSurfaceIterator, layer_surface.wlr_layer_surface.surface,
&rdata, renderSurfaceIterator,
); &rdata,
),
.popups => c.wlr_layer_surface_v1_for_each_popup(
layer_surface.wlr_layer_surface,
renderSurfaceIterator,
&rdata,
),
}
} }
} }