diff --git a/src/desktop.c b/src/desktop.c
index 45a6fc67..67ec8825 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -106,7 +106,7 @@ desktop_focus_view_or_surface(struct seat *seat, struct view *view,
 	} else {
 		struct wlr_xwayland_surface *xsurface =
 			wlr_xwayland_surface_try_from_wlr_surface(surface);
-		if (xsurface && wlr_xwayland_or_surface_wants_focus(xsurface)) {
+		if (xsurface && wlr_xwayland_surface_override_redirect_wants_focus(xsurface)) {
 			seat_focus_surface(seat, surface);
 		}
 #endif
diff --git a/src/xwayland-unmanaged.c b/src/xwayland-unmanaged.c
index 38d3c315..0a7880ca 100644
--- a/src/xwayland-unmanaged.c
+++ b/src/xwayland-unmanaged.c
@@ -46,7 +46,7 @@ handle_map(struct wl_listener *listener, void *data)
 
 	CONNECT_SIGNAL(xsurface, unmanaged, set_geometry);
 
-	if (wlr_xwayland_or_surface_wants_focus(xsurface)) {
+	if (wlr_xwayland_surface_override_redirect_wants_focus(xsurface)) {
 		seat_focus_surface(&unmanaged->server->seat, xsurface->surface);
 	}
 
@@ -66,7 +66,7 @@ focus_next_surface(struct server *server, struct wlr_xwayland_surface *xsurface)
 	struct wl_list *list = &server->unmanaged_surfaces;
 	wl_list_for_each_reverse(u, list, link) {
 		struct wlr_xwayland_surface *prev = u->xwayland_surface;
-		if (wlr_xwayland_or_surface_wants_focus(prev)) {
+		if (wlr_xwayland_surface_override_redirect_wants_focus(prev)) {
 			seat_focus_surface(&server->seat, prev->surface);
 			return;
 		}
diff --git a/src/xwayland.c b/src/xwayland.c
index 36da5ec0..16850533 100644
--- a/src/xwayland.c
+++ b/src/xwayland.c
@@ -66,7 +66,7 @@ xwayland_view_wants_focus(struct view *view)
 	struct wlr_xwayland_surface *xsurface =
 		xwayland_surface_from_view(view);
 
-	switch (wlr_xwayland_icccm_input_model(xsurface)) {
+	switch (wlr_xwayland_surface_icccm_input_model(xsurface)) {
 	/*
 	 * Abbreviated from ICCCM section 4.1.7 (Input Focus):
 	 *
diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap
index 45cba1dc..83e713dc 100644
--- a/subprojects/wlroots.wrap
+++ b/subprojects/wlroots.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://gitlab.freedesktop.org/wlroots/wlroots.git
-revision = 5ecbd23c1d44119cb32b345782d50c9664853109
+revision = d3b7e040af46ab03114d5a40e9ed0c7c6aff15be
 
 [provide]
 dependency_names = wlroots-0.19