add positions with height information

Ignore-this: 1244d13c44610fc3b1d9b73a0ebfac59

darcs-hash:20091230074604-76d51-a3415c7365aa22dfb9891cc6bb5c5ef4e726a805.gz

3 files changed, 18 insertions, 7 deletions

diff --git a/Config.hs b/Config.hs
index 4873711..36c1c85 100644
--- a/Config.hs
+++ b/Config.hs
@@ -58,8 +58,10 @@ data Config =
 
 data XPosition = Top
                | TopW Align Int
+               | TopSize Align Int Int
                | Bottom
                | BottomW Align Int
+               | BottomSize Align Int Int
                | Static {xpos, ypos, width, height :: Int}
                | OnScreen Int XPosition
                  deriving ( Read, Eq )
diff --git a/README b/README
index 73cc81b..1278468 100644
--- a/README
+++ b/README
@@ -131,13 +131,18 @@ Other configuration options:
 :    Default font color.
 
 `position`
-:     Top, TopW, Bottom, BottomW or Static (with x, y, width and height).
+:     Top, TopW, TopSize, Bottom, BottomW, BottomSize or Static (with x, y,
+      width and height).
 
 :     TopW and BottomW take 2 arguments: an alignment parameter (L for
       left, C for centered, R for Right) and an integer for the
       percentage width xmobar window will have in respect to the
       screen width.
 
+:     TopSize and BottomSize take 3 arguments: an alignment parameter, an
+      integer for the percentage width, and an integer for the minimum pixel
+      height that the xmobar window will have.
+
 :     For example:
 
 :          position = BottomW C 75
diff --git a/Xmobar.hs b/Xmobar.hs
index 898bd2e..7128074 100644
--- a/Xmobar.hs
+++ b/Xmobar.hs
@@ -147,13 +147,11 @@ setPosition :: XPosition -> [Rectangle] -> Dimension -> (Rectangle,Bool)
 setPosition p rs ht =
     case p' of
     Top                -> (Rectangle rx          ry      rw      h     , True)
-    TopW L i           -> (Rectangle rx          ry     (nw i)   h     , True)
-    TopW R i           -> (Rectangle (right  i)  ry     (nw i)   h     , True)
-    TopW C i           -> (Rectangle (center i)  ry     (nw i)   h     , True)
+    TopW a i           -> (Rectangle (ax a i  )  ry     (nw i )  h     , True)
+    TopSize a i ch     -> (Rectangle (ax a i  )  ry     (nw i ) (mh ch), True)
     Bottom             -> (Rectangle rx          ny      rw      h     , True)
-    BottomW L i        -> (Rectangle rx          ny     (nw i)   h     , True)
-    BottomW R i        -> (Rectangle (right  i)  ny     (nw i)   h     , True)
-    BottomW C i        -> (Rectangle (center i)  ny     (nw i)   h     , True)
+    BottomW a i        -> (Rectangle (ax a i  )  ny     (nw i )  h     , True)
+    BottomSize a i ch  -> (Rectangle (ax a i  )  ny     (nw i ) (mh ch), True)
     Static cx cy cw ch -> (Rectangle (fi cx   ) (fi cy) (fi cw) (fi ch), True)
     OnScreen _ p''     -> setPosition p'' [scr] ht
     where
@@ -164,9 +162,13 @@ setPosition p rs ht =
       center i = rx + (fi $ div (remwid i) 2)
       right  i = rx + (fi $ remwid i)
       remwid i = rw - pw (fi i)
+      ax L     = const rx
+      ax R     = right
+      ax C     = center
       pw i     = rw * (min 100 i) `div` 100
       nw       = fi . pw . fi
       h        = fi ht
+      mh h'    = max (fi h') h
 
       safeIndex i = lookup i . zip [0..]
 
@@ -192,8 +194,10 @@ getStrutValues r@(Rectangle x y w h) p rwh =
     OnScreen _ p'   -> getStrutValues r p' rwh
     Top             -> [0, 0, st,  0, 0, 0, 0, 0, nx, nw,  0,  0]
     TopW    _ _     -> [0, 0, st,  0, 0, 0, 0, 0, nx, nw,  0,  0]
+    TopSize      {} -> [0, 0, st,  0, 0, 0, 0, 0, nx, nw,  0,  0]
     Bottom          -> [0, 0,  0, sb, 0, 0, 0, 0,  0,  0, nx, nw]
     BottomW _ _     -> [0, 0,  0, sb, 0, 0, 0, 0,  0,  0, nx, nw]
+    BottomSize   {} -> [0, 0,  0, sb, 0, 0, 0, 0,  0,  0, nx, nw]
     Static _ _ _ _  -> getStaticStrutValues p rwh
     where st = fi y + fi h
           sb = rwh - fi y