Initial tiling support.

darcs-hash:20070320071812-a5988-5f091f18a418d6aaf940b800530e0c6a7c4bc312.gz

3 files changed, 50 insertions, 23 deletions

diff --git a/Main.hs b/Main.hs
index 3693adb..4a9a312 100644
--- a/Main.hs
+++ b/Main.hs
@@ -55,12 +55,16 @@ keys = M.fromList $
     , ((modMask,               xK_k     ), raise LT)
     , ((modMask .|. shiftMask, xK_c     ), kill)
     , ((modMask .|. shiftMask, xK_q     ), io $ exitWith ExitSuccess)
+    , ((modMask,               xK_space ), switchLayout)
     ] ++
     -- generate keybindings to each workspace:
     [((m .|. modMask, xK_0 + fromIntegral i), f i)
         | i <- [1 .. workspaces]
         , (f, m) <- [(view, 0), (tag, shiftMask)]]
 
+ratio :: Rational
+ratio = 0.5
+
 --
 -- The main entry point
 -- 
@@ -83,6 +87,7 @@ main = do
             , wmprotocols  = wmprot
             , dimensions   = (displayWidth  dpy dflt, displayHeight dpy dflt)
             , workspace    = W.empty workspaces
+            , layout       = Full
             }
 
     xSetErrorHandler -- in C, I'm too lazy to write the binding
@@ -224,16 +229,39 @@ refresh = do
     ws <- gets workspace
     ws2sc <- gets wsOnScreen
     xinesc <- gets xineScreens
-    forM_ (M.assocs ws2sc) $ \(n, scn) -> 
-            whenJust (W.peekStack n ws) $ \w -> withDisplay $ \d -> do
-            let sc = xinesc !! scn
-            io $ do moveResizeWindow d w (rect_x sc)
-                                         (rect_y sc)
-                                         (rect_width sc)
-                                         (rect_height sc)
-                    raiseWindow d w
+    d <- gets display
+    l <- gets layout
+    let move w a b c e = io $ moveResizeWindow d w a b c e
+    forM_ (M.assocs ws2sc) $ \(n, scn) -> do
+        let sc = xinesc !! scn
+            sx = rect_x sc
+            sy = rect_y sc
+            sw = rect_width sc
+            sh = rect_height sc
+        case l of
+            Full -> whenJust (W.peekStack n ws) $ \w -> do
+                                                            move w sx sy sw sh
+                                                            io $ raiseWindow d w
+            Tile -> case W.index n ws of
+                []    -> return ()
+                [w]   -> do move w sx sy sw sh; io $ raiseWindow d w
+                (w:s) -> do
+                    let lw = floor $ fromIntegral sw * ratio
+                        rw = sw - fromIntegral lw
+                        rh = fromIntegral sh `div` fromIntegral (length s)
+                    move w sx sy (fromIntegral lw) sh
+                    zipWithM_ (\i a -> move a (sx + lw) (sy + i * rh) rw (fromIntegral rh)) [0..] s
+                    whenJust (W.peek ws) (io . raiseWindow d) -- this is always Just
     whenJust (W.peek ws) setFocus
 
+-- | switchLayout.  Switch to another layout scheme.
+switchLayout :: X ()
+switchLayout = do
+    modify (\s -> s {layout = case layout s of
+                                Full -> Tile
+                                Tile -> Full })
+    refresh
+
 -- | windows. Modify the current window list with a pure function, and refresh
 windows :: (WorkSpace -> WorkSpace) -> X ()
 windows f = do
diff --git a/TODO b/TODO
index cf0bedf..8d56c22 100644
--- a/TODO
+++ b/TODO
@@ -2,6 +2,8 @@
     - tiling
     - Refactor to make user configuration reasonable.  There should be one
       file (Config.hs) with all the knobs a user can twist.
+    - Code clean up after tiling and StackSet changes
+    - Make sure the quickchecks make sense with the new StackSet
 
 - think about the statusbar/multithreading.
     Three shared TVars:
@@ -21,16 +23,9 @@
         redraws whenever it finds a change.
 
 - tiling:
-    - StackSet currently holds one stack, it needs to hold two.  One stack
-      contains focus info, the top of that stack is always the window that
-      is in the foreground and has focus.
-
-      The other stack keeps track of window layout order.  In tiling mode,
-      the first window in the stack is in the master area.  In both tiling
-      and full screen mode, window cycling follows the order in this stack.
-
-    - Layout calculation: a simple function from number of windows to list
-      of coordinates.
-
-    - state components, key combos, etc. for changing the current layout
-      scheme
+    - Layout calculation: the current algorithm is crude, windows overlap
+    - make focus remain between workspace switches
+    - change focus in the StackSet structure on EnterNotify
+    - operations to change window order (like dwm's mod+enter)
+    - add 'ratio' to XState, add bindings to change it on the fly
+    - borders (low priority, maybe wait until 0.2)
diff --git a/XMonad.hs b/XMonad.hs
index 0895999..f18460c 100644
--- a/XMonad.hs
+++ b/XMonad.hs
@@ -15,8 +15,8 @@
 --
 
 module XMonad (
-    X, WorkSpace, XState(..), runX,
-    io, withDisplay, isRoot,
+    X, WorkSpace, XState(..), Layout(..),
+    runX, io, withDisplay, isRoot,
     spawn, trace, whenJust
   ) where
 
@@ -43,10 +43,14 @@ data XState = XState
     , wmprotocols   :: {-# UNPACK #-} !Atom
     , dimensions    :: {-# UNPACK #-} !(Int,Int)
     , workspace     :: {-# UNPACK #-} !WorkSpace      -- ^ workspace list
+    , layout        :: {-# UNPACK #-} !Layout
     }
 
 type WorkSpace = StackSet Window
 
+-- | The different layout modes
+data Layout = Full | Tile
+
 -- | The X monad, a StateT transformer over IO encapuslating the window
 -- manager state
 newtype X a = X (StateT XState IO a)