From 791fcb3fe5265ccc5871d51b4005e99ae760401c Mon Sep 17 00:00:00 2001 From: Brent Yorgey Date: Tue, 20 Nov 2007 18:33:07 +0100 Subject: PerWorkspace.hs: various fixes and updates darcs-hash:20071120173307-bd4d7-80bc037c6db365719e2bf978da0431233811f0d1.gz --- XMonad/Layout/PerWorkspace.hs | 63 ++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 25 deletions(-) (limited to 'XMonad') diff --git a/XMonad/Layout/PerWorkspace.hs b/XMonad/Layout/PerWorkspace.hs index c26aecd..ce63af9 100644 --- a/XMonad/Layout/PerWorkspace.hs +++ b/XMonad/Layout/PerWorkspace.hs @@ -10,14 +10,15 @@ -- Stability : unstable -- Portability : unportable -- --- Configure layouts on a per-workspace basis. +-- Configure layouts on a per-workspace basis. NOTE that this module +-- does not (yet) work in conjunction with multiple screens! =( ----------------------------------------------------------------------------- module XMonad.Layout.PerWorkspace ( -- * Usage -- $usage - onWorkspace + onWorkspace, onWorkspaces ) where import XMonad @@ -31,10 +32,10 @@ import Data.Maybe (fromMaybe) -- -- > import XMonad.Layout.PerWorkspace -- --- and modifying your layoutHook as follows: +-- and modifying your layoutHook as follows (for example): -- --- > layoutHook = onWorkspace "foo" l1 $ -- layout l1 will be used on workspace "foo" --- > onWorkspace "bar" l2 $ -- layout l2 will be used on workspace "bar" +-- > layoutHook = onWorkspace "foo" l1 $ -- layout l1 will be used on workspace "foo". +-- > onWorkspaces ["bar","6"] l2 $ -- layout l2 will be used on workspaces "bar" and "6". -- > l3 -- layout l3 will be used on all other workspaces. -- -- Note that @l1@, @l2@, and @l3@ can be arbitrarily complicated layouts, @@ -45,6 +46,9 @@ import Data.Maybe (fromMaybe) -- layout D instead of C. You could do that as follows: -- -- > layoutHook = A ||| B ||| onWorkspace "foo" D C +-- +-- NOTE that this module does not (yet) work in conjunction with +-- multiple screens. =( -- | Specify one layout to use on a particular workspace, and another -- to use on all others. The second layout can be another call to @@ -54,20 +58,29 @@ onWorkspace :: (LayoutClass l1 a, LayoutClass l2 a) -> (l1 a) -- ^ layout to use on the matched workspace -> (l2 a) -- ^ layout to use everywhere else -> PerWorkspace l1 l2 a -onWorkspace wsId l1 l2 = PerWorkspace wsId Nothing l1 l2 +onWorkspace wsId l1 l2 = PerWorkspace [wsId] Nothing l1 l2 + +-- | Specify one layout to use on a particular set of workspaces, and +-- another to use on all other workspaces. +onWorkspaces :: (LayoutClass l1 a, LayoutClass l2 a) + => [WorkspaceId] -- ^ tags of workspaces to match + -> (l1 a) -- ^ layout to use on matched workspaces + -> (l2 a) -- ^ layout to use everywhere else + -> PerWorkspace l1 l2 a +onWorkspaces wsIds l1 l2 = PerWorkspace wsIds Nothing l1 l2 -- | Structure for representing a workspace-specific layout along with --- a layout for all other workspaces. We store the tag of the workspace +-- a layout for all other workspaces. We store the tags of workspaces -- to be matched, and the two layouts. Since layouts are stored\/tracked --- per workspace, once we figure out which workspace we are on, we can --- cache that information using a (Maybe Bool). This is necessary +-- per workspace, once we figure out whether we're on a matched workspace, +-- we can cache that information using a (Maybe Bool). This is necessary -- to be able to correctly implement the 'description' method of -- LayoutClass, since a call to description is not able to query the -- WM state to find out which workspace it was called in. -data PerWorkspace l1 l2 a = PerWorkspace WorkspaceId - (Maybe Bool) - (l1 a) - (l2 a) +data PerWorkspace l1 l2 a = PerWorkspace [WorkspaceId] + (Maybe Bool) + (l1 a) + (l2 a) deriving (Read, Show) instance (LayoutClass l1 a, LayoutClass l2 a) => LayoutClass (PerWorkspace l1 l2) a where @@ -85,9 +98,9 @@ instance (LayoutClass l1 a, LayoutClass l2 a) => LayoutClass (PerWorkspace l1 l2 return (wrs, Just $ mkNewPerWorkspaceF p mlf') -- figure out which layout to use based on the current workspace. - doLayout (PerWorkspace wsId Nothing l1 l2) r s = do + doLayout (PerWorkspace wsIds Nothing l1 l2) r s = do t <- getCurrentTag - doLayout (PerWorkspace wsId (Just $ wsId == t) l1 l2) r s + doLayout (PerWorkspace wsIds (Just $ t `elem` wsIds) l1 l2) r s -- handle messages; same drill as doLayout. handleMessage p@(PerWorkspace _ (Just True) lt _) m = do @@ -98,29 +111,29 @@ instance (LayoutClass l1 a, LayoutClass l2 a) => LayoutClass (PerWorkspace l1 l2 mlf' <- handleMessage lf m return . Just $ mkNewPerWorkspaceF p mlf' - handleMessage (PerWorkspace wsId Nothing l1 l2) m = do - t <- getCurrentTag - handleMessage (PerWorkspace wsId (Just $ wsId == t) l1 l2) m + handleMessage (PerWorkspace _ Nothing _ _) _ = return Nothing description (PerWorkspace _ (Just True ) l1 _) = description l1 description (PerWorkspace _ (Just False) _ l2) = description l2 -- description's result is not in the X monad, so we have to wait - -- until a doLayout or handleMessage for the information about - -- which workspace we're in to get cached. + -- until a doLayout for the information about which workspace + -- we're in to get cached. description _ = "PerWorkspace" -- | Construct new PerWorkspace values with possibly modified layouts. mkNewPerWorkspaceT :: PerWorkspace l1 l2 a -> Maybe (l1 a) -> PerWorkspace l1 l2 a -mkNewPerWorkspaceT (PerWorkspace wsId b lt lf) mlt' = - (\lt' -> PerWorkspace wsId b lt' lf) $ fromMaybe lt mlt' +mkNewPerWorkspaceT (PerWorkspace wsIds b lt lf) mlt' = + (\lt' -> PerWorkspace wsIds b lt' lf) $ fromMaybe lt mlt' mkNewPerWorkspaceF :: PerWorkspace l1 l2 a -> Maybe (l2 a) -> PerWorkspace l1 l2 a -mkNewPerWorkspaceF (PerWorkspace wsId b lt lf) mlf' = - (\lf' -> PerWorkspace wsId b lt lf') $ fromMaybe lf mlf' +mkNewPerWorkspaceF (PerWorkspace wsIds b lt lf) mlf' = + (\lf' -> PerWorkspace wsIds b lt lf') $ fromMaybe lf mlf' --- | Get the tag of the currently active workspace. +-- | Get the tag of the currently active workspace. Note that this +-- is only guaranteed to be the same workspace for which doLayout +-- was called if there is only one screen. getCurrentTag :: X WorkspaceId getCurrentTag = gets windowset >>= return . W.tag . W.workspace . W.current -- cgit v1.2.3