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

Cursor: only trigger focus-follow-cursor on motion

Browse source 
This greatly improves the UX of this feature, as views moving under a
stationary cursor (as happens during the zoom command for example) will
no longer trigger focus change.
This commit is contained in:
Isaac Freund 2021-10-20 13:22:24 +02:00
parent 4b94b9c083
commit 5bf7d22972
No known key found for this signature in database
GPG key ID: 86DED400DDFD7A11
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
river/Cursor.zig
View file

@ -738,6 +738,24 @@ fn processMotion(self: *Self, device: *wlr.InputDevice, time: u32, delta_x: f64,
switch (self.mode) { switch (self.mode) {
.passthrough => { .passthrough => {
self.wlr_cursor.move(device, dx, dy); self.wlr_cursor.move(device, dx, dy);
if (self.surfaceAt()) |result| {
const focus_change = self.seat.wlr_seat.pointer_state.focused_surface != result.surface;
if (server.config.focus_follows_cursor == .normal and focus_change) {
switch (result.parent) {
.view => |view| {
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 => {},
.xwayland_unmanaged => assert(build_options.xwayland),
}
}
}
self.passthrough(time); self.passthrough(time);
}, },
.down => |view| { .down => |view| {
@ -830,25 +848,8 @@ fn passthrough(self: *Self, time: u32) void {
// events. Note that wlroots won't actually send an enter event if // events. Note that wlroots won't actually send an enter event if
// the surface has already been entered. // the surface has already been entered.
if (server.input_manager.inputAllowed(result.surface)) { if (server.input_manager.inputAllowed(result.surface)) {
// The focus change must be checked before sending enter events
const focus_change = self.seat.wlr_seat.pointer_state.focused_surface != result.surface;
self.seat.wlr_seat.pointerNotifyEnter(result.surface, result.sx, result.sy); self.seat.wlr_seat.pointerNotifyEnter(result.surface, result.sx, result.sy);
self.seat.wlr_seat.pointerNotifyMotion(time, result.sx, result.sy); self.seat.wlr_seat.pointerNotifyMotion(time, result.sx, result.sy);
if (server.config.focus_follows_cursor == .normal and focus_change) {
switch (result.parent) {
.view => |view| {
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 => {},
.xwayland_unmanaged => assert(build_options.xwayland),
}
}
} }
} else { } else {
// There is either no surface under the cursor or input is disallowed // There is either no surface under the cursor or input is disallowed