Nulo/river
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

river: fix crash on disabling all outputs

Browse source 
If using the on-output-change cursor warp option river currently crashes
when the last real output is disabled as the noop output used as a
fallback is not present in the output layout.
This commit is contained in:
Isaac Freund 2021-08-02 16:16:58 +02:00
parent 295f965f91
commit 2fc0875a3e
No known key found for this signature in database
GPG key ID: 86DED400DDFD7A11
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
river/Seat.zig
View file

@ -256,6 +256,16 @@ pub fn setFocusRaw(self: *Self, new_focus: FocusTarget) void {
pub fn focusOutput(self: *Self, output: *Output) void { pub fn focusOutput(self: *Self, output: *Output) void {
if (self.focused_output == output) return; if (self.focused_output == output) return;
var it = self.status_trackers.first;
while (it) |node| : (it = node.next) node.data.sendOutput(.unfocused);
self.focused_output = output;
it = self.status_trackers.first;
while (it) |node| : (it = node.next) node.data.sendOutput(.focused);
if (self.focused_output == &server.root.noop_output) return;
// Warp pointer to center of newly focused output (In layout coordinates), // Warp pointer to center of newly focused output (In layout coordinates),
// but only if cursor is not already on the output and this feature is enabled. // but only if cursor is not already on the output and this feature is enabled.
switch (server.config.warp_cursor) { switch (server.config.warp_cursor) {
@ -272,14 +282,6 @@ pub fn focusOutput(self: *Self, output: *Output) void {
} }
}, },
} }
var it = self.status_trackers.first;
while (it) |node| : (it = node.next) node.data.sendOutput(.unfocused);
self.focused_output = output;
it = self.status_trackers.first;
while (it) |node| : (it = node.next) node.data.sendOutput(.focused);
} }
pub fn handleActivity(self: Self) void { pub fn handleActivity(self: Self) void {