Convert to *_try_from_wlr_surface()

References: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3991

2 files changed, 11 insertions, 19 deletions

diff --git a/sway/tree/container.c b/sway/tree/container.c
index c60c8f8f..dbe88028 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -387,16 +387,16 @@ struct sway_container *tiling_container_at(struct sway_node *parent,
 }
 
 static bool surface_is_popup(struct wlr_surface *surface) {
-	while (!wlr_surface_is_xdg_surface(surface)) {
-		if (!wlr_surface_is_subsurface(surface)) {
+	while (wlr_xdg_surface_try_from_wlr_surface(surface) == NULL) {
+		struct wlr_subsurface *subsurface =
+			wlr_subsurface_try_from_wlr_surface(surface);
+		if (subsurface == NULL) {
 			return false;
 		}
-		struct wlr_subsurface *subsurface =
-			wlr_subsurface_from_wlr_surface(surface);
 		surface = subsurface->parent;
 	}
 	struct wlr_xdg_surface *xdg_surface =
-		wlr_xdg_surface_from_wlr_surface(surface);
+		wlr_xdg_surface_try_from_wlr_surface(surface);
 	return xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP;
 }
 
diff --git a/sway/tree/view.c b/sway/tree/view.c
index db902562..ec0ad4af 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -951,7 +951,7 @@ static void subsurface_get_view_coords(struct sway_view_child *child,
 		*sx = *sy = 0;
 	}
 	struct wlr_subsurface *subsurface =
-		wlr_subsurface_from_wlr_surface(surface);
+		wlr_subsurface_try_from_wlr_surface(surface);
 	*sx += subsurface->current.x;
 	*sy += subsurface->current.y;
 }
@@ -1187,12 +1187,8 @@ void view_child_destroy(struct sway_view_child *child) {
 }
 
 struct sway_view *view_from_wlr_surface(struct wlr_surface *wlr_surface) {
-	if (wlr_surface_is_xdg_surface(wlr_surface)) {
-		struct wlr_xdg_surface *xdg_surface =
-			wlr_xdg_surface_from_wlr_surface(wlr_surface);
-		if (xdg_surface == NULL) {
-			return NULL;
-		}
+	struct wlr_xdg_surface *xdg_surface;
+	if ((xdg_surface = wlr_xdg_surface_try_from_wlr_surface(wlr_surface))) {
 		return view_from_wlr_xdg_surface(xdg_surface);
 	}
 #if HAVE_XWAYLAND
@@ -1201,15 +1197,11 @@ struct sway_view *view_from_wlr_surface(struct wlr_surface *wlr_surface) {
 		return view_from_wlr_xwayland_surface(xsurface);
 	}
 #endif
-	if (wlr_surface_is_subsurface(wlr_surface)) {
-		struct wlr_subsurface *subsurface =
-			wlr_subsurface_from_wlr_surface(wlr_surface);
-		if (subsurface == NULL) {
-			return NULL;
-		}
+	struct wlr_subsurface *subsurface;
+	if ((subsurface = wlr_subsurface_try_from_wlr_surface(wlr_surface))) {
 		return view_from_wlr_surface(subsurface->parent);
 	}
-	if (wlr_surface_is_layer_surface(wlr_surface)) {
+	if (wlr_layer_surface_v1_try_from_wlr_surface(wlr_surface) != NULL) {
 		return NULL;
 	}