twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-05-19 03:20:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

TopicSpace: improve the lastFocusedTopic handling

Browse Source 
Now the list of last topics is internally kept but
only visually truncated.
This commit is contained in:
Nicolas Pouillard 2009-12-20 21:28:13 +00:00
parent 142eac2eb3
commit c1a3a1c19d
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
XMonad/Actions/TopicSpace.hs
View File

@ -41,7 +41,7 @@ where
import XMonad import XMonad
import Data.List import Data.List
import Data.Maybe (fromMaybe, isNothing, listToMaybe) import Data.Maybe (fromMaybe, isNothing, listToMaybe, fromJust)
import Data.Ord import Data.Ord
import qualified Data.Map as M import qualified Data.Map as M
import Control.Monad (liftM2,when,unless,replicateM_) import Control.Monad (liftM2,when,unless,replicateM_)
@ -225,11 +225,12 @@ getLastFocusedTopics = XS.gets getPrevTopics
-- | Given a 'TopicConfig', the last focused topic, and a predicate that will -- | Given a 'TopicConfig', the last focused topic, and a predicate that will
-- select topics that one want to keep, this function will set the property -- select topics that one want to keep, this function will set the property
-- of last focused topics. -- of last focused topics.
setLastFocusedTopic :: TopicConfig -> Topic -> (Topic -> Bool) -> X () setLastFocusedTopic :: Topic -> (Topic -> Bool) -> X ()
setLastFocusedTopic tg w predicate = setLastFocusedTopic w predicate =
XS.modify $ PrevTopics XS.modify $ PrevTopics
. take (maxTopicHistory tg) . nub . (w:) . filter predicate . seqList . nub . (w:) . filter predicate
. getPrevTopics . getPrevTopics
where seqList xs = length xs `seq` xs
-- | This function is a variant of 'DL.pprWindowSet' which takes a topic configuration -- | This function is a variant of 'DL.pprWindowSet' which takes a topic configuration
-- and a pretty-printing record 'PP'. It will show the list of topics sorted historically -- and a pretty-printing record 'PP'. It will show the list of topics sorted historically
@ -240,13 +241,13 @@ pprWindowSet tg pp = do
urgents <- readUrgents urgents <- readUrgents
let empty_workspaces = map W.tag $ filter (isNothing . W.stack) $ W.workspaces winset let empty_workspaces = map W.tag $ filter (isNothing . W.stack) $ W.workspaces winset
maxDepth = maxTopicHistory tg maxDepth = maxTopicHistory tg
setLastFocusedTopic tg (W.tag . W.workspace . W.current $ winset) setLastFocusedTopic (W.tag . W.workspace . W.current $ winset)
(`notElem` empty_workspaces) (`notElem` empty_workspaces)
lastWs <- getLastFocusedTopics lastWs <- getLastFocusedTopics
let depth topic = elemIndex topic lastWs let depth topic = fromJust $ elemIndex topic (lastWs ++ [topic])
add_depth proj topic = proj pp $ maybe topic (((topic++":")++) . show) $ depth topic add_depth proj topic = proj pp . (((topic++":")++) . show) . depth $ topic
pp' = pp { ppHidden = add_depth ppHidden, ppVisible = add_depth ppVisible } pp' = pp { ppHidden = add_depth ppHidden, ppVisible = add_depth ppVisible }
sortWindows = take (maxDepth - 1) . sortBy (comparing $ fromMaybe maxDepth . depth . W.tag) sortWindows = take maxDepth . sortBy (comparing $ depth . W.tag)
return $ DL.pprWindowSet sortWindows urgents pp' winset return $ DL.pprWindowSet sortWindows urgents pp' winset
-- | Given a prompt configuration and a topic configuration, triggers the action associated with -- | Given a prompt configuration and a topic configuration, triggers the action associated with