add layout selection back into core xmonad using LayoutSelection.

This is just a reimplementation of LayoutChoice.

darcs-hash:20070921212159-72aca-870bb8d3e596fcb9edc48f51bec538054b4165e6.gz

1 files changed, 3 insertions, 2 deletions

diff --git a/Main.hs b/Main.hs
index e1bf529..c89b142 100644
--- a/Main.hs
+++ b/Main.hs
@@ -52,10 +52,11 @@ main = do
 
     let winset | ("--resume" : s : _) <- args
                , [(x, "")]            <- reads s = x
-               | otherwise = new (fst safeLayouts) workspaces $ zipWith SD xinesc gaps
+               | otherwise = new (SomeLayout $ LayoutSelection safeLayouts)
+                             workspaces $ zipWith SD xinesc gaps
         gaps = take (length xinesc) $ defaultGaps ++ repeat (0,0,0,0)
 
-        safeLayouts = case defaultLayouts of [] -> (SomeLayout Full, []); (x:xs) -> (x,xs)
+        safeLayouts = if null defaultLayouts then [("full",SomeLayout Full)] else defaultLayouts
         cf = XConf
             { display       = dpy
             , theRoot       = rootw