diff options
| -rw-r--r-- | river/PointerConstraint.zig | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/river/PointerConstraint.zig b/river/PointerConstraint.zig index 5da1dc3..e833ee8 100644 --- a/river/PointerConstraint.zig +++ b/river/PointerConstraint.zig @@ -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 { |