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

Cursor: implement surfaceAt() for XwaylandUnmanaged

Browse source
This commit is contained in:
Isaac Freund 2021-09-27 18:34:59 +02:00
parent b8ebbc29cf
commit a3fdb294b3
No known key found for this signature in database
GPG key ID: 86DED400DDFD7A11
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
river/Cursor.zig
View file

@ -38,6 +38,7 @@ const Output = @import("Output.zig");
const Seat = @import("Seat.zig"); const Seat = @import("Seat.zig");
const View = @import("View.zig"); const View = @import("View.zig");
const ViewStack = @import("view_stack.zig").ViewStack; const ViewStack = @import("view_stack.zig").ViewStack;
const XwaylandUnmanaged = @import("XwaylandUnmanaged.zig");
const Mode = union(enum) { const Mode = union(enum) {
passthrough: void, passthrough: void,
@ -249,6 +250,7 @@ fn handleButton(listener: *wl.Listener(*wlr.Pointer.event.Button), event: *wlr.P
self.seat.setFocusRaw(.{ .layer = layer_surface }); self.seat.setFocusRaw(.{ .layer = layer_surface });
} }
}, },
.xwayland_unmanaged => assert(build_options.xwayland),
} }
_ = self.seat.wlr_seat.pointerNotifyButton(event.time_msec, event.button, event.state); _ = self.seat.wlr_seat.pointerNotifyButton(event.time_msec, event.button, event.state);
} }
@ -420,6 +422,7 @@ const SurfaceAtResult = struct {
parent: union(enum) { parent: union(enum) {
view: *View, view: *View,
layer_surface: *LayerSurface, layer_surface: *LayerSurface,
xwayland_unmanaged: if (build_options.xwayland) *XwaylandUnmanaged else void,
}, },
}; };
@ -461,7 +464,7 @@ pub fn surfaceAt(self: Self) ?SurfaceAtResult {
if (layerSurfaceAt(output.getLayer(.overlay).*, ox, oy)) |s| return s; if (layerSurfaceAt(output.getLayer(.overlay).*, ox, oy)) |s| return s;
if (fullscreen_view) |view| { if (fullscreen_view) |view| {
//if (build_options.xwayland) if (xwaylandUnmanagedSurfaceAt(ly, lx)) |s| return s; if (build_options.xwayland) if (xwaylandUnmanagedSurfaceAt(ly, lx)) |s| return s;
var sx: f64 = undefined; var sx: f64 = undefined;
var sy: f64 = undefined; var sy: f64 = undefined;
if (view.surfaceAt(ox, oy, &sx, &sy)) |found| { if (view.surfaceAt(ox, oy, &sx, &sy)) |found| {
@ -479,7 +482,7 @@ pub fn surfaceAt(self: Self) ?SurfaceAtResult {
if (layerSurfaceAt(output.getLayer(.top).*, ox, oy)) |s| return s; if (layerSurfaceAt(output.getLayer(.top).*, ox, oy)) |s| return s;
//if (build_options.xwayland) if (xwaylandUnmanagedSurfaceAt(lx, ly)) |s| return s; if (build_options.xwayland) if (xwaylandUnmanagedSurfaceAt(lx, ly)) |s| return s;
if (viewSurfaceAt(output, ox, oy)) |s| return s; if (viewSurfaceAt(output, ox, oy)) |s| return s;
@ -603,16 +606,25 @@ fn viewSurfaceAt(output: *const Output, ox: f64, oy: f64) ?SurfaceAtResult {
return null; return null;
} }
fn xwaylandUnmanagedSurfaceAt(lx: f64, ly: f64) ?*wlr.Surface { fn xwaylandUnmanagedSurfaceAt(lx: f64, ly: f64) ?SurfaceAtResult {
var it = server.root.xwayland_unmanaged_views.first; var it = server.root.xwayland_unmanaged_views.first;
while (it) |node| : (it = node.next) { while (it) |node| : (it = node.next) {
const xwayland_surface = node.data.xwayland_surface; const xwayland_surface = node.data.xwayland_surface;
var sx: f64 = undefined;
var sy: f64 = undefined;
if (xwayland_surface.surface.?.surfaceAt( if (xwayland_surface.surface.?.surfaceAt(
lx - @intToFloat(f64, xwayland_surface.x), lx - @intToFloat(f64, xwayland_surface.x),
ly - @intToFloat(f64, xwayland_surface.y), ly - @intToFloat(f64, xwayland_surface.y),
sx, &sx,
sy, &sy,
)) |found| return found; )) |found| {
return SurfaceAtResult{
.surface = found,
.sx = sx,
.sy = sy,
.parent = .{ .xwayland_unmanaged = &node.data },
};
}
} }
return null; return null;
} }
@ -832,6 +844,7 @@ fn passthrough(self: *Self, time: u32) void {
} }
}, },
.layer_surface => {}, .layer_surface => {},
.xwayland_unmanaged => assert(build_options.xwayland),
} }
} }
} }