chase wlroots: _wants_focus and input_model renames MR 2434

Ref: d3b7e040af46ab03114d5a40e9ed0c7c6aff15be
("wlr_xwayland_surface: fix prefix of two functions")

diff --git a/src/desktop.c b/src/desktop.c
index 45a6fc6755233e3db3d4d4d1e7386ea1156cdc1e..67ec882586dbcd581ae19d2ab82e72f199d71571 100644 (file)
--- 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 38d3c315261dde495f5a0e33a55e45db72a6f0fd..0a7880cafbeb4bdca4c2bfdff66a7e284455648a 100644 (file)
--- 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 36da5ec091c799791f2d7312789f7338270e0b04..16850533b018160bfb9a94fe5f513582a25d233c 100644 (file)
--- 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 45cba1dc7ca2238362e18e944207743ff7436da6..83e713dc469ca6e20d69f2788ce5db2492fe10d4 100644 (file)
--- 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