commit e07da5fc5c6ac5c186662b56b08ca71531119de0
parent 2ecba101fd2535b634b83ec54d6a46d2ff9e1481
Author: Ryan Dwyer <RyanDwyer@users.noreply.github.com>
Date: Fri, 3 Aug 2018 08:18:09 +1000
Merge pull request #2411 from emersion/fullscreen-pointer-input
Fix pointer events for fullscreen views
Diffstat:
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
@@ -234,6 +234,10 @@ struct sway_container *container_at(struct sway_container *workspace,
double lx, double ly, struct wlr_surface **surface,
double *sx, double *sy);
+struct sway_container *container_at_view(struct sway_container *view,
+ double lx, double ly, struct wlr_surface **surface,
+ double *sx, double *sy);
+
/**
* Apply the function for each descendant of the container breadth first.
*/
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
@@ -99,7 +99,8 @@ static struct sway_container *container_at_coords(
return ws;
}
if (ws->sway_workspace->fullscreen) {
- return container_at(ws, lx, ly, surface, sx, sy);
+ return container_at_view(ws->sway_workspace->fullscreen, lx, ly,
+ surface, sx, sy);
}
if ((*surface = layer_surface_at(output,
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],
diff --git a/sway/tree/container.c b/sway/tree/container.c
@@ -535,7 +535,7 @@ struct sway_container *container_parent(struct sway_container *container,
return container;
}
-static struct sway_container *container_at_view(struct sway_container *swayc,
+struct sway_container *container_at_view(struct sway_container *swayc,
double lx, double ly,
struct wlr_surface **surface, double *sx, double *sy) {
if (!sway_assert(swayc->type == C_VIEW, "Expected a view")) {