Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Xwayland: restrict OR focus changes based on ICCCM input model

Browse Source 
Some popup menus are not covered by the `overrideRedirectWantsFocus()`
heuristic (e.g. in IntelliJ IDEA), so before focusing an OR window,
its input model should also be checked to ensure that it is able to
take input focus. This appears to fix the popup menus in IntelliJ IDEA,
which would otherwise disappear immediately due to unwanted focus.
This commit is contained in:
Zakariyya Von Forslun 2022-06-22 08:56:21 +10:00 committed by Isaac Freund
parent 5cce49095a
commit bd03484b28
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
river/Cursor.zig
View File

@ -317,7 +317,9 @@ fn handleButton(listener: *wl.Listener(*wlr.Pointer.event.Button), event: *wlr.P
}, },
.xwayland_override_redirect => |override_redirect| { .xwayland_override_redirect => |override_redirect| {
if (!build_options.xwayland) unreachable; if (!build_options.xwayland) unreachable;
if (override_redirect.xwayland_surface.overrideRedirectWantsFocus()) { if (override_redirect.xwayland_surface.overrideRedirectWantsFocus() and
override_redirect.xwayland_surface.icccmInputModel() != .none)
{
self.seat.setFocusRaw(.{ .xwayland_override_redirect = override_redirect }); self.seat.setFocusRaw(.{ .xwayland_override_redirect = override_redirect });
} }
}, },

4
river/XwaylandOverrideRedirect.zig
View File

@ -96,7 +96,9 @@ pub fn handleMap(listener: *wl.Listener(*wlr.XwaylandSurface), xwayland_surface:
xwayland_surface.surface.?.events.commit.add(&self.commit); xwayland_surface.surface.?.events.commit.add(&self.commit);
if (self.xwayland_surface.overrideRedirectWantsFocus()) { if (self.xwayland_surface.overrideRedirectWantsFocus() and
self.xwayland_surface.icccmInputModel() != .none)
{
server.input_manager.defaultSeat().setFocusRaw(.{ .xwayland_override_redirect = self }); server.input_manager.defaultSeat().setFocusRaw(.{ .xwayland_override_redirect = self });
} }
} }