From 207a0912b26c906af60e9f2a0261c3b2c5989c76 Mon Sep 17 00:00:00 2001
From: Don Stewart <dons@cse.unsw.edu.au>
Date: Wed, 11 Apr 2007 10:07:47 +0200
Subject: clean up tiling code a teensy bit, and comment on the interaction
 between focus, master, and cycling direction between the modes

darcs-hash:20070411080747-9c5c1-0f6e9cc92481db8ba812976ee8d3cb0f7dde6626.gz
---
 Operations.hs | 19 ++++++++++++++-----
 XMonad.hs     |  6 +++---
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Operations.hs b/Operations.hs
index 6118593..333ea19 100644
--- a/Operations.hs
+++ b/Operations.hs
@@ -6,6 +6,7 @@ import Data.Bits
 import qualified Data.Map as M
 
 import Control.Monad.State
+import Control.Arrow
 
 import System.Posix.Process
 import System.Environment
@@ -41,6 +42,7 @@ refresh = do
 
 -- | tile.  Compute the positions for windows in horizontal layout
 -- mode.
+--
 tile :: Rational -> Rectangle -> [Window] -> [(Window, Rectangle)]
 tile _ _ []    = []
 tile _ d [w]   = [(w, d)]
@@ -54,16 +56,23 @@ tile r (Rectangle sx sy sw sh) (w:s)
 
 -- | vtile. Tile vertically.
 vtile :: Rational -> Rectangle -> [Window] -> [(Window, Rectangle)]
-vtile r rect ws = map (\(w, wr) -> (w, flipRect wr)) $ tile r (flipRect rect) ws
+vtile r rect = map (second flipRect) . tile r (flipRect rect)
 
+-- | Flip rectangles around
 flipRect :: Rectangle -> Rectangle
-flipRect (Rectangle { rect_x = rx, rect_y = ry, rect_width = rw, rect_height = rh })
-        = Rectangle { rect_x = ry, rect_y = rx, rect_width = rh, rect_height = rw }
+flipRect (Rectangle rx ry rw rh) = (Rectangle ry rx rh rw)
 
 -- | switchLayout.  Switch to another layout scheme.  Switches the
--- current workspace.
+-- current workspace. By convention, a window set as master in Tall mode
+-- remains as master in Wide mode. When switching from full screen to a
+-- tiling mode, the currently focused window becomes a master. When
+-- switching back , the focused window is uppermost.
+--
+-- Note a current `feature' is that 'promote' cycles clockwise in Tall
+-- mode, and counter clockwise in wide mode. This is a feature.
+--
 switchLayout :: X ()
-switchLayout = layout $ \fl -> fl { layoutType = rot (layoutType fl) }
+switchLayout = layout $ \fl -> fl { layoutType = rotateLayout (layoutType fl) }
 
 -- | changeSplit.  Changes the window split.
 changeSplit :: Rational -> X ()
diff --git a/XMonad.hs b/XMonad.hs
index 642a038..0de51ed 100644
--- a/XMonad.hs
+++ b/XMonad.hs
@@ -17,7 +17,7 @@
 module XMonad (
     X, WorkSpace, XState(..), Layout(..), LayoutDesc(..),
     runX, io, withDisplay, isRoot,
-    spawn, trace, whenJust, rot
+    spawn, trace, whenJust, rotateLayout
   ) where
 
 import StackSet (StackSet,WorkspaceId)
@@ -80,8 +80,8 @@ isRoot w = liftM (w==) (gets theRoot)
 data Layout = Full | Tall | Wide deriving (Enum, Bounded, Eq)
 
 -- | 'rot' for Layout.
-rot :: Layout -> Layout
-rot x = if x == maxBound then minBound else succ x
+rotateLayout :: Layout -> Layout
+rotateLayout x = if x == maxBound then minBound else succ x
 
 -- | A full description of a particular workspace's layout parameters.
 data LayoutDesc = LayoutDesc { layoutType   :: !Layout
-- 
cgit v1.2.3