From d16127b3cb0dc58099f77fb2bf6070c4fe4eefb8 Mon Sep 17 00:00:00 2001 From: emersion Date: Wed, 4 Apr 2018 16:48:23 -0400 Subject: Fix wlr_surface_subsurface_at, change it to be wlr_surface_surface_at --- rootston/desktop.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'rootston/desktop.c') diff --git a/rootston/desktop.c b/rootston/desktop.c index f6801332..60426474 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -605,14 +605,13 @@ static bool view_at(struct roots_view *view, double lx, double ly, } } - double sub_x, sub_y; - struct wlr_subsurface *subsurface = - wlr_surface_subsurface_at(view->wlr_surface, - view_sx, view_sy, &sub_x, &sub_y); - if (subsurface) { - *sx = view_sx - sub_x; - *sy = view_sy - sub_y; - *surface = subsurface->surface; + double _sx, _sy; + struct wlr_surface *_surface = wlr_surface_surface_at(view->wlr_surface, + view_sx, view_sy, &_sx, &_sy); + if (surface != NULL) { + *sx = _sx; + *sy = _sy; + *surface = _surface; return true; } @@ -623,13 +622,6 @@ static bool view_at(struct roots_view *view, double lx, double ly, return true; } - if (wlr_surface_point_accepts_input(view->wlr_surface, view_sx, view_sy)) { - *sx = view_sx; - *sy = view_sy; - *surface = view->wlr_surface; - return true; - } - return false; } -- cgit v1.2.3 From 1a8b24bdd268a13bd2977356d6f2e872260709c3 Mon Sep 17 00:00:00 2001 From: emersion Date: Wed, 4 Apr 2018 17:16:35 -0400 Subject: rootston: fix view_at --- include/wlr/types/wlr_surface.h | 2 +- rootston/desktop.c | 2 +- types/wlr_surface.c | 15 ++++++++------- 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'rootston/desktop.c') diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h index 6ece247a..380e5e03 100644 --- a/include/wlr/types/wlr_surface.h +++ b/include/wlr/types/wlr_surface.h @@ -128,7 +128,7 @@ struct wlr_surface *wlr_surface_get_root_surface(struct wlr_surface *surface); /** * Check if the surface accepts input events at the given surface-local - * coordinates. + * coordinates. Does not check the surface's subsurfaces. */ bool wlr_surface_point_accepts_input(struct wlr_surface *surface, double sx, double sy); diff --git a/rootston/desktop.c b/rootston/desktop.c index 60426474..cfeb809b 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -608,7 +608,7 @@ static bool view_at(struct roots_view *view, double lx, double ly, double _sx, _sy; struct wlr_surface *_surface = wlr_surface_surface_at(view->wlr_surface, view_sx, view_sy, &_sx, &_sy); - if (surface != NULL) { + if (_surface != NULL) { *sx = _sx; *sy = _sy; *surface = _surface; diff --git a/types/wlr_surface.c b/types/wlr_surface.c index ddcf86f8..4d2a20e7 100644 --- a/types/wlr_surface.c +++ b/types/wlr_surface.c @@ -137,6 +137,7 @@ static void surface_set_input_region(struct wl_client *client, pixman_region32_t *region = wlr_region_from_resource(region_resource); pixman_region32_copy(&surface->pending->input, region); } else { + pixman_region32_fini(&surface->pending->input); pixman_region32_init_rect(&surface->pending->input, INT32_MIN, INT32_MIN, UINT32_MAX, UINT32_MAX); } @@ -879,6 +880,13 @@ struct wlr_surface *wlr_surface_get_root_surface(struct wlr_surface *surface) { return NULL; } +bool wlr_surface_point_accepts_input(struct wlr_surface *surface, + double sx, double sy) { + return sx >= 0 && sx <= surface->current->width && + sy >= 0 && sy <= surface->current->height && + pixman_region32_contains_point(&surface->current->input, sx, sy, NULL); +} + struct wlr_surface *wlr_surface_surface_at(struct wlr_surface *surface, double sx, double sy, double *sub_x, double *sub_y) { struct wlr_subsurface *subsurface; @@ -943,10 +951,3 @@ void wlr_surface_set_role_committed(struct wlr_surface *surface, surface->role_committed = role_committed; surface->role_data = role_data; } - -bool wlr_surface_point_accepts_input(struct wlr_surface *surface, - double sx, double sy) { - return sx >= 0 && sx <= surface->current->width && - sy >= 0 && sy <= surface->current->height && - pixman_region32_contains_point(&surface->current->input, sx, sy, NULL); -} -- cgit v1.2.3 From c9d21106b4ea85558db06c8e0bff4c6e3fbc203e Mon Sep 17 00:00:00 2001 From: emersion Date: Wed, 4 Apr 2018 17:42:16 -0400 Subject: Add wlr_xdg_surface_v6_surface_at and wlr_wl_shell_surface_surface_at --- include/wlr/types/wlr_wl_shell.h | 10 ++++---- include/wlr/types/wlr_xdg_shell_v6.h | 12 +++++----- rootston/desktop.c | 46 +++++++++++++----------------------- types/wlr_wl_shell.c | 37 +++++++---------------------- types/wlr_xdg_shell_v6.c | 43 +++++++++------------------------ 5 files changed, 47 insertions(+), 101 deletions(-) (limited to 'rootston/desktop.c') diff --git a/include/wlr/types/wlr_wl_shell.h b/include/wlr/types/wlr_wl_shell.h index 63b1a837..89e950c9 100644 --- a/include/wlr/types/wlr_wl_shell.h +++ b/include/wlr/types/wlr_wl_shell.h @@ -142,13 +142,13 @@ void wlr_wl_shell_surface_configure(struct wlr_wl_shell_surface *surface, enum wl_shell_surface_resize edges, int32_t width, int32_t height); /** - * 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 wl-shell 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_wl_shell_surface *wlr_wl_shell_surface_popup_at( +struct wlr_surface *wlr_wl_shell_surface_surface_at( struct wlr_wl_shell_surface *surface, double sx, double sy, - double *popup_sx, double *popup_sy); + double *sub_sx, double *sub_sy); bool wlr_surface_is_wl_shell_surface(struct wlr_surface *surface); diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h index 04c1f324..b646f3fe 100644 --- a/include/wlr/types/wlr_xdg_shell_v6.h +++ b/include/wlr/types/wlr_xdg_shell_v6.h @@ -233,19 +233,19 @@ uint32_t wlr_xdg_toplevel_v6_set_resizing(struct wlr_xdg_surface_v6 *surface, void wlr_xdg_surface_v6_send_close(struct wlr_xdg_surface_v6 *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_v6_popup_get_position(struct wlr_xdg_surface_v6 *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_v6 *wlr_xdg_surface_v6_popup_at( +struct wlr_surface *wlr_xdg_surface_v6_surface_at( struct wlr_xdg_surface_v6 *surface, double sx, double sy, - double *popup_sx, double *popup_sy); + double *sub_x, double *sub_y); /** * Get the geometry for this positioner based on the anchor rect, gravity, and diff --git a/rootston/desktop.c b/rootston/desktop.c index cfeb809b..e2127764 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -577,37 +577,23 @@ static bool view_at(struct roots_view *view, double lx, double ly, view_sy = ry + (double)box.height/2; } - if (view->type == ROOTS_XDG_SHELL_V6_VIEW) { - double popup_sx, popup_sy; - struct wlr_xdg_surface_v6 *popup = - wlr_xdg_surface_v6_popup_at(view->xdg_surface_v6, - view_sx, view_sy, &popup_sx, &popup_sy); - - if (popup) { - *sx = view_sx - popup_sx; - *sy = view_sy - popup_sy; - *surface = popup->surface; - return true; - } - } - - if (view->type == ROOTS_WL_SHELL_VIEW) { - double popup_sx, popup_sy; - struct wlr_wl_shell_surface *popup = - wlr_wl_shell_surface_popup_at(view->wl_shell_surface, - view_sx, view_sy, &popup_sx, &popup_sy); - - if (popup) { - *sx = view_sx - popup_sx; - *sy = view_sy - popup_sy; - *surface = popup->surface; - return true; - } - } - double _sx, _sy; - struct wlr_surface *_surface = wlr_surface_surface_at(view->wlr_surface, - view_sx, view_sy, &_sx, &_sy); + struct wlr_surface *_surface; + switch (view->type) { + case ROOTS_XDG_SHELL_V6_VIEW: + _surface = wlr_xdg_surface_v6_surface_at(view->xdg_surface_v6, + 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; + } if (_surface != NULL) { *sx = _sx; *sy = _sy; diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c index a2123bce..2cbdaf3a 100644 --- a/types/wlr_wl_shell.c +++ b/types/wlr_wl_shell.c @@ -658,42 +658,23 @@ void wlr_wl_shell_surface_configure(struct wlr_wl_shell_surface *surface, wl_shell_surface_send_configure(surface->resource, edges, width, height); } -struct wlr_wl_shell_surface *wlr_wl_shell_surface_popup_at( +struct wlr_surface *wlr_wl_shell_surface_surface_at( struct wlr_wl_shell_surface *surface, double sx, double sy, - double *popup_sx, double *popup_sy) { + double *sub_sx, double *sub_sy) { struct wlr_wl_shell_surface *popup; wl_list_for_each(popup, &surface->popups, popup_link) { if (!popup->popup_mapped) { continue; } - double _popup_sx = popup->transient_state->x; - double _popup_sy = popup->transient_state->y; - int popup_width = - popup->surface->current->buffer_width; - int popup_height = - popup->surface->current->buffer_height; - - struct wlr_wl_shell_surface *_popup = - wlr_wl_shell_surface_popup_at(popup, - popup->transient_state->x, - popup->transient_state->y, - popup_sx, popup_sy); - if (_popup) { - *popup_sx = sx + _popup_sx; - *popup_sy = sy + _popup_sy; - return _popup; - } - 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, sy - _popup_sy, NULL)) { - *popup_sx = _popup_sx; - *popup_sy = _popup_sy; - return popup; - } + double popup_sx = popup->transient_state->x; + double popup_sy = popup->transient_state->y; + struct wlr_surface *sub = wlr_wl_shell_surface_surface_at(popup, + sx - popup_sx, sy - popup_sy, sub_sx, sub_sy); + if (sub != NULL) { + return sub; } } - return NULL; + return wlr_surface_surface_at(surface->surface, sx, sy, sub_sx, sub_sy); } diff --git a/types/wlr_xdg_shell_v6.c b/types/wlr_xdg_shell_v6.c index 5c83db70..fa5523fc 100644 --- a/types/wlr_xdg_shell_v6.c +++ b/types/wlr_xdg_shell_v6.c @@ -1602,47 +1602,26 @@ void wlr_xdg_surface_v6_popup_get_position(struct wlr_xdg_surface_v6 *surface, surface->geometry.y; } -struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6_popup_at( +struct wlr_surface *wlr_xdg_surface_v6_surface_at( struct wlr_xdg_surface_v6 *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_v6 *popup_state; wl_list_for_each(popup_state, &surface->popups, link) { struct wlr_xdg_surface_v6 *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_v6 *_popup = - wlr_xdg_surface_v6_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_v6_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_v6_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); } void wlr_xdg_popup_v6_get_anchor_point(struct wlr_xdg_popup_v6 *popup, -- cgit v1.2.3 From 3ea425d4e232d4d03506e7177b0c25d9d964956d Mon Sep 17 00:00:00 2001 From: emersion Date: Wed, 4 Apr 2018 17:45:24 -0400 Subject: Fix xdg-shell popups, add wlr_xdg_surface_surface_at --- include/wlr/types/wlr_xdg_shell.h | 12 +++++------ rootston/desktop.c | 5 ++++- types/wlr_xdg_shell.c | 43 ++++++++++----------------------------- 3 files changed, 21 insertions(+), 39 deletions(-) (limited to 'rootston/desktop.c') 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); } -- cgit v1.2.3