summaryrefslogtreecommitdiffstats
path: root/Main.hs
diff options
context:
space:
mode:
authorJason Creighton <jcreigh@gmail.com>2007-06-14 01:45:01 +0200
committerJason Creighton <jcreigh@gmail.com>2007-06-14 01:45:01 +0200
commitd7ca1516bb87fe7af4e2a55f732ebe6397696a20 (patch)
tree4de8b9bc920c610af0322dbb6875392d35fa3990 /Main.hs
parentd4e4bbd446af37c96d5877486304dd929f3387b8 (diff)
downloadmetatile-d7ca1516bb87fe7af4e2a55f732ebe6397696a20.tar
metatile-d7ca1516bb87fe7af4e2a55f732ebe6397696a20.zip
move initColor to Operations and only store the Pixel value of colors
Moving initColor to Operations allows it to be used by extensions. The Pixel component of the color is the only thing we need, so it's simpler just to deal with that. darcs-hash:20070613234501-b9aa7-5b39416db9f9d5ac42692262c233179baeb2540f
Diffstat (limited to 'Main.hs')
-rw-r--r--Main.hs5
1 files changed, 2 insertions, 3 deletions
diff --git a/Main.hs b/Main.hs
index 0d0a442..bf1402f 100644
--- a/Main.hs
+++ b/Main.hs
@@ -42,12 +42,11 @@ main :: IO ()
main = do
dpy <- openDisplay ""
let dflt = defaultScreen dpy
- initcolor c = fst `liftM` allocNamedColor dpy (defaultColormap dpy dflt) c
rootw <- rootWindow dpy dflt
xinesc <- getScreenInfo dpy
- nbc <- initcolor normalBorderColor
- fbc <- initcolor focusedBorderColor
+ nbc <- initColor dpy normalBorderColor
+ fbc <- initColor dpy focusedBorderColor
hSetBuffering stdout NoBuffering
args <- getArgs