aboutsummaryrefslogtreecommitdiff
path: root/rootston
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-03-30 22:19:33 -0400
committerDrew DeVault <sir@cmpwn.com>2018-03-30 23:02:11 -0400
commite19ee6d469a98d2957e614243ea30674be1977f7 (patch)
tree3dd4cc0c4317d2da3a6791ecb631be270bd9e176 /rootston
parent2053a4c144bdde2df5cb7b6b7036cde008372493 (diff)
Add wlr_surface_point_accepts_input
Ref https://github.com/swaywm/sway/pull/1674
Diffstat (limited to 'rootston')
-rw-r--r--rootston/desktop.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/rootston/desktop.c b/rootston/desktop.c
index 7ee2c69a..1d2e9549 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -622,9 +622,7 @@ static bool view_at(struct roots_view *view, double lx, double ly,
return true;
}
- if (wlr_box_contains_point(&box, view_sx, view_sy) &&
- pixman_region32_contains_point(&view->wlr_surface->current->input,
- view_sx, view_sy, NULL)) {
+ if (wlr_surface_point_accepts_input(view->wlr_surface, view_sx, view_sy)) {
*sx = view_sx;
*sy = view_sy;
*surface = view->wlr_surface;
@@ -668,16 +666,8 @@ static struct wlr_surface *layer_surface_at(struct roots_output *output,
roots_surface->layer_surface->surface;
double _sx = ox - roots_surface->geo.x;
double _sy = oy - roots_surface->geo.y;
- struct wlr_box box = {
- .x = roots_surface->geo.x,
- .y = roots_surface->geo.y,
- .width = wlr_surface->current->width,
- .height = wlr_surface->current->height,
- };
// TODO: Test popups/subsurfaces
- if (wlr_box_contains_point(&box, ox, oy) &&
- pixman_region32_contains_point(&wlr_surface->current->input,
- _sx, _sy, NULL)) {
+ if (wlr_surface_point_accepts_input(wlr_surface, _sx, _sy)) {
*sx = _sx;
*sy = _sy;
return wlr_surface;