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

cursor: fix crash if focus-follows-cursor is set

Browse Source 
Currently we hit a stack overflow as we do not check if the target view
already has keyboard focus before calling Seat.focus() in
Cursor.passthrough(). To fix this, simply add this check.
This commit is contained in:
Isaac Freund
2021-07-29 13:42:36 +02:00
parent f56c892958
commit bae826ef0e
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
river/Cursor.zig
View File

@ -826,9 +826,11 @@ fn passthrough(self: *Self, time: u32) void {
if (follow_mode == .strict or (follow_mode == .normal and focus_change)) {
switch (result.parent) {
.view => |view| {
self.seat.focusOutput(view.output);
self.seat.focus(view);
server.root.startTransaction();
if (self.seat.focused != .view or self.seat.focused.view != view) {
self.seat.focusOutput(view.output);
self.seat.focus(view);
server.root.startTransaction();
}
},
.layer_surface => {},
}