diff options
| author | David Roundy <droundy@darcs.net> | 2007-09-21 00:12:48 +0200 |
|---|---|---|
| committer | David Roundy <droundy@darcs.net> | 2007-09-21 00:12:48 +0200 |
| commit | cab757704104f521e98b43c1afa12b7d837e22cb (patch) | |
| tree | 52a543f2065de5735241a19d2d3735cdc20824af /XMonad.hs | |
| parent | 91d76e198ac344ad471aa6475a2a2f1af872df61 (diff) | |
| download | metatile-cab757704104f521e98b43c1afa12b7d837e22cb.tar metatile-cab757704104f521e98b43c1afa12b7d837e22cb.zip | |
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
Diffstat (limited to 'XMonad.hs')
| -rw-r--r-- | XMonad.hs | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -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 |