lkn
/
windowmaker-wl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: recursive frame_buf_hit resolves WINGs views in dialogs 

frame_buf_hit now walks children recursively (up to 4 levels) instead
of only checking immediate children of top-level frames. This resolves
WINGs views nested inside fake_leader frames (icon chooser, message
dialogs), enabling event delivery to the correct WINGs widget.
This commit is contained in:
lkn 2026-06-21 17:51:41 +02:00
parent 5325a51b64
commit c9f0fc8370
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/backend/wayland/wl_framebuf.c
View File

@ -301,23 +301,26 @@ frame_buf_hit(int px, int py)
if (!fb)
fb = frame_buf_button_at(px, py);
/* If we landed on a top-level frame (parent_id==0), check whether a
* child sub-window (resizebar, titlebar) actually contains (px,py).
* Child frame_bufs may not have a committed scene_buf buffer so
* wlr_scene_node_at skips them; we find them by coordinate instead.
* Return the smallest (most specific) child that encloses the point. */
if (fb && fb->parent_id == 0) {
struct wl_frame_buf *child, *best_child = NULL;
wl_list_for_each(child, &wl_state.frame_list, link) {
if (child->parent_id != fb->id) continue;
if (px < child->x || px >= child->x + child->width) continue;
if (py < child->y || py >= child->y + child->height) continue;
if (!best_child ||
(child->width * child->height) < (best_child->width * best_child->height))
best_child = child;
/* Walk children (and grandchildren) to find the most specific
* frame_buf enclosing the point. Handles titlebar/resizebar buttons
* AND WINGs views nested inside fake_leader frames. */
if (fb) {
int depth;
for (depth = 0; depth < 4; depth++) {
struct wl_frame_buf *child, *best_child = NULL;
wl_list_for_each(child, &wl_state.frame_list, link) {
if (child->parent_id != fb->id) continue;
if (px < child->x || px >= child->x + child->width) continue;
if (py < child->y || py >= child->y + child->height) continue;
if (!best_child ||
(child->width * child->height) < (best_child->width * best_child->height))
best_child = child;
}
if (best_child)
fb = best_child;
else
break;
}
if (best_child)
fb = best_child;
}
return fb;