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

Cursor: use inflight_mode as needed in updateState()

Browse Source 
This fixes possible assertion failures when quickly cancelling and
starting a new move/resize. The following steps, take from the bug
report, can currently reproduce the race:

1. Start with a window in tiled mode.
2. Begin resizing the window with your cursor.
3. Send the window back to tiled mode (with a keybind) and quickly begin
resizing it again with your cursor.
This commit is contained in:
Isaac Freund 2023-11-03 17:06:05 +01:00
parent ddc7997d2f
commit 59c9842c8f
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 46 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
river/Cursor.zig
View File

@ -996,36 +996,55 @@ pub fn updateState(self: *Self) void {
}, },
// TODO: Leave down mode if the target surface is no longer visible. // TODO: Leave down mode if the target surface is no longer visible.
.down => assert(!self.hidden), .down => assert(!self.hidden),
inline .move, .resize => |data, mode| { .move, .resize => {
assert(!self.hidden); // Moving and resizing of views is handled through the transaction system. Therefore,
// we must inspect the inflight_mode instead if a move or a resize is in progress.
//
// The cases when a move/resize is being started or ended and e.g. mode is resize
// while inflight_mode is passthrough or mode is passthrough while inflight_mode
// is resize shouldn't need any special handling.
//
// In the first case, a move/resize has been started along with a transaction but the
// transaction hasn't been committed yet so there is nothing to do.
//
// In the second case, a move/resize has been terminated by the user but the
// transaction carrying out the final size/position change is still inflight.
// Therefore, the user already expects the cursor to be free from the view and
// we should not warp it back to the fixed offset of the move/resize.
switch (self.inflight_mode) {
.passthrough, .down => {},
inline .move, .resize => |data, mode| {
assert(!self.hidden);
// These conditions are checked in Root.applyPending() // These conditions are checked in Root.applyPending()
assert(data.view.current.tags & data.view.current.output.?.current.tags != 0); assert(data.view.current.tags & data.view.current.output.?.current.tags != 0);
assert(data.view.current.float or data.view.current.output.?.layout == null); assert(data.view.current.float or data.view.current.output.?.layout == null);
assert(!data.view.current.fullscreen); assert(!data.view.current.fullscreen);
// Keep the cursor locked to the original offset from the edges of the view. // Keep the cursor locked to the original offset from the edges of the view.
const box = &data.view.current.box; const box = &data.view.current.box;
const new_x: f64 = blk: { const new_x: f64 = blk: {
if (mode == .move or data.edges.left) { if (mode == .move or data.edges.left) {
break :blk @floatFromInt(data.offset_x + box.x); break :blk @floatFromInt(data.offset_x + box.x);
} else if (data.edges.right) { } else if (data.edges.right) {
break :blk @floatFromInt(box.x + box.width - data.offset_x); break :blk @floatFromInt(box.x + box.width - data.offset_x);
} else { } else {
break :blk self.wlr_cursor.x; break :blk self.wlr_cursor.x;
} }
}; };
const new_y: f64 = blk: { const new_y: f64 = blk: {
if (mode == .move or data.edges.top) { if (mode == .move or data.edges.top) {
break :blk @floatFromInt(data.offset_y + box.y); break :blk @floatFromInt(data.offset_y + box.y);
} else if (data.edges.bottom) { } else if (data.edges.bottom) {
break :blk @floatFromInt(box.y + box.height - data.offset_y); break :blk @floatFromInt(box.y + box.height - data.offset_y);
} else { } else {
break :blk self.wlr_cursor.y; break :blk self.wlr_cursor.y;
} }
}; };
self.wlr_cursor.warpClosest(null, new_x, new_y); self.wlr_cursor.warpClosest(null, new_x, new_y);
},
}
}, },
} }
} }