From 30c6cf7152ac88c49527a84f6e95f0731b64f03a Mon Sep 17 00:00:00 2001
From: Jose Antonio Ortega Ruiz <jao@gnu.org>
Date: Thu, 30 Aug 2012 01:37:44 +0200
Subject: Revert "Add '-d' for dockapp mode"

This reverts commit cae6f2bc049d4b7ed57a7a18a828bc4ea35df4aa, until we
find a reason why it's causing high CPU consumption in the X server.
---
 readme.md     | 1 -
 src/Config.hs | 1 -
 src/Main.hs   | 3 ---
 src/Window.hs | 2 --
 4 files changed, 7 deletions(-)

diff --git a/readme.md b/readme.md
index 1b6346d..4ea51ce 100644
--- a/readme.md
+++ b/readme.md
@@ -299,7 +299,6 @@ xmobar --help):
       -F fg color   --fgcolor=fg color     The foreground color. Default grey
       -o            --top                  Place xmobar at the top of the screen
       -b            --bottom               Place xmobar at the bottom of the screen
-      -d            --dock                 Place xmobar in the dock
       -a alignsep   --alignsep=alignsep    Separators for left, center and right text
                                            alignment. Default: '}{'
       -s char       --sepchar=char         The character used to separate commands in
diff --git a/src/Config.hs b/src/Config.hs
index 97040f1..a6ad3e2 100644
--- a/src/Config.hs
+++ b/src/Config.hs
@@ -77,7 +77,6 @@ data XPosition = Top
                | BottomSize Align Int Int
                | Static {xpos, ypos, width, height :: Int}
                | OnScreen Int XPosition
-               | Docked
                  deriving ( Read, Eq )
 
 data Align = L | R | C deriving ( Read, Eq )
diff --git a/src/Main.hs b/src/Main.hs
index aa6ac1d..5ef5db6 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -100,7 +100,6 @@ data Opts = Help
           | FgColor    String
           | T
           | B
-          | D
           | AlignSep   String
           | Commands   String
           | AddCommand String
@@ -118,7 +117,6 @@ options =
     , Option ['F'     ] ["fgcolor"     ] (ReqArg FgColor    "fg color" ) "The foreground color. Default grey"
     , Option ['o'     ] ["top"         ] (NoArg  T                     ) "Place xmobar at the top of the screen"
     , Option ['b'     ] ["bottom"      ] (NoArg  B                     ) "Place xmobar at the bottom of the screen"
-    , Option ['d'     ] ["dock"        ] (NoArg  D                     ) "Place xmobar in the dock"
     , Option ['a'     ] ["alignsep"    ] (ReqArg AlignSep   "alignsep" ) "Separators for left, center and right text\nalignment. Default: '}{'"
     , Option ['s'     ] ["sepchar"     ] (ReqArg SepChar    "char"     ) "The character used to separate commands in\nthe output template. Default '%'"
     , Option ['t'     ] ["template"    ] (ReqArg Template   "template" ) "The output template"
@@ -164,7 +162,6 @@ doOpts conf (o:oo) =
       FgColor  s   -> doOpts (conf {fgColor  = s     }) oo
       T            -> doOpts (conf {position = Top   }) oo
       B            -> doOpts (conf {position = Bottom}) oo
-      D            -> doOpts (conf {position = Docked}) oo
       AlignSep s   -> doOpts (conf {alignSep = s     }) oo
       SepChar  s   -> doOpts (conf {sepChar  = s     }) oo
       Template s   -> doOpts (conf {template = s     }) oo
diff --git a/src/Window.hs b/src/Window.hs
index d08e445..9b0c506 100644
--- a/src/Window.hs
+++ b/src/Window.hs
@@ -66,7 +66,6 @@ setPosition p rs ht =
     BottomSize a i ch  -> (Rectangle (ax a i) (ny' ch) (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
-    Docked -> (Rectangle rx ry rw h, False)
   where
     (scr@(Rectangle rx ry rw rh), p') =
       case p of OnScreen i x -> (fromMaybe (head rs) $ safeIndex i rs, x)
@@ -119,7 +118,6 @@ getStrutValues r@(Rectangle x y w h) p rwh =
     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
-    Docked          -> getStaticStrutValues p rwh
     where st = fi y + fi h
           sb = rwh - fi y
           nx = fi x
-- 
cgit v1.2.3