summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan O'Rear <stefanor@cox.net>2007-06-04 06:47:15 +0200
committerStefan O'Rear <stefanor@cox.net>2007-06-04 06:47:15 +0200
commit2e316bbf05b78c15cd7e624a1e9814b662ce4600 (patch)
tree9ef0881e02b64f47af1bc6e67ea31c8cce38e25a
parent4af6ab52d6d43e652f5b6bf2a53aabba58d690e1 (diff)
downloadmetatile-2e316bbf05b78c15cd7e624a1e9814b662ce4600.tar
metatile-2e316bbf05b78c15cd7e624a1e9814b662ce4600.zip
Remove no-longer-needed 'dimensions' state (-5 loc)
darcs-hash:20070604044715-e3110-7bd7ba2b78f80046e2148fb37aa0f5fe3eca08c6
-rw-r--r--Main.hs4
-rw-r--r--Operations.hs7
-rw-r--r--XMonad.hs1
3 files changed, 2 insertions, 10 deletions
diff --git a/Main.hs b/Main.hs
index 38ac301..490da13 100644
--- a/Main.hs
+++ b/Main.hs
@@ -59,9 +59,7 @@ main = do
{ windowset = winset
, layouts = M.fromList [(w, safeLayouts) | w <- [0 .. W workspaces - 1]]
, statusGaps = take (length xinesc) $ defaultGaps ++ repeat (0,0,0,0)
- , xineScreens = xinesc
- , dimensions = (fromIntegral (displayWidth dpy dflt),
- fromIntegral (displayHeight dpy dflt)) }
+ , xineScreens = xinesc }
xSetErrorHandler -- in C, I'm too lazy to write the binding: dons
diff --git a/Operations.hs b/Operations.hs
index 79ccbcc..f419edf 100644
--- a/Operations.hs
+++ b/Operations.hs
@@ -235,12 +235,7 @@ rescreen :: X ()
rescreen = do
xinesc <- withDisplay (io . getScreenInfo)
- -- TODO: This stuff is necessary because Xlib apparently caches screen
- -- width/height. Find a better solution later. I hate Xlib.
- let sx = maximum $ map (\r -> rect_x r + fromIntegral (rect_width r)) xinesc
- sy = maximum $ map (\r -> rect_y r + fromIntegral (rect_height r)) xinesc
-
- modify (\s -> s { xineScreens = xinesc , dimensions = (sx, sy)
+ modify (\s -> s { xineScreens = xinesc
, statusGaps = take (length xinesc) $ (statusGaps s) ++ repeat (0,0,0,0) })
windows $ \ws@(W.StackSet { W.current = v, W.visible = vs, W.hidden = hs }) ->
diff --git a/XMonad.hs b/XMonad.hs
index 7fafa7c..8cf9b95 100644
--- a/XMonad.hs
+++ b/XMonad.hs
@@ -40,7 +40,6 @@ import qualified Data.Map as M
data XState = XState
{ windowset :: !WindowSet -- ^ workspace list
, xineScreens :: ![Rectangle] -- ^ dimensions of each screen
- , dimensions :: !(Position,Position) -- ^ dimensions of the screen,
, statusGaps :: ![(Int,Int,Int,Int)] -- ^ width of status bar on each screen
, layouts :: !(M.Map WorkspaceId (Layout, [Layout])) }
-- ^ mapping of workspaces to descriptions of their layouts