change workspaces to [WorkspaceId]

darcs-hash:20070814003722-72aca-523faa4ad29f664dd33331c0c03d2564ecde2b89.gz

3 files changed, 6 insertions, 6 deletions

diff --git a/Config.hs b/Config.hs
index 716e472..71bddbe 100644
--- a/Config.hs
+++ b/Config.hs
@@ -31,8 +31,8 @@ import Graphics.X11.Xlib
 --
 -- The number of workspaces (virtual screens, or window groups)
 --
-workspaces :: Int
-workspaces = 9
+workspaces :: [WorkspaceId]
+workspaces = [0..8]
 
 -- |
 -- modMask lets you specify which modkey you want to use. The default is
@@ -157,7 +157,7 @@ keys = M.fromList $
     -- mod-[1..9] @@ Switch to workspace N
     -- mod-shift-[1..9] @@ Move client to workspace N
     [((m .|. modMask, k), f i)
-        | (i, k) <- zip [0 .. fromIntegral workspaces - 1] [xK_1 ..]
+        | (i, k) <- zip workspaces [xK_1 ..]
         , (f, m) <- [(view, 0), (shift, shiftMask)]]
 
     -- mod-{w,e,r} @@ Switch to physical/Xinerama screens 1, 2, or 3
diff --git a/Config.hs-boot b/Config.hs-boot
index 6bb33b3..ae05ea4 100644
--- a/Config.hs-boot
+++ b/Config.hs-boot
@@ -5,4 +5,4 @@ import XMonad
 borderWidth :: Dimension
 logHook     :: X ()
 numlockMask :: KeyMask
-workspaces :: Int
+workspaces :: [WorkspaceId]
diff --git a/Main.hs b/Main.hs
index 1716b60..7882291 100644
--- a/Main.hs
+++ b/Main.hs
@@ -52,7 +52,7 @@ main = do
 
     let winset | ("--resume" : s : _) <- args
                , [(x, "")]            <- reads s = x
-               | otherwise = new [0..fromIntegral workspaces-1] $ zipWith SD xinesc gaps
+               | otherwise = new workspaces $ zipWith SD xinesc gaps
         gaps = take (length xinesc) $ defaultGaps ++ repeat (0,0,0,0)
 
         safeLayouts = case defaultLayouts of [] -> (full, []); (x:xs) -> (x,xs)
@@ -63,7 +63,7 @@ main = do
             , focusedBorder = fbc }
         st = XState
             { windowset     = winset
-            , layouts       = M.fromList [(w, safeLayouts) | w <- [0 .. W workspaces - 1]]
+            , layouts       = M.fromList [(w, safeLayouts) | w <- workspaces]
             , mapped        = S.empty
             , waitingUnmap  = M.empty
             , dragging      = Nothing }