alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1777 from emersion/unmanaged-cursor-input

Browse source 
Use wlr_surface_point_accepts_input for unmanaged surfaces
This commit is contained in:
Drew DeVault 2018-04-08 11:52:47 -04:00 committed by GitHub
parent efff7c4225 5ebc99253a
commit ebabcc8b44
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sway/input/cursor.c
View file

@ -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;
} }
} }