summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2012-08-30 01:37:44 +0200
committerJose Antonio Ortega Ruiz <jao@gnu.org>2012-08-30 01:37:44 +0200
commit30c6cf7152ac88c49527a84f6e95f0731b64f03a (patch)
treefbac4f1ea30d8f5552b7c0a4020f3495f36a7b89 /src
parentf7076307b7e896e6d776e319fddff860b63f735f (diff)
downloadxmobar-30c6cf7152ac88c49527a84f6e95f0731b64f03a.tar.gz
xmobar-30c6cf7152ac88c49527a84f6e95f0731b64f03a.tar.bz2
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.
Diffstat (limited to 'src')
-rw-r--r--src/Config.hs1
-rw-r--r--src/Main.hs3
-rw-r--r--src/Window.hs2
3 files changed, 0 insertions, 6 deletions
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