diff options
| -rw-r--r-- | include/wlr/types/wlr_xdg_shell.h | 12 | ||||
| -rw-r--r-- | rootston/desktop.c | 5 | ||||
| -rw-r--r-- | types/wlr_xdg_shell.c | 43 |
3 files changed, 21 insertions, 39 deletions
diff --git a/include/wlr/types/wlr_xdg_shell.h b/include/wlr/types/wlr_xdg_shell.h index b779017f..29b54dba 100644 --- a/include/wlr/types/wlr_xdg_shell.h +++ b/include/wlr/types/wlr_xdg_shell.h @@ -215,19 +215,19 @@ uint32_t wlr_xdg_toplevel_set_resizing(struct wlr_xdg_surface *surface, void wlr_xdg_surface_send_close(struct wlr_xdg_surface *surface); /** - * Compute the popup position in surface-local coordinates. + * Compute the popup position in its parent's surface-local coordinate system. */ void wlr_xdg_surface_popup_get_position(struct wlr_xdg_surface *surface, double *popup_sx, double *popup_sy); /** - * Find a popup within this surface at the surface-local coordinates. Returns - * the popup and coordinates in the topmost surface coordinate system or NULL if - * no popup is found at that location. + * Find a surface within this xdg-surface tree at the given surface-local + * coordinates. Returns the surface and coordinates in the leaf surface + * coordinate system or NULL if no surface is found at that location. */ -struct wlr_xdg_surface *wlr_xdg_surface_popup_at( +struct wlr_surface *wlr_xdg_surface_surface_at( struct wlr_xdg_surface *surface, double sx, double sy, - double *popup_sx, double *popup_sy); + double *sub_x, double *sub_y); bool wlr_surface_is_xdg_surface(struct wlr_surface *surface); diff --git a/rootston/desktop.c b/rootston/desktop.c index e2127764..e9c1ed30 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -584,12 +584,15 @@ static bool view_at(struct roots_view *view, double lx, double ly, _surface = wlr_xdg_surface_v6_surface_at(view->xdg_surface_v6, view_sx, view_sy, &_sx, &_sy); break; + case ROOTS_XDG_SHELL_VIEW: + _surface = wlr_xdg_surface_surface_at(view->xdg_surface, + view_sx, view_sy, &_sx, &_sy); + break; case ROOTS_WL_SHELL_VIEW: _surface = wlr_wl_shell_surface_surface_at(view->wl_shell_surface, view_sx, view_sy, &_sx, &_sy); break; case ROOTS_XWAYLAND_VIEW: - case ROOTS_XDG_SHELL_VIEW: // TODO _surface = wlr_surface_surface_at(view->wlr_surface, view_sx, view_sy, &_sx, &_sy); break; diff --git a/types/wlr_xdg_shell.c b/types/wlr_xdg_shell.c index d70021fd..f85c6acf 100644 --- a/types/wlr_xdg_shell.c +++ b/types/wlr_xdg_shell.c @@ -1638,45 +1638,24 @@ void wlr_xdg_surface_popup_get_position(struct wlr_xdg_surface *surface, surface->geometry.y; } -struct wlr_xdg_surface *wlr_xdg_surface_popup_at( +struct wlr_surface *wlr_xdg_surface_surface_at( struct wlr_xdg_surface *surface, double sx, double sy, - double *popup_sx, double *popup_sy) { - // XXX: I think this is so complicated because we're mixing geometry - // coordinates with surface coordinates. Input handling should only deal - // with surface coordinates. + double *sub_x, double *sub_y) { struct wlr_xdg_popup *popup_state; wl_list_for_each(popup_state, &surface->popups, link) { struct wlr_xdg_surface *popup = popup_state->base; - double _popup_sx = - surface->geometry.x + popup_state->geometry.x; - double _popup_sy = - surface->geometry.y + popup_state->geometry.y; - int popup_width = popup_state->geometry.width; - int popup_height = popup_state->geometry.height; - - struct wlr_xdg_surface *_popup = - wlr_xdg_surface_popup_at(popup, - sx - _popup_sx + popup->geometry.x, - sy - _popup_sy + popup->geometry.y, - popup_sx, popup_sy); - if (_popup) { - *popup_sx = *popup_sx + _popup_sx - popup->geometry.x; - *popup_sy = *popup_sy + _popup_sy - popup->geometry.y; - return _popup; - } + double popup_sx, popup_sy; + wlr_xdg_surface_popup_get_position(popup, &popup_sx, &popup_sy); - if ((sx > _popup_sx && sx < _popup_sx + popup_width) && - (sy > _popup_sy && sy < _popup_sy + popup_height)) { - if (pixman_region32_contains_point(&popup->surface->current->input, - sx - _popup_sx + popup->geometry.x, - sy - _popup_sy + popup->geometry.y, NULL)) { - *popup_sx = _popup_sx - popup->geometry.x; - *popup_sy = _popup_sy - popup->geometry.y; - return popup; - } + struct wlr_surface *sub = wlr_xdg_surface_surface_at(popup, + sx - popup_sx + popup->geometry.x, + sy - popup_sy + popup->geometry.y, + sub_x, sub_y); + if (sub != NULL) { + return sub; } } - return NULL; + return wlr_surface_surface_at(surface->surface, sx, sy, sub_x, sub_y); } |