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

pointer-constraints: fix assertion failure

Browse Source 
It is possible for the assertion in PointerConstraint.confine() to fail
if a view with an active pointer constraint is, for example, resized
using a keybinding such that the pointer is outside the constraint
region.

Handle this edge case by deactivating the constraint. The other option
would be to warp the pointer to the nearest point still inside the
constraint region. Deactivating the constraint is far simpler however
and I don't expect this to be a UX pain point.
This commit is contained in:
Isaac Freund 2023-11-06 13:10:59 +01:00
parent 642f9b7ae0
commit 18a440b606
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
river/PointerConstraint.zig
View File

@ -119,13 +119,23 @@ pub fn updateState(constraint: *PointerConstraint) void {
return;
}
const warp_lx = @as(f64, @floatFromInt(lx)) + constraint.state.active.sx;
const warp_ly = @as(f64, @floatFromInt(ly)) + constraint.state.active.sy;
const sx = constraint.state.active.sx;
const sy = constraint.state.active.sy;
const warp_lx = @as(f64, @floatFromInt(lx)) + sx;
const warp_ly = @as(f64, @floatFromInt(ly)) + sy;
if (!seat.cursor.wlr_cursor.warp(null, warp_lx, warp_ly)) {
log.info("deactivating pointer constraint, could not warp cursor", .{});
constraint.deactivate();
return;
}
// It is possible for the cursor to end up outside of the constraint region despite the warp
// if, for example, the a keybinding is used to resize the view.
if (!constraint.wlr_constraint.region.containsPoint(@intFromFloat(sx), @intFromFloat(sy), null)) {
log.info("deactivating pointer constraint, cursor outside region despite warp", .{});
constraint.deactivate();
return;
}
}
pub fn confine(constraint: *PointerConstraint, dx: *f64, dy: *f64) void {