diff options
| author | vaxerski <43317083+vaxerski@users.noreply.github.com> | 2023-02-21 20:47:02 +0000 |
|---|---|---|
| committer | vaxerski <43317083+vaxerski@users.noreply.github.com> | 2023-02-21 20:47:02 +0000 |
| commit | 66e3679ba3dd1412f47e08c52872b7583deff291 (patch) | |
| tree | ffa70d7c09927074beb31a7b49cb2bae377a5299 /src | |
| parent | 708bb014e9979e55a04c4d254416b7af695594d1 (diff) | |
Conform to X11 OR surfaces wanting focus
Diffstat (limited to 'src')
| -rw-r--r-- | src/Compositor.cpp | 2 | ||||
| -rw-r--r-- | src/events/Windows.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/Compositor.cpp b/src/Compositor.cpp index d4b67a89..8ab741da 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -632,7 +632,7 @@ CWindow* CCompositor::vectorToWindowIdeal(const Vector2D& pos) { if (wlr_box_contains_point(&box, m_sWLRCursor->x, m_sWLRCursor->y)) { - if ((*w)->m_iX11Type == 2) { + if ((*w)->m_bIsX11 && (*w)->m_iX11Type == 2 && !wlr_xwayland_or_surface_wants_focus((*w)->m_uSurface.xwayland)) { // Override Redirect return g_pCompositor->m_pLastWindow; // we kinda trick everything here. // TODO: this is wrong, we should focus the parent, but idk how to get it considering it's nullptr in most cases. diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp index 7e6e2ca7..58273d96 100644 --- a/src/events/Windows.cpp +++ b/src/events/Windows.cpp @@ -88,7 +88,8 @@ void Events::listener_mapWindow(void* owner, void* data) { PWINDOW->m_bRequestsFloat = true; } - PWINDOW->m_bX11ShouldntFocus = PWINDOW->m_bX11ShouldntFocus || (PWINDOW->m_bIsX11 && PWINDOW->m_iX11Type == 2); + PWINDOW->m_bX11ShouldntFocus = + PWINDOW->m_bX11ShouldntFocus || (PWINDOW->m_bIsX11 && PWINDOW->m_iX11Type == 2 && !wlr_xwayland_or_surface_wants_focus(PWINDOW->m_uSurface.xwayland)); if (PWORKSPACE->m_bDefaultFloating) PWINDOW->m_bIsFloating = true; @@ -417,7 +418,8 @@ void Events::listener_mapWindow(void* owner, void* data) { if (PLSFROMFOCUS && PLSFROMFOCUS->layerSurface->current.keyboard_interactive) PWINDOW->m_bNoInitialFocus = true; - if (!PWINDOW->m_bNoFocus && !PWINDOW->m_bNoInitialFocus && PWINDOW->m_iX11Type != 2 && !workspaceSilent) { + if (!PWINDOW->m_bNoFocus && !PWINDOW->m_bNoInitialFocus && + (PWINDOW->m_iX11Type != 2 || (PWINDOW->m_bIsX11 && wlr_xwayland_or_surface_wants_focus(PWINDOW->m_uSurface.xwayland))) && !workspaceSilent) { g_pCompositor->focusWindow(PWINDOW); PWINDOW->m_fActiveInactiveAlpha.setValueAndWarp(*PACTIVEALPHA); PWINDOW->m_fDimPercent.setValueAndWarp(*PDIMSTRENGTH); |