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

river: make RuleList return deleted items

Browse Source
This commit is contained in:
Doclic 2023-10-19 01:21:52 +02:00
parent ad1e0aa752
commit 206bb2e713
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
river/command/rule.zig
View File

@ -105,13 +105,13 @@ pub fn ruleDel(_: *Seat, args: []const [:0]const u8, _: *?[]const u8) Error!void
switch (action) { switch (action) {
.float, .@"no-float" => { .float, .@"no-float" => {
server.config.float_rules.del(.{ _ = server.config.float_rules.del(.{
.app_id_glob = app_id_glob, .app_id_glob = app_id_glob,
.title_glob = title_glob, .title_glob = title_glob,
}); });
}, },
.ssd, .csd => { .ssd, .csd => {
server.config.ssd_rules.del(.{ _ = server.config.ssd_rules.del(.{
.app_id_glob = app_id_glob, .app_id_glob = app_id_glob,
.title_glob = title_glob, .title_glob = title_glob,
}); });
@ -119,7 +119,7 @@ pub fn ruleDel(_: *Seat, args: []const [:0]const u8, _: *?[]const u8) Error!void
server.root.applyPending(); server.root.applyPending();
}, },
.tag => { .tag => {
server.config.tag_rules.del(.{ _ = server.config.tag_rules.del(.{
.app_id_glob = app_id_glob, .app_id_glob = app_id_glob,
.title_glob = title_glob, .title_glob = title_glob,
}); });

6
river/rule_list.zig
View File

@ -82,17 +82,17 @@ pub fn RuleList(comptime T: type) type {
}); });
} }
pub fn del(list: *Self, rule: struct { app_id_glob: []const u8, title_glob: []const u8 }) void { pub fn del(list: *Self, rule: struct { app_id_glob: []const u8, title_glob: []const u8 }) ?T {
for (list.rules.items, 0..) |existing, i| { for (list.rules.items, 0..) |existing, i| {
if (mem.eql(u8, rule.app_id_glob, existing.app_id_glob) and if (mem.eql(u8, rule.app_id_glob, existing.app_id_glob) and
mem.eql(u8, rule.title_glob, existing.title_glob)) mem.eql(u8, rule.title_glob, existing.title_glob))
{ {
util.gpa.free(existing.app_id_glob); util.gpa.free(existing.app_id_glob);
util.gpa.free(existing.title_glob); util.gpa.free(existing.title_glob);
_ = list.rules.orderedRemove(i); return list.rules.orderedRemove(i).value;
return;
} }
} }
return null;
} }
/// Returns the value of the most specific rule matching the view. /// Returns the value of the most specific rule matching the view.