mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-17 06:46:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert to wlr_xwayland_surface_try_from_wlr_surface()

Browse source 
Accomodate for the breaking changes in [1].

[1]: fbf5982e38
This commit is contained in:
Simon Ser 2023-02-01 19:45:21 +01:00
parent 40eb29e7c5
commit ae2d14ceeb
2 changed files with 25 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

15
sway/tree/view.c
View file

@ -526,7 +526,7 @@ static void view_populate_pid(struct sway_view *view) {
#if HAVE_XWAYLAND
case SWAY_VIEW_XWAYLAND:;
struct wlr_xwayland_surface *surf =
wlr_xwayland_surface_from_wlr_surface(view->surface);
wlr_xwayland_surface_try_from_wlr_surface(view->surface);
pid = surf->pid;
break;
#endif
@ -853,9 +853,8 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
bool set_focus = should_focus(view);
#if HAVE_XWAYLAND
if (wlr_surface_is_xwayland_surface(wlr_surface)) {
struct wlr_xwayland_surface *xsurface =
wlr_xwayland_surface_from_wlr_surface(wlr_surface);
struct wlr_xwayland_surface *xsurface;
if ((xsurface = wlr_xwayland_surface_try_from_wlr_surface(wlr_surface))) {
set_focus &= wlr_xwayland_icccm_input_model(xsurface) !=
WLR_ICCCM_INPUT_MODEL_NONE;
}
@ -1197,12 +1196,8 @@ struct sway_view *view_from_wlr_surface(struct wlr_surface *wlr_surface) {
return view_from_wlr_xdg_surface(xdg_surface);
}
#if HAVE_XWAYLAND
if (wlr_surface_is_xwayland_surface(wlr_surface)) {
struct wlr_xwayland_surface *xsurface =
wlr_xwayland_surface_from_wlr_surface(wlr_surface);
if (xsurface == NULL) {
return NULL;
}
struct wlr_xwayland_surface *xsurface;
if ((xsurface = wlr_xwayland_surface_try_from_wlr_surface(wlr_surface))) {
return view_from_wlr_xwayland_surface(xsurface);
}
#endif