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

output: fix debug log on tag change

Browse Source
This commit is contained in:
Isaac Freund 2021-07-27 14:45:38 +02:00
parent 90008cfa53
commit 9e70fb25a5
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
river/OutputStatus.zig
View File

@ -40,7 +40,7 @@ pub fn init(self: *Self, output: *Output, output_status: *zriver.OutputStatusV1)
// Send view/focused tags once on bind. // Send view/focused tags once on bind.
self.sendViewTags(); self.sendViewTags();
self.sendFocusedTags(); self.sendFocusedTags(output.current.tags);
} }
fn handleRequest(output_status: *zriver.OutputStatusV1, request: zriver.OutputStatusV1.Request, self: *Self) void { fn handleRequest(output_status: *zriver.OutputStatusV1, request: zriver.OutputStatusV1.Request, self: *Self) void {
@ -73,7 +73,6 @@ pub fn sendViewTags(self: Self) void {
self.output_status.sendViewTags(&wl_array); self.output_status.sendViewTags(&wl_array);
} }
/// Send the currently focused tags of the output to the client. pub fn sendFocusedTags(self: Self, tags: u32) void {
pub fn sendFocusedTags(self: Self) void { self.output_status.sendFocusedTags(tags);
self.output_status.sendFocusedTags(self.output.current.tags);
} }

7
river/Root.zig
View File

@ -368,16 +368,15 @@ fn commitTransaction(self: *Self) void {
const output = &output_node.data; const output = &output_node.data;
// Apply pending state of the output // Apply pending state of the output
const output_tags_changed = output.pending.tags != output.current.tags; if (output.pending.tags != output.current.tags) {
output.current = output.pending;
if (output_tags_changed) {
std.log.scoped(.output).debug( std.log.scoped(.output).debug(
"changing current focus: {b:0>10} to {b:0>10}", "changing current focus: {b:0>10} to {b:0>10}",
.{ output.current.tags, output.pending.tags }, .{ output.current.tags, output.pending.tags },
); );
var it = output.status_trackers.first; var it = output.status_trackers.first;
while (it) |node| : (it = node.next) node.data.sendFocusedTags(); while (it) |node| : (it = node.next) node.data.sendFocusedTags(output.pending.tags);
} }
output.current = output.pending;
var view_tags_changed = false; var view_tags_changed = false;