WindowSet is better than WorkSpace

darcs-hash:20070419015430-a5988-1abfb64ca77e80031074f4a01f1f4e1a2e5efbac

2 files changed, 4 insertions, 4 deletions

diff --git a/Operations.hs b/Operations.hs
index 48ba9db..9c85872 100644
--- a/Operations.hs
+++ b/Operations.hs
@@ -111,7 +111,7 @@ layout f = do
     refresh
 
 -- | windows. Modify the current window list with a pure function, and refresh
-windows :: (WorkSpace -> WorkSpace) -> X ()
+windows :: (WindowSet -> WindowSet) -> X ()
 windows f = do
     modify $ \s -> s { workspace = f (workspace s) }
     refresh
diff --git a/XMonad.hs b/XMonad.hs
index 9053e69..c349037 100644
--- a/XMonad.hs
+++ b/XMonad.hs
@@ -15,7 +15,7 @@
 --
 
 module XMonad (
-    X, WorkSpace, WorkspaceId(..), ScreenId(..), XState(..), Layout(..), LayoutDesc(..),
+    X, WindowSet, WorkspaceId(..), ScreenId(..), XState(..), Layout(..), LayoutDesc(..),
     runX, io, withDisplay, isRoot, spawn, trace, whenJust, rotateLayout
   ) where
 
@@ -39,7 +39,7 @@ data XState = XState
     , wmprotocols       :: !Atom                           -- ^ wm protocols atom
     , dimensions        :: !(Int,Int)                      -- ^ dimensions of the screen, 
                                                            -- used for hiding windows
-    , workspace         :: !WorkSpace                      -- ^ workspace list
+    , workspace         :: !WindowSet                      -- ^ workspace list
 
     , xineScreens       :: ![Rectangle]                    -- ^ dimensions of each screen
     , defaultLayoutDesc :: !LayoutDesc                     -- ^ default layout
@@ -47,7 +47,7 @@ data XState = XState
                                                            -- to descriptions of their layouts
     }
 
-type WorkSpace = StackSet WorkspaceId ScreenId Window
+type WindowSet = StackSet WorkspaceId ScreenId Window
 
 -- | Virtual workspace indicies
 newtype WorkspaceId = W Int deriving (Eq,Ord,Show,Enum,Num,Integral,Real)