twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-08-07 23:41:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

X.L.TrackFloating: Simplify focus logic

Browse Source 
It seems the logic used in X.L.StateFull's FocusTracking should cover
all use cases here. Let's try it for a while. :-)
This commit is contained in:
Tomas Janousek
2020-12-09 00:17:18 +00:00
parent 0e9c865e72
commit 89dbdd4767
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
XMonad/Layout/TrackFloating.hs
View File

@@ -11,8 +11,9 @@ Stability : unstable
Portability : unportable Portability : unportable
Layout modifier that tracks focus in the tiled layer while the floating layer Layout modifier that tracks focus in the tiled layer while the floating layer
is in use. This is particularly helpful for tiled layouts where the focus or another sublayout is in use. This is particularly helpful for tiled layouts
determines what is visible. where the focus determines what is visible. It can also be used to improve the
behaviour of a child layout that has not been given the focused window.
The relevant bugs are Issue 4 and 306: The relevant bugs are Issue 4 and 306:
<http://code.google.com/p/xmonad/issues/detail?id=4>, <http://code.google.com/p/xmonad/issues/detail?id=4>,
@@ -34,10 +35,6 @@ module XMonad.Layout.TrackFloating
import Control.Applicative ((<|>)) import Control.Applicative ((<|>))
import Control.Monad import Control.Monad
import Data.Function
import Data.Maybe
import qualified Data.Map as M
import qualified Data.Set as S
import XMonad import XMonad
import XMonad.Layout.LayoutModifier import XMonad.Layout.LayoutModifier
@@ -54,16 +51,11 @@ data TrackFloating a = TrackFloating (Maybe Window)
instance LayoutModifier TrackFloating Window where instance LayoutModifier TrackFloating Window where
modifyLayoutWithUpdate (TrackFloating mw) ws@(W.Workspace{ W.stack = ms }) r modifyLayoutWithUpdate (TrackFloating mw) ws@(W.Workspace{ W.stack = ms }) r
= do = do
winset <- gets windowset xCur <- gets (W.peek . windowset)
let xCur = fmap W.focus xStack let isF = xCur /= (W.focus <$> ms)
xStack = W.stack $ W.workspace $ W.current winset -- use the remembered focus point when true focus differs from
isF = fromMaybe False $ -- what this (sub)layout is given, which happens e.g. when true
fmap (\x -> x `M.member` W.floating winset || -- focus is in floating layer or when another sublayout has focus
(let (\\\) = (S.\\) `on` (S.fromList . W.integrate')
in x `S.member` (xStack \\\ ms)))
xCur
-- use the remembered focus point if isF (focus floating or
-- outside the stack given to layout)
newStack | isF = (mw >>= \w -> findZ (w==) ms) <|> ms newStack | isF = (mw >>= \w -> findZ (w==) ms) <|> ms
| otherwise = ms | otherwise = ms
newState | isF = mw newState | isF = mw