aboutsummaryrefslogtreecommitdiffstats
path: root/XMonad.hs
diff options
context:
space:
mode:
authorDon Stewart <dons@cse.unsw.edu.au>2007-04-11 08:04:56 +0200
committerDon Stewart <dons@cse.unsw.edu.au>2007-04-11 08:04:56 +0200
commitf24008745e645cf03a1e78fdbf751924f75fb9eb (patch)
treed8a673ad188b64ab6481f6a78cf934f87d61bcce /XMonad.hs
parent7e88f8a48c3daecff0b5d62219ee2b0a937d8b82 (diff)
downloadxmonad-f24008745e645cf03a1e78fdbf751924f75fb9eb.tar.gz
xmonad-f24008745e645cf03a1e78fdbf751924f75fb9eb.tar.xz
xmonad-f24008745e645cf03a1e78fdbf751924f75fb9eb.zip
Statically distinguish Workspace and Screen indices
darcs-hash:20070411060456-9c5c1-a5642813cffe434e60310d21497217ef3704b296.gz
Diffstat (limited to 'XMonad.hs')
-rw-r--r--XMonad.hs7
1 files changed, 2 insertions, 5 deletions
diff --git a/XMonad.hs b/XMonad.hs
index 537f212..abc422b 100644
--- a/XMonad.hs
+++ b/XMonad.hs
@@ -20,7 +20,7 @@ module XMonad (
spawn, trace, whenJust, rot
) where
-import StackSet (StackSet)
+import StackSet (StackSet,WorkspaceId)
import Control.Monad.State
import System.IO
@@ -43,7 +43,7 @@ data XState = XState
, dimensions :: !(Int,Int) -- ^ dimensions of the screen, used for hiding windows
, workspace :: !WorkSpace -- ^ workspace list
, defaultLayoutDesc :: !LayoutDesc -- ^ default layout
- , layoutDescs :: !(M.Map Int LayoutDesc) -- ^ mapping of workspaces to descriptions of their layouts
+ , layoutDescs :: !(M.Map WorkspaceId LayoutDesc) -- ^ mapping of workspaces to descriptions of their layouts
}
type WorkSpace = StackSet Window
@@ -60,9 +60,6 @@ data LayoutDesc = LayoutDesc { layoutType :: !Layout
, tileFraction :: !Rational
}
-
-
-
-- | The X monad, a StateT transformer over IO encapsulating the window
-- manager state
newtype X a = X (StateT XState IO a)