toby/dwl
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

inline xytosurface in xytoclient

Browse source 
It was a simpler function than it looked
This commit is contained in:
Devin J. Pohly 2020-04-21 19:17:44 -05:00
parent 0e9bceb8b6
commit cdeff2475d
1 changed files with 17 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
dwl.c
View file

@ -122,8 +122,6 @@ static void spawn(const Arg *arg);
static void unmapnotify(struct wl_listener *listener, void *data); static void unmapnotify(struct wl_listener *listener, void *data);
static Client * xytoclient(double lx, double ly, static Client * xytoclient(double lx, double ly,
struct wlr_surface **surface, double *sx, double *sy); struct wlr_surface **surface, double *sx, double *sy);
static bool xytosurface(Client *c, double lx, double ly,
struct wlr_surface **surface, double *sx, double *sy);
/* variables */ /* variables */
static struct wl_display *wl_display; static struct wl_display *wl_display;
@ -953,42 +951,27 @@ xytoclient(double lx, double ly,
* cursor. This relies on clients being ordered from top-to-bottom. */ * cursor. This relies on clients being ordered from top-to-bottom. */
Client *c; Client *c;
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (xytosurface(c, lx, ly, surface, sx, sy)) {
return c;
}
}
return NULL;
}
bool
xytosurface(Client *c, double lx, double ly,
struct wlr_surface **surface, double *sx, double *sy)
{
/* /*
* XDG toplevels may have nested surfaces, such as popup windows for context * XDG toplevels may have nested surfaces, such as popup windows
* menus or tooltips. This function tests if any of those are underneath the * for context menus or tooltips. This function tests if any of
* coordinates lx and ly (in output Layout Coordinates). If so, it sets the * those are underneath the coordinates lx and ly (in output
* surface pointer to that wlr_surface and the sx and sy coordinates to the * Layout Coordinates). If so, it sets the surface pointer to
* that wlr_surface and the sx and sy coordinates to the
* coordinates relative to that surface's top-left corner. * coordinates relative to that surface's top-left corner.
*/ */
double client_sx = lx - c->x;
double client_sy = ly - c->y;
struct wlr_surface_state *state = &c->xdg_surface->surface->current;
double _sx, _sy; double _sx, _sy;
struct wlr_surface *_surface = NULL; struct wlr_surface *_surface = NULL;
_surface = wlr_xdg_surface_surface_at( _surface = wlr_xdg_surface_surface_at(c->xdg_surface,
c->xdg_surface, client_sx, client_sy, &_sx, &_sy); lx - c->x, ly - c->y, &_sx, &_sy);
if (_surface != NULL) { if (_surface != NULL) {
*sx = _sx; *sx = _sx;
*sy = _sy; *sy = _sy;
*surface = _surface; *surface = _surface;
return true; return c;
} }
}
return false; return NULL;
} }
int int