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

xdg-decoration: clean up implementation

Browse Source 
We now send some protocol errors that wlroots 0.16 is missing [1].
This also allows us to access the xdg decoration from a view, which will
be necessary for some future changes.

[1]: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4051
This commit is contained in:
Isaac Freund
2023-03-10 14:55:56 +01:00
parent fcb184f0bd
commit 05eac54b07
11 changed files with 157 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
river/command/filter.zig
View File

@ -116,21 +116,22 @@ pub fn csdFilterRemove(
}
fn csdFilterUpdateViews(kind: FilterKind, pattern: []const u8, operation: enum { add, remove }) void {
var decoration_it = server.decoration_manager.decorations.first;
while (decoration_it) |decoration_node| : (decoration_it = decoration_node.next) {
const xdg_toplevel_decoration = decoration_node.data.xdg_toplevel_decoration;
const view = @intToPtr(*View, xdg_toplevel_decoration.surface.data);
if (viewMatchesPattern(kind, pattern, view)) {
switch (operation) {
.add => {
_ = xdg_toplevel_decoration.setMode(.client_side);
view.pending.borders = false;
},
.remove => {
_ = xdg_toplevel_decoration.setMode(.server_side);
view.pending.borders = true;
},
var it = server.root.views.iterator(.forward);
while (it.next()) |view| {
if (view.impl == .xdg_toplevel) {
if (view.impl.xdg_toplevel.decoration) |decoration| {
if (viewMatchesPattern(kind, pattern, view)) {
switch (operation) {
.add => {
_ = decoration.wlr_decoration.setMode(.client_side);
view.pending.borders = false;
},
.remove => {
_ = decoration.wlr_decoration.setMode(.server_side);
view.pending.borders = true;
},
}
}
}
}
}