summaryrefslogtreecommitdiffhomepage
path: root/src/Main.hs
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2011-09-19 00:16:46 +0200
committerJose Antonio Ortega Ruiz <jao@gnu.org>2011-09-19 00:16:46 +0200
commitd0a216d89697f900729fd427a8dd833a123a6c25 (patch)
tree8a5f7cabf1335aeb3b64a15c3676c2bc02ea0b76 /src/Main.hs
parentf9f6390c7399bb67c2e965e7cf28a889ff986198 (diff)
parent8833a8166387075d75ee15690a58cbd2aacf2a67 (diff)
downloadxmobar-d0a216d89697f900729fd427a8dd833a123a6c25.tar.gz
xmobar-d0a216d89697f900729fd427a8dd833a123a6c25.tar.bz2
Merge branch 'screen_update' of git://github.com/skinner33/xmobar into skinner-screen_update
Conflicts: NEWS src/XUtil.hsc
Diffstat (limited to 'src/Main.hs')
-rw-r--r--src/Main.hs5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/Main.hs b/src/Main.hs
index 18e05e2..e8efd61 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -41,6 +41,7 @@ import Control.Monad (unless)
-- | The main entry point
main :: IO ()
main = do
+ initThreads
d <- openDisplay ""
args <- getArgs
(o,file) <- getOpts args
@@ -51,10 +52,6 @@ main = do
unless (null defaultings) $ putStrLn $ "Fields missing from config defaulted: "
++ intercalate "," defaultings
- -- listen for ConfigureEvents on the root window, for xrandr support:
- rootw <- rootWindow d (defaultScreen d)
- selectInput d rootw structureNotifyMask
-
conf <- doOpts c o
fs <- initFont d (font conf)
cls <- mapM (parseTemplate conf) (splitTemplate conf)