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

follow upstream xwayland_surface changes

Browse source 
wlroots removed the `wlr_surface_is_xwayland_surface` function, and renamed `wlr_xwayland_surface_from_wlr_surface` to `wlr_xwayland_surface_try_from_wlr_surface`.

related commit: fbf5982e38
This commit is contained in:
Job79 2023-02-01 20:09:45 +01:00 committed by Leonardo Hernández
parent cf9c5745e5
commit 7ae5039b4f
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
client.h
View file

@ -69,8 +69,7 @@ toplevel_from_wlr_surface(struct wlr_surface *s, Client **pc, LayerSurface **pl)
root_surface = wlr_surface_get_root_surface(s); root_surface = wlr_surface_get_root_surface(s);
#ifdef XWAYLAND #ifdef XWAYLAND
if (wlr_surface_is_xwayland_surface(root_surface) if ((xsurface = wlr_xwayland_surface_try_from_wlr_surface(root_surface))) {
&& (xsurface = wlr_xwayland_surface_from_wlr_surface(root_surface))) {
c = xsurface->data; c = xsurface->data;
type = c->type; type = c->type;
goto end; goto end;
@ -121,8 +120,7 @@ client_activate_surface(struct wlr_surface *s, int activated)
struct wlr_xdg_surface *surface; struct wlr_xdg_surface *surface;
#ifdef XWAYLAND #ifdef XWAYLAND
struct wlr_xwayland_surface *xsurface; struct wlr_xwayland_surface *xsurface;
if (wlr_surface_is_xwayland_surface(s) if ((xsurface = wlr_xwayland_surface_try_from_wlr_surface(s))) {
&& (xsurface = wlr_xwayland_surface_from_wlr_surface(s))) {
wlr_xwayland_surface_activate(xsurface, activated); wlr_xwayland_surface_activate(xsurface, activated);
return; return;
} }