mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-29 00:16:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2411 from emersion/fullscreen-pointer-input

Browse source 
Fix pointer events for fullscreen views
This commit is contained in:
Ryan Dwyer 2018-08-03 08:18:09 +10:00 committed by GitHub
commit e07da5fc5c
Failed to generate hash of commit
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/sway/tree/container.h
View file

@ -234,6 +234,10 @@ struct sway_container *container_at(struct sway_container *workspace,
double lx, double ly, struct wlr_surface **surface, double lx, double ly, struct wlr_surface **surface,
double *sx, double *sy); 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. * Apply the function for each descendant of the container breadth first.
*/ */

3
sway/input/cursor.c
View file

@ -99,7 +99,8 @@ static struct sway_container *container_at_coords(
return ws; return ws;
} }
if (ws->sway_workspace->fullscreen) { 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, if ((*surface = layer_surface_at(output,
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP], &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],

2
sway/tree/container.c
View file

@ -535,7 +535,7 @@ struct sway_container *container_parent(struct sway_container *container,
return 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, double lx, double ly,
struct wlr_surface **surface, double *sx, double *sy) { struct wlr_surface **surface, double *sx, double *sy) {
if (!sway_assert(swayc->type == C_VIEW, "Expected a view")) { if (!sway_assert(swayc->type == C_VIEW, "Expected a view")) {