mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-05 13:29:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Fix popups"

Browse source 
This reverts commit de86d65627.
This commit is contained in:
Drew DeVault 2018-08-02 09:05:46 -04:00
parent 8e60f6a732
commit 9aa258d33a
10 changed files with 55 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

134
sway/tree/container.c
View file

@ -569,15 +569,10 @@ static struct sway_container *container_at_view(struct sway_container *swayc,
*sx = _sx;
*sy = _sy;
*surface = _surface;
return swayc;
}
return NULL;
return swayc;
}
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.
*/
@ -604,7 +599,7 @@ static struct sway_container *container_at_tabbed(struct sway_container *parent,
// Surfaces
struct sway_container *current = seat_get_active_child(seat, parent);
return tiling_container_at(current, lx, ly, surface, sx, sy);
return container_at(current, lx, ly, surface, sx, sy);
}
/**
@ -629,7 +624,7 @@ static struct sway_container *container_at_stacked(
// Surfaces
struct sway_container *current = seat_get_active_child(seat, parent);
return tiling_container_at(current, lx, ly, surface, sx, sy);
return container_at(current, lx, ly, surface, sx, sy);
}
/**
@ -647,13 +642,45 @@ static struct sway_container *container_at_linear(struct sway_container *parent,
.height = child->height,
};
if (wlr_box_contains_point(&box, lx, ly)) {
return tiling_container_at(child, lx, ly, surface, sx, sy);
return container_at(child, lx, ly, surface, sx, sy);
}
}
return NULL;
}
static struct sway_container *floating_container_at(double lx, double ly,
struct sway_container *container_at(struct sway_container *parent,
double lx, double ly,
struct wlr_surface **surface, double *sx, double *sy) {
if (!sway_assert(parent->type >= C_WORKSPACE,
"Expected workspace or deeper")) {
return NULL;
}
if (parent->type == C_VIEW) {
return container_at_view(parent, lx, ly, surface, sx, sy);
}
if (!parent->children->length) {
return NULL;
}
switch (parent->layout) {
case L_HORIZ:
case L_VERT:
return container_at_linear(parent, lx, ly, surface, sx, sy);
case L_TABBED:
return container_at_tabbed(parent, lx, ly, surface, sx, sy);
case L_STACKED:
return container_at_stacked(parent, lx, ly, surface, sx, sy);
case L_FLOATING:
sway_assert(false, "Didn't expect to see floating here");
return NULL;
case L_NONE:
return NULL;
}
return NULL;
}
struct sway_container *floating_container_at(double lx, double ly,
struct wlr_surface **surface, double *sx, double *sy) {
for (int i = 0; i < root_container.children->length; ++i) {
struct sway_container *output = root_container.children->items[i];
@ -675,8 +702,7 @@ static struct sway_container *floating_container_at(double lx, double ly,
.height = floater->height,
};
if (wlr_box_contains_point(&box, lx, ly)) {
return tiling_container_at(floater, lx, ly,
surface, sx, sy);
return container_at(floater, lx, ly, surface, sx, sy);
}
}
}
@ -684,90 +710,6 @@ static struct sway_container *floating_container_at(double lx, double ly,
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) {
if (con->type == C_VIEW) {
return container_at_view(con, lx, ly, surface, sx, sy);
}
if (!con->children->length) {
return NULL;
}
switch (con->layout) {
case L_HORIZ:
case L_VERT:
return container_at_linear(con, lx, ly, surface, sx, sy);
case L_TABBED:
return container_at_tabbed(con, lx, ly, surface, sx, sy);
case L_STACKED:
return container_at_stacked(con, lx, ly, surface, sx, sy);
case L_FLOATING:
sway_assert(false, "Didn't expect to see floating here");
return NULL;
case L_NONE:
return NULL;
}
return NULL;
}
static bool surface_is_popup(struct wlr_surface *surface) {
if (wlr_surface_is_xdg_surface(surface)) {
struct wlr_xdg_surface *xdg_surface =
wlr_xdg_surface_from_wlr_surface(surface);
while (xdg_surface) {
if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP) {
return true;
}
xdg_surface = xdg_surface->toplevel->parent;
}
return false;
}
if (wlr_surface_is_xdg_surface_v6(surface)) {
struct wlr_xdg_surface_v6 *xdg_surface_v6 =
wlr_xdg_surface_v6_from_wlr_surface(surface);
while (xdg_surface_v6) {
if (xdg_surface_v6->role == WLR_XDG_SURFACE_V6_ROLE_POPUP) {
return true;
}
xdg_surface_v6 = xdg_surface_v6->toplevel->parent;
}
return false;
}
return false;
}
struct sway_container *container_at(struct sway_container *workspace,
double lx, double ly,
struct wlr_surface **surface, double *sx, double *sy) {
if (!sway_assert(workspace->type == C_WORKSPACE, "Expected a workspace")) {
return NULL;
}
struct sway_container *c;
// Focused view's popups
struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *focus =
seat_get_focus_inactive(seat, &root_container);
if (focus && focus->type == C_VIEW) {
container_at_view(focus, lx, ly, surface, sx, sy);
if (*surface && surface_is_popup(*surface)) {
return focus;
}
*surface = NULL;
}
// Floating
if ((c = floating_container_at(lx, ly, surface, sx, sy))) {
return c;
}
// Tiling
if ((c = tiling_container_at(workspace, lx, ly, surface, sx, sy))) {
return c;
}
return NULL;
}
void container_for_each_descendant_dfs(struct sway_container *container,
void (*f)(struct sway_container *container, void *data),
void *data) {