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

river: add custom wlroots log handler

Browse Source 
This makes river's log output more consistent and will allow
filtering by the wlroots scope in the future.
This commit is contained in:
Isaac Freund
2021-07-25 01:22:36 +02:00
parent c26d18647b
commit 734521560b
3 changed files with 54 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
river/main.zig
View File

@ -87,7 +87,7 @@ pub fn main() anyerror!void {
}
};
wlr.log.init(switch (runtime_log_level) {
river_init_wlroots_log(switch (runtime_log_level) {
.debug => .debug,
.notice, .info => .info,
.warn, .err, .crit, .alert, .emerg => .err,
@ -181,3 +181,14 @@ pub fn log(
const stderr = std.io.getStdErr().writer();
stderr.print(@tagName(river_level) ++ scope_prefix ++ format ++ "\n", args) catch {};
}
/// See wlroots_log_wrapper.c
extern fn river_init_wlroots_log(importance: wlr.log.Importance) void;
export fn river_wlroots_log_callback(importance: wlr.log.Importance, ptr: [*:0]const u8, len: usize) void {
switch (importance) {
.err => log(.err, .wlroots, "{s}", .{ptr[0..len]}),
.info => log(.info, .wlroots, "{s}", .{ptr[0..len]}),
.debug => log(.debug, .wlroots, "{s}", .{ptr[0..len]}),
.silent, .last => unreachable,
}
}