mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-03-12 05:33:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

chase wlroots: _wants_focus and input_model renames MR 2434

Browse source 
Ref: d3b7e040af46ab03114d5a40e9ed0c7c6aff15be
("wlr_xwayland_surface: fix prefix of two functions")
This commit is contained in:
Consolatis 2024-11-27 03:41:58 +01:00 • committed by Johan Malm
parent a5db63c472
commit a617accfd8
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/desktop.c
View file

@ -106,7 +106,7 @@ desktop_focus_view_or_surface(struct seat *seat, struct view *view,
} else { } else {
struct wlr_xwayland_surface *xsurface = struct wlr_xwayland_surface *xsurface =
wlr_xwayland_surface_try_from_wlr_surface(surface); 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); seat_focus_surface(seat, surface);
} }
#endif #endif

4
src/xwayland-unmanaged.c
View file

@ -46,7 +46,7 @@ handle_map(struct wl_listener *listener, void *data)
CONNECT_SIGNAL(xsurface, unmanaged, set_geometry); 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); 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; struct wl_list *list = &server->unmanaged_surfaces;
wl_list_for_each_reverse(u, list, link) { wl_list_for_each_reverse(u, list, link) {
struct wlr_xwayland_surface *prev = u->xwayland_surface; 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); seat_focus_surface(&server->seat, prev->surface);
return; return;
} }

2
src/xwayland.c
View file

@ -66,7 +66,7 @@ xwayland_view_wants_focus(struct view *view)
struct wlr_xwayland_surface *xsurface = struct wlr_xwayland_surface *xsurface =
xwayland_surface_from_view(view); 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): * Abbreviated from ICCCM section 4.1.7 (Input Focus):
* *

2
subprojects/wlroots.wrap
View file

@ -1,6 +1,6 @@
[wrap-git] [wrap-git]
url = https://gitlab.freedesktop.org/wlroots/wlroots.git url = https://gitlab.freedesktop.org/wlroots/wlroots.git
revision = 5ecbd23c1d44119cb32b345782d50c9664853109 revision = d3b7e040af46ab03114d5a40e9ed0c7c6aff15be
[provide] [provide]
dependency_names = wlroots-0.19 dependency_names = wlroots-0.19