diff options
| -rw-r--r-- | client.h | 30 |
1 files changed, 14 insertions, 16 deletions
@@ -5,7 +5,7 @@ * that they will simply compile out if the chosen #defines leave them unused. */ -/* Leave this function first; it's used in the others */ +/* Leave these functions first; they're used in the others */ static inline int client_is_x11(Client *c) { @@ -16,6 +16,16 @@ client_is_x11(Client *c) #endif } +static inline struct wlr_surface * +client_surface(Client *c) +{ +#ifdef XWAYLAND + if (client_is_x11(c)) + return c->surface.xwayland->surface; +#endif + return c->surface.xdg->surface; +} + /* The others */ static inline void client_activate_surface(struct wlr_surface *s, int activated) @@ -35,14 +45,12 @@ client_activate_surface(struct wlr_surface *s, int activated) static inline void client_for_each_surface(Client *c, wlr_surface_iterator_func_t fn, void *data) { + wlr_surface_for_each_surface(client_surface(c), fn, data); #ifdef XWAYLAND - if (client_is_x11(c)) { - wlr_surface_for_each_surface(c->surface.xwayland->surface, - fn, data); + if (client_is_x11(c)) return; - } #endif - wlr_xdg_surface_for_each_surface(c->surface.xdg, fn, data); + wlr_xdg_surface_for_each_popup_surface(c->surface.xdg, fn, data); } static inline const char * @@ -153,16 +161,6 @@ client_set_tiled(Client *c, uint32_t edges) } static inline struct wlr_surface * -client_surface(Client *c) -{ -#ifdef XWAYLAND - if (client_is_x11(c)) - return c->surface.xwayland->surface; -#endif - return c->surface.xdg->surface; -} - -static inline struct wlr_surface * client_surface_at(Client *c, double cx, double cy, double *sx, double *sy) { #ifdef XWAYLAND |