From f24008745e645cf03a1e78fdbf751924f75fb9eb Mon Sep 17 00:00:00 2001 From: Don Stewart Date: Wed, 11 Apr 2007 08:04:56 +0200 Subject: Statically distinguish Workspace and Screen indices darcs-hash:20070411060456-9c5c1-a5642813cffe434e60310d21497217ef3704b296.gz --- XMonad.hs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'XMonad.hs') 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) -- cgit v1.2.3