From 983cd939668175b45fd658af68c9ceb24adf3d73 Mon Sep 17 00:00:00 2001 From: David Roundy Date: Fri, 21 Sep 2007 00:12:48 +0200 Subject: move Layout into StackSet. WARNING! This changes the format of StackSet, and will definitely mess up your xmonad state, requiring at minimum a restart! darcs-hash:20070920221248-72aca-1653e21d12abc691a6447c8552369f2d55df41b1.gz --- XMonad.hs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'XMonad.hs') diff --git a/XMonad.hs b/XMonad.hs index 102ddcd..cec0574 100644 --- a/XMonad.hs +++ b/XMonad.hs @@ -15,7 +15,7 @@ ----------------------------------------------------------------------------- module XMonad ( - X, WindowSet, WorkspaceId, ScreenId(..), ScreenDetail(..), XState(..), XConf(..), Layout(..), SomeLayout(..), readLayout, + X, WindowSet, WindowSpace, WorkspaceId, ScreenId(..), ScreenDetail(..), XState(..), XConf(..), Layout(..), SomeLayout(..), readLayout, Typeable, Message, SomeMessage(..), fromMessage, runLayout, runX, catchX, io, catchIO, withDisplay, withWindowSet, isRoot, getAtom, spawn, restart, trace, whenJust, whenX, atom_WM_STATE, atom_WM_PROTOCOLS, atom_WM_DELETE_WINDOW @@ -43,8 +43,6 @@ data XState = XState { windowset :: !WindowSet -- ^ workspace list , mapped :: !(S.Set Window) -- ^ the Set of mapped windows , waitingUnmap :: !(M.Map Window Int) -- ^ the number of expected UnmapEvents - , layouts :: !(M.Map WorkspaceId (SomeLayout Window, [SomeLayout Window])) - -- ^ mapping of workspaces to descriptions of their layouts , dragging :: !(Maybe (Position -> Position -> X (), X ())) } data XConf = XConf { display :: Display -- ^ the X11 display @@ -53,6 +51,7 @@ data XConf = XConf , focusedBorder :: !Pixel } -- ^ border color of the focused window type WindowSet = StackSet WorkspaceId (SomeLayout Window) Window ScreenId ScreenDetail +type WindowSpace = Workspace WorkspaceId (SomeLayout Window) Window -- | Virtual workspace indicies type WorkspaceId = String -- cgit v1.2.3