diff options
| -rw-r--r-- | XMonad/Config/Droundy.hs | 8 | ||||
| -rw-r--r-- | XMonad/Layout/Named.hs | 30 |
2 files changed, 17 insertions, 21 deletions
diff --git a/XMonad/Config/Droundy.hs b/XMonad/Config/Droundy.hs index d4d4088..a6f70c3 100644 --- a/XMonad/Config/Droundy.hs +++ b/XMonad/Config/Droundy.hs @@ -133,10 +133,10 @@ config = -- withUrgencyHook FocusUrgencyHook $ , XMonad.workspaces = ["1:mutt","2:iceweasel"] , layoutHook = workspaceDir "~" $ windowNavigation $ toggleLayouts (noBorders Full) $ avoidStruts $ - Named "tabbed" (noBorders mytab) ||| - Named "xclock" (mytab ****//* combineTwo Square mytab mytab) ||| - Named "three" (mytab **//* mytab *//* combineTwo Square mytab mytab) ||| - Named "widescreen" ((mytab *||* mytab) + named "tabbed" (noBorders mytab) ||| + named "xclock" (mytab ****//* combineTwo Square mytab mytab) ||| + named "three" (mytab **//* mytab *//* combineTwo Square mytab mytab) ||| + named "widescreen" ((mytab *||* mytab) ****//* combineTwo Square mytab mytab) -- ||| --mosaic 0.25 0.5 , terminal = "xterm" -- The preferred terminal program. diff --git a/XMonad/Layout/Named.hs b/XMonad/Layout/Named.hs index 48a29c3..a186609 100644 --- a/XMonad/Layout/Named.hs +++ b/XMonad/Layout/Named.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE FlexibleContexts, FlexibleInstances, MultiParamTypeClasses, TypeSynonymInstances #-} +{-# LANGUAGE FlexibleContexts, FlexibleInstances, MultiParamTypeClasses #-} ----------------------------------------------------------------------------- -- | @@ -14,13 +14,13 @@ -- ----------------------------------------------------------------------------- -module XMonad.Layout.Named ( - -- * Usage - -- $usage - Named(Named) - ) where +module XMonad.Layout.Named + ( -- * Usage + -- $usage + named + ) where -import XMonad +import XMonad.Layout.LayoutModifier -- $usage -- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@: @@ -30,21 +30,17 @@ import XMonad -- Then edit your @layoutHook@ by adding the Named layout modifier -- to some layout: -- --- > myLayouts = Named "real big" Full ||| etc.. +-- > myLayouts = named "real big" Full ||| etc.. -- > main = xmonad defaultConfig { layoutHook = myLayouts } -- -- For more detailed instructions on editing the layoutHook see: -- -- "XMonad.Doc.Extending#Editing_the_layout_hook" -data Named l a = Named String (l a) deriving ( Read, Show ) +named :: String -> l a -> ModifiedLayout Named l a +named s = ModifiedLayout (Named s) -instance (LayoutClass l a) => LayoutClass (Named l) a where - doLayout (Named n l) r s = do (ws, ml') <- doLayout l r s - return (ws, Named n `fmap` ml') - emptyLayout (Named n l) r = do (ws, ml') <- emptyLayout l r - return (ws, Named n `fmap` ml') - handleMessage (Named n l) mess = do ml' <- handleMessage l mess - return $ Named n `fmap` ml' - description (Named n _) = n +data Named a = Named String deriving ( Read, Show ) +instance LayoutModifier Named a where + modifyDescription (Named n) _ = n |