Make a String description part of each Layout.

darcs-hash:20070924185753-72aca-95002aa27cfef74bf8caf1e6f243a4626f20659c

5 files changed, 21 insertions, 15 deletions

diff --git a/Config.hs b/Config.hs
index e28399c..66f4fec 100644
--- a/Config.hs
+++ b/Config.hs
@@ -92,10 +92,10 @@ borderWidth = 1
 -- |
 -- The default set of tiling algorithms
 --
-defaultLayouts :: [(String, SomeLayout Window)]
-defaultLayouts = [("tall", SomeLayout tiled)
-                 ,("wide", SomeLayout $ Mirror tiled)
-                 ,("full", SomeLayout Full)
+defaultLayouts :: [SomeLayout Window]
+defaultLayouts = [SomeLayout tiled
+                 ,SomeLayout $ Mirror tiled
+                 ,SomeLayout Full
 
                  -- Extension-provided layouts
                  ]
diff --git a/Config.hs-boot b/Config.hs-boot
index 3629ea2..45d0850 100644
--- a/Config.hs-boot
+++ b/Config.hs-boot
@@ -6,4 +6,4 @@ borderWidth :: Dimension
 logHook     :: X ()
 numlockMask :: KeyMask
 workspaces :: [WorkspaceId]
-defaultLayouts :: [(String, SomeLayout Window)]
+defaultLayouts :: [SomeLayout Window]
diff --git a/Main.hs b/Main.hs
index c89b142..19876db 100644
--- a/Main.hs
+++ b/Main.hs
@@ -56,7 +56,7 @@ main = do
                              workspaces $ zipWith SD xinesc gaps
         gaps = take (length xinesc) $ defaultGaps ++ repeat (0,0,0,0)
 
-        safeLayouts = if null defaultLayouts then [("full",SomeLayout Full)] else defaultLayouts
+        safeLayouts = if null defaultLayouts then [SomeLayout Full] else defaultLayouts
         cf = XConf
             { display       = dpy
             , theRoot       = rootw
diff --git a/Operations.hs b/Operations.hs
index d1bcad2..e03a4ae 100644
--- a/Operations.hs
+++ b/Operations.hs
@@ -338,34 +338,36 @@ data ChangeLayout = NextLayout | PrevLayout | JumpToLayout String
 instance Message ChangeLayout
 
 instance ReadableSomeLayout Window where
-    defaults = map snd defaultLayouts
+    defaults = SomeLayout (LayoutSelection defaultLayouts) :
+               SomeLayout Full : SomeLayout (Tall 1 0.1 0.5) :
+               SomeLayout (Mirror $ Tall 1 0.1 0.5) : defaultLayouts
 
-data LayoutSelection a = LayoutSelection [(String, SomeLayout a)]
+data LayoutSelection a = LayoutSelection [SomeLayout a]
                          deriving ( Show, Read )
 
 instance ReadableSomeLayout a => Layout LayoutSelection a where
-    doLayout (LayoutSelection ((n,l):ls)) r s =
+    doLayout (LayoutSelection (l:ls)) r s =
         do (x,ml') <- doLayout l r s
-           return (x, (\l' -> LayoutSelection ((n,l'):ls)) `fmap` ml')
+           return (x, (\l' -> LayoutSelection (l':ls)) `fmap` ml')
     doLayout (LayoutSelection []) r s = do (x,_) <- doLayout Full r s
                                            return (x,Nothing)
     -- respond to messages only when there's an actual choice:
-    modifyLayout (LayoutSelection ((n,l):ls@(_:_))) m
+    modifyLayout (LayoutSelection (l:ls@(_:_))) m
         | Just NextLayout <- fromMessage m = switchl rls
         | Just PrevLayout <- fromMessage m = switchl rls'
         | Just (JumpToLayout x) <- fromMessage m = switchl (j x)
         where rls (x:xs) = xs ++ [x]
               rls [] = []
               rls' = reverse . rls . reverse
-              j s zs = case partition (\z -> s == fst z) zs of
+              j s zs = case partition (\z -> s == description z) zs of
                          (xs,ys) -> xs++ys
               switchl f = do ml' <- modifyLayout l (SomeMessage Hide)
-                             return $ Just (LayoutSelection $ f $ (n,fromMaybe l ml'):ls)
+                             return $ Just (LayoutSelection $ f $ fromMaybe l ml':ls)
     -- otherwise, or if we don't understand the message, pass it along to the real
     -- layout:
-    modifyLayout (LayoutSelection ((n,l):ls)) m
+    modifyLayout (LayoutSelection (l:ls)) m
         =  do ml' <- modifyLayout l m
-              return $ (\l' -> LayoutSelection ((n,l'):ls)) `fmap` ml'
+              return $ (\l' -> LayoutSelection (l':ls)) `fmap` ml'
     -- Unless there is no layout...
     modifyLayout (LayoutSelection []) _ = return Nothing
 --
@@ -404,6 +406,7 @@ instance Layout Tall a where
         where resize Shrink = Tall nmaster delta (max 0 $ frac-delta)
               resize Expand = Tall nmaster delta (min 1 $ frac+delta)
               incmastern (IncMasterN d) = Tall (max 0 (nmaster+d)) delta frac
+    description _ = "Tall"
 
 -- | Mirror a rectangle
 mirrorRect :: Rectangle -> Rectangle
@@ -416,6 +419,7 @@ instance Layout l a => Layout (Mirror l) a where
     doLayout (Mirror l) r s = (map (second mirrorRect) *** fmap Mirror)
                                 `fmap` doLayout l (mirrorRect r) s
     modifyLayout (Mirror l) = fmap (fmap Mirror) . modifyLayout l
+    description (Mirror l) = "Mirror "++ description l
 
 -- | tile.  Compute the positions for windows using the default 2 pane tiling algorithm.
 --
diff --git a/XMonad.hs b/XMonad.hs
index 7f5fe77..c0ca75d 100644
--- a/XMonad.hs
+++ b/XMonad.hs
@@ -153,6 +153,8 @@ class (Show (layout a), Read (layout a)) => Layout layout a where
     doLayout :: layout a -> Rectangle -> Stack a -> X ([(a, Rectangle)], Maybe (layout a))
     modifyLayout :: layout a -> SomeMessage -> X (Maybe (layout a))
     modifyLayout _ _ = return Nothing
+    description :: layout a -> String
+    description = show
 
 runLayout :: Layout l a => l a -> Rectangle -> StackOrNot a -> X ([(a, Rectangle)], Maybe (l a))
 runLayout l r = maybe (return ([], Nothing)) (doLayout l r)