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

PointerConstraint: fix assertion failure

Browse Source 
The assertion in PointerConstraint.confine() can currently still be
triggered if the input region of a surface is changed and the pointer is
moved outside of the new intersection of input region and constraint
region before PointerConstraint.updateState() is called.

This can happen, for example, when a client is made non-fullscreen at
the same time as the pointer is moved across the boundary of the new,
post-fullscreen, input region. If the pointer crosses the boundary
before the transaction completes and updateState() is called, the
assertion in PointerConstraint.confine() will fail.

To fix this, listen for the surface commit event rather than the
set_region event to handle possible deactivation on region changes.
This commit is contained in:
Isaac Freund 2024-07-10 12:16:42 +02:00
parent 1f5bf1d972
commit a7411ef2a6
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
river/PointerConstraint.zig
View File

@ -42,7 +42,7 @@ state: union(enum) {
} = .inactive, } = .inactive,
destroy: wl.Listener(*wlr.PointerConstraintV1) = wl.Listener(*wlr.PointerConstraintV1).init(handleDestroy), destroy: wl.Listener(*wlr.PointerConstraintV1) = wl.Listener(*wlr.PointerConstraintV1).init(handleDestroy),
set_region: wl.Listener(void) = wl.Listener(void).init(handleSetRegion), commit: wl.Listener(*wlr.Surface) = wl.Listener(*wlr.Surface).init(handleCommit),
node_destroy: wl.Listener(void) = wl.Listener(void).init(handleNodeDestroy), node_destroy: wl.Listener(void) = wl.Listener(void).init(handleNodeDestroy),
@ -58,7 +58,7 @@ pub fn create(wlr_constraint: *wlr.PointerConstraintV1) error{OutOfMemory}!void
wlr_constraint.data = @intFromPtr(constraint); wlr_constraint.data = @intFromPtr(constraint);
wlr_constraint.events.destroy.add(&constraint.destroy); wlr_constraint.events.destroy.add(&constraint.destroy);
wlr_constraint.events.set_region.add(&constraint.set_region); wlr_constraint.surface.events.commit.add(&constraint.commit);
if (seat.wlr_seat.keyboard_state.focused_surface) |surface| { if (seat.wlr_seat.keyboard_state.focused_surface) |surface| {
if (surface == wlr_constraint.surface) { if (surface == wlr_constraint.surface) {
@ -201,7 +201,7 @@ fn handleDestroy(listener: *wl.Listener(*wlr.PointerConstraintV1), _: *wlr.Point
} }
constraint.destroy.link.remove(); constraint.destroy.link.remove();
constraint.set_region.link.remove(); constraint.commit.link.remove();
if (seat.cursor.constraint == constraint) { if (seat.cursor.constraint == constraint) {
seat.cursor.constraint = null; seat.cursor.constraint = null;
@ -210,8 +210,11 @@ fn handleDestroy(listener: *wl.Listener(*wlr.PointerConstraintV1), _: *wlr.Point
util.gpa.destroy(constraint); util.gpa.destroy(constraint);
} }
fn handleSetRegion(listener: *wl.Listener(void)) void { // It is necessary to listen for the commit event rather than the set_region
const constraint: *PointerConstraint = @fieldParentPtr("set_region", listener); // event as the latter is not triggered by wlroots when the input region of
// the surface changes.
fn handleCommit(listener: *wl.Listener(*wlr.Surface), _: *wlr.Surface) void {
const constraint: *PointerConstraint = @fieldParentPtr("commit", listener);
const seat: *Seat = @ptrFromInt(constraint.wlr_constraint.seat.data); const seat: *Seat = @ptrFromInt(constraint.wlr_constraint.seat.data);
switch (constraint.state) { switch (constraint.state) {
@ -219,7 +222,7 @@ fn handleSetRegion(listener: *wl.Listener(void)) void {
const sx: i32 = @intFromFloat(state.sx); const sx: i32 = @intFromFloat(state.sx);
const sy: i32 = @intFromFloat(state.sy); const sy: i32 = @intFromFloat(state.sy);
if (!constraint.wlr_constraint.region.containsPoint(sx, sy, null)) { if (!constraint.wlr_constraint.region.containsPoint(sx, sy, null)) {
log.info("deactivating pointer constraint, region change left pointer outside constraint", .{}); log.info("deactivating pointer constraint, (input) region change left pointer outside constraint", .{});
constraint.deactivate(); constraint.deactivate();
} }
}, },