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

Reenable popup-handling for determining focus

Browse source 
This reenables the popup-handling code before the floating-window
focus change.
This commit is contained in:
Jonathan Buch 2018-10-03 11:26:46 +02:00
parent 7e978d7a4c
commit 426c33f4dc
No known key found for this signature in database
GPG key ID: 9C46821E98B3343B
1 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
sway/tree/container.c
View file

@ -356,16 +356,33 @@ static bool surface_is_popup(struct wlr_surface *surface) {
struct sway_container *container_at(struct sway_workspace *workspace, struct sway_container *container_at(struct sway_workspace *workspace,
double lx, double ly, double lx, double ly,
struct wlr_surface **surface, double *sx, double *sy) { struct wlr_surface **surface, double *sx, double *sy) {
struct sway_container *c = NULL; struct sway_container *c;
// First cast a ray to handle floating windows // Focused view's popups
struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *focus = seat_get_focused_container(seat);
bool is_floating = focus && container_is_floating_or_child(focus);
// Focused view's popups
if (focus && focus->view) {
c = surface_at_view(focus, lx, ly, surface, sx, sy);
if (c && surface_is_popup(*surface)) {
return c;
}
*surface = NULL;
}
// Cast a ray to handle floating windows
for (int i = workspace->floating->length - 1; i >= 0; --i) { for (int i = workspace->floating->length - 1; i >= 0; --i) {
struct sway_container *cn = workspace->floating->items[i]; struct sway_container *cn = workspace->floating->items[i];
if (cn->view && (c = surface_at_view(cn, lx, ly, surface, sx, sy))) { if (cn->view && (c = surface_at_view(cn, lx, ly, surface, sx, sy))) {
return c; return c;
} }
} }
// If focused is tiling, focused view's non-popups
if (focus && focus->view && !is_floating) {
if ((c = surface_at_view(focus, lx, ly, surface, sx, sy))) {
return c;
}
}
// Tiling (non-focused) // Tiling (non-focused)
if ((c = tiling_container_at(&workspace->node, lx, ly, surface, sx, sy))) { if ((c = tiling_container_at(&workspace->node, lx, ly, surface, sx, sy))) {
return c; return c;