diff options
| author | Markus Ongyerth <ongy@ongy.net> | 2018-07-29 11:20:16 +0200 |
|---|---|---|
| committer | Markus Ongyerth <ongy@ongy.net> | 2018-07-29 14:43:17 +0200 |
| commit | 81cc842f8f27461742710b4195443da64c7bfeef (patch) | |
| tree | b06e78f383a6705fa931d1053cc584f7763c7716 /rootston | |
| parent | f1b65b34a6caff8db7c729b6362ec57f2707aa1a (diff) | |
reintroduce xwayland is_unmanaged
153f37bdf57c61e7fb09162a6791afe8b9b4d0ef (#1145) removed the
wlr_xwayland_is_unamanged function while fixing OR, because it was
belieived that it's supposed to work around the broken OR handling.
This was a misunderstanding. is_unmanaged is (while sort of a hack)
intended to work around inherent differences between "real" X sessions
and our Xwayland/wayland situation.
The main reason it exists is to support applications like rofi and dzen,
while not handing focus to other OR windows (which should *not* be
required).
Traditionally, these applications just grabbed input from X and didn't
need to be focused by any logic in the WM. Which of course doesn't work
in wayland compositors. So we have to give them focus in some way.
Giving *every* OR window focus, breaks other applications that don't
expect focus to change.
A testcase that was pointed out to me where wlr_xwayland_is_unamanged was
breaking things is https://github.com/swaywm/sway/issues/2128 (syncplay,
gitk, gitgui)
Supposedly it broke using keyboard to navigate the menus.
I can't reproduce this with this patch. The popups can be navigated as
long as the parent has focus.
Diffstat (limited to 'rootston')
| -rw-r--r-- | rootston/seat.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/rootston/seat.c b/rootston/seat.c index cae548d3..27363d8e 100644 --- a/rootston/seat.c +++ b/rootston/seat.c @@ -1124,7 +1124,8 @@ void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) { #ifdef WLR_HAS_XWAYLAND if (view && view->type == ROOTS_XWAYLAND_VIEW && - view->xwayland_surface->override_redirect) { + !wlr_xwayland_or_surface_wants_focus( + view->xwayland_surface)) { return; } #endif |