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

cursor: remove surfaceAt() parameters

Browse source 
We always pass the current cursor position, so this is a nice
simplification.
This commit is contained in:
Isaac Freund 2021-07-23 16:52:48 +02:00
parent 7428519a93
commit 969d7b0344
No known key found for this signature in database
GPG key ID: 86DED400DDFD7A11
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
river/Cursor.zig
View file

@ -232,7 +232,7 @@ fn handleButton(listener: *wl.Listener(*wlr.Pointer.event.Button), event: *wlr.P
} }
} }
if (self.surfaceAt(self.wlr_cursor.x, self.wlr_cursor.y)) |result| { if (self.surfaceAt()) |result| {
switch (result.parent) { switch (result.parent) {
.view => |view| { .view => |view| {
// If a view has been clicked on, give that view keyboard focus and // If a view has been clicked on, give that view keyboard focus and
@ -427,11 +427,12 @@ const SurfaceAtResult = struct {
}, },
}; };
/// Find the topmost surface under the output layout coordinates lx/ly /// Find the surface under the cursor if any, and return information about that
/// returns the surface if found and sets the sx/sy parameters to the /// surface and the cursor's position in surface local coords.
/// surface coordinates.
/// This function must be kept in sync with the rendering order in render.zig. /// This function must be kept in sync with the rendering order in render.zig.
fn surfaceAt(self: Self, lx: f64, ly: f64) ?SurfaceAtResult { pub fn surfaceAt(self: Self) ?SurfaceAtResult {
const lx = self.wlr_cursor.x;
const ly = self.wlr_cursor.y;
const wlr_output = server.root.output_layout.outputAt(lx, ly) orelse return null; const wlr_output = server.root.output_layout.outputAt(lx, ly) orelse return null;
const output = @intToPtr(*Output, wlr_output.data); const output = @intToPtr(*Output, wlr_output.data);
@ -708,7 +709,7 @@ fn processMotion(self: *Self, device: *wlr.InputDevice, time: u32, delta_x: f64,
if (self.mode == .passthrough or self.mode == .down) { if (self.mode == .passthrough or self.mode == .down) {
if (constraint.type == .locked) return; if (constraint.type == .locked) return;
const result = self.surfaceAt(self.wlr_cursor.x, self.wlr_cursor.y) orelse return; const result = self.surfaceAt() orelse return;
if (result.surface != constraint.surface) return; if (result.surface != constraint.surface) return;
@ -812,7 +813,7 @@ pub fn maybeResetState(self: *Self) void {
fn passthrough(self: *Self, time: u32) void { fn passthrough(self: *Self, time: u32) void {
assert(self.mode == .passthrough); assert(self.mode == .passthrough);
if (self.surfaceAt(self.wlr_cursor.x, self.wlr_cursor.y)) |result| { if (self.surfaceAt()) |result| {
// If input is allowed on the surface, send pointer enter and motion // If input is allowed on the surface, send pointer enter and motion
// 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.