diff options
| author | Epilepsy Gatherings <73647246+phonetic112@users.noreply.github.com> | 2024-02-13 13:07:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-13 18:07:19 +0000 |
| commit | 2a3429d4cfdc01794b9d6fc1b49be1da019b5606 (patch) | |
| tree | 046d1995e8ff8c8f14eeac584e1a95c029c014a3 /src/events/Windows.cpp | |
| parent | 95abf1220f56acbe88517799fc4b92be2e908575 (diff) | |
internal: add `forcenofocus` prop (#4672)
* add forcenofocus
* change nofocus to overridable var
Diffstat (limited to 'src/events/Windows.cpp')
| -rw-r--r-- | src/events/Windows.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp index cf5d0ab5..2df99284 100644 --- a/src/events/Windows.cpp +++ b/src/events/Windows.cpp @@ -173,7 +173,7 @@ void Events::listener_mapWindow(void* owner, void* data) { } else if (r.szRule.starts_with("pseudo")) { PWINDOW->m_bIsPseudotiled = true; } else if (r.szRule.starts_with("nofocus")) { - PWINDOW->m_bNoFocus = true; + PWINDOW->m_sAdditionalConfigData.noFocus = true; } else if (r.szRule.starts_with("noinitialfocus")) { PWINDOW->m_bNoInitialFocus = true; } else if (r.szRule.starts_with("nofullscreenrequest")) { @@ -443,9 +443,9 @@ void Events::listener_mapWindow(void* owner, void* data) { const auto PFOCUSEDWINDOWPREV = g_pCompositor->m_pLastWindow; if (PWINDOW->m_sAdditionalConfigData.forceAllowsInput) { - PWINDOW->m_bNoFocus = false; - PWINDOW->m_bNoInitialFocus = false; - PWINDOW->m_bX11ShouldntFocus = false; + PWINDOW->m_sAdditionalConfigData.noFocus = false; + PWINDOW->m_bNoInitialFocus = false; + PWINDOW->m_bX11ShouldntFocus = false; } // check LS focus grab @@ -464,7 +464,7 @@ void Events::listener_mapWindow(void* owner, void* data) { requestsFullscreen = true; } - if (!PWINDOW->m_bNoFocus && !PWINDOW->m_bNoInitialFocus && + if (!PWINDOW->m_sAdditionalConfigData.noFocus && !PWINDOW->m_bNoInitialFocus && (PWINDOW->m_iX11Type != 2 || (PWINDOW->m_bIsX11 && wlr_xwayland_or_surface_wants_focus(PWINDOW->m_uSurface.xwayland))) && !workspaceSilent && (!PFORCEFOCUS || PFORCEFOCUS == PWINDOW)) { g_pCompositor->focusWindow(PWINDOW); |