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

Merge pull request #2415 from RyanDwyer/fix-fullscreen-container-crash

Browse source 
Fix crash when moving cursor over a fullscreen split container
This commit is contained in:
emersion 2018-08-03 09:47:54 +01:00 committed by GitHub
commit 16c1e21f26
Failed to generate hash of commit
3 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

2
sway/input/cursor.c
View file

@ -99,7 +99,7 @@ static struct sway_container *container_at_coords(
return ws;
}
if (ws->sway_workspace->fullscreen) {
return container_at_view(ws->sway_workspace->fullscreen, lx, ly,
return tiling_container_at(ws->sway_workspace->fullscreen, lx, ly,
surface, sx, sy);
}
if ((*surface = layer_surface_at(output,

8
sway/tree/container.c
View file

@ -535,7 +535,7 @@ struct sway_container *container_parent(struct sway_container *container,
return container;
}
struct sway_container *container_at_view(struct sway_container *swayc,
static 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")) {
@ -574,10 +574,6 @@ struct sway_container *container_at_view(struct sway_container *swayc,
return NULL;
}
static struct sway_container *tiling_container_at(
struct sway_container *con, double lx, double ly,
struct wlr_surface **surface, double *sx, double *sy);
/**
* container_at for a container with layout L_TABBED.
*/
@ -684,7 +680,7 @@ static struct sway_container *floating_container_at(double lx, double ly,
return NULL;
}
static struct sway_container *tiling_container_at(
struct sway_container *tiling_container_at(
struct sway_container *con, double lx, double ly,
struct wlr_surface **surface, double *sx, double *sy) {
if (con->type == C_VIEW) {