mirror of
https://github.com/swaywm/sway.git
synced 2024-11-26 18:01:29 +00:00
Merge pull request #1777 from emersion/unmanaged-cursor-input
Use wlr_surface_point_accepts_input for unmanaged surfaces
This commit is contained in:
commit
ebabcc8b44
|
@ -52,17 +52,13 @@ static struct sway_container *container_at_cursor(struct sway_cursor *cursor,
|
||||||
wl_list_for_each_reverse(unmanaged_surface, unmanaged, link) {
|
wl_list_for_each_reverse(unmanaged_surface, unmanaged, link) {
|
||||||
struct wlr_xwayland_surface *xsurface =
|
struct wlr_xwayland_surface *xsurface =
|
||||||
unmanaged_surface->wlr_xwayland_surface;
|
unmanaged_surface->wlr_xwayland_surface;
|
||||||
struct wlr_box box = {
|
|
||||||
.x = unmanaged_surface->lx,
|
|
||||||
.y = unmanaged_surface->ly,
|
|
||||||
.width = xsurface->width,
|
|
||||||
.height = xsurface->height,
|
|
||||||
};
|
|
||||||
|
|
||||||
if (wlr_box_contains_point(&box, cursor->x, cursor->y)) {
|
double _sx = cursor->x - unmanaged_surface->lx;
|
||||||
|
double _sy = cursor->y - unmanaged_surface->ly;
|
||||||
|
if (wlr_surface_point_accepts_input(xsurface->surface, _sx, _sy)) {
|
||||||
*surface = xsurface->surface;
|
*surface = xsurface->surface;
|
||||||
*sx = cursor->x - box.x;
|
*sx = _sx;
|
||||||
*sy = cursor->y - box.y;
|
*sy = _sy;
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue