From af1ff15bc43bd1ddcae94237bce560c1251a569d Mon Sep 17 00:00:00 2001
From: daniel <daniel@wagner-home.com>
Date: Sat, 14 Nov 2009 03:36:16 +0100
Subject: generalize IO actions to MonadIO m

Ignore-this: 2c801a27b0ffee34a2f0daca3778613a

This should not cause any working configs to stop working, because IO is an instance of MonadIO, and because complete configs will pin down the type of the call to IO.  Note that XMonad.Config.Arossato is not a complete config, and so it needed some tweaks; with a main function, this should not be a problem.

darcs-hash:20091114023616-c98ca-0a233cc53c41986845db4300530ec4f9e4d52a37.gz
---
 XMonad/Config/Arossato.hs |  3 ++-
 XMonad/Prompt/Email.hs    |  2 +-
 XMonad/Util/Dmenu.hs      |  4 ++--
 XMonad/Util/Dzen.hs       |  2 +-
 XMonad/Util/Run.hs        | 12 ++++++------
 5 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'XMonad')

diff --git a/XMonad/Config/Arossato.hs b/XMonad/Config/Arossato.hs
index 4aa0087..fb4b5f2 100644
--- a/XMonad/Config/Arossato.hs
+++ b/XMonad/Config/Arossato.hs
@@ -1,4 +1,5 @@
-{-# OPTIONS_GHC -fglasgow-exts -fno-warn-missing-signatures #-}
+{-# OPTIONS_GHC -fno-warn-missing-signatures #-}
+{-# LANGUAGE NoMonomorphismRestriction #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonad.Config.Arossato
diff --git a/XMonad/Prompt/Email.hs b/XMonad/Prompt/Email.hs
index 99c1e8f..a0eb72e 100644
--- a/XMonad/Prompt/Email.hs
+++ b/XMonad/Prompt/Email.hs
@@ -59,5 +59,5 @@ emailPrompt c addrs =
     inputPromptWithCompl c "To" (mkComplFunFromList addrs) ?+ \to ->
     inputPrompt c "Subject" ?+ \subj ->
     inputPrompt c "Body" ?+ \body ->
-    io $ runProcessWithInput "mail" ["-s", subj, to] (body ++ "\n")
+    runProcessWithInput "mail" ["-s", subj, to] (body ++ "\n")
          >> return ()
diff --git a/XMonad/Util/Dmenu.hs b/XMonad/Util/Dmenu.hs
index fffba07..162e644 100644
--- a/XMonad/Util/Dmenu.hs
+++ b/XMonad/Util/Dmenu.hs
@@ -37,13 +37,13 @@ import XMonad.Util.Run
 dmenuXinerama :: [String] -> X String
 dmenuXinerama opts = do
     curscreen <- (fromIntegral . W.screen . W.current) `fmap` gets windowset :: X Int
-    io $ runProcessWithInput "dmenu" ["-xs", show (curscreen+1)] (unlines opts)
+    runProcessWithInput "dmenu" ["-xs", show (curscreen+1)] (unlines opts)
 
 dmenu :: [String] -> X String
 dmenu opts = menu "dmenu" opts
 
 menu :: String -> [String] -> X String
-menu menuCmd opts = io $ runProcessWithInput menuCmd [] (unlines opts)
+menu menuCmd opts = runProcessWithInput menuCmd [] (unlines opts)
 
 menuMap :: String -> M.Map String a -> X (Maybe a)
 menuMap menuCmd selectionMap = do
diff --git a/XMonad/Util/Dzen.hs b/XMonad/Util/Dzen.hs
index 617e785..793d205 100644
--- a/XMonad/Util/Dzen.hs
+++ b/XMonad/Util/Dzen.hs
@@ -34,7 +34,7 @@ dzen str timeout = dzenWithArgs str [] timeout
 --
 -- > dzenWithArgs "Hi, dons!" ["-ta", "r"] (5 `seconds`)
 dzenWithArgs :: String -> [String] -> Int -> X ()
-dzenWithArgs str args timeout = io $ runProcessWithInputAndWait "dzen2" args (unchomp str) timeout
+dzenWithArgs str args timeout = runProcessWithInputAndWait "dzen2" args (unchomp str) timeout
   -- dzen seems to require the input to terminate with exactly one newline.
   where unchomp s@['\n'] = s
         unchomp []       = ['\n']
diff --git a/XMonad/Util/Run.hs b/XMonad/Util/Run.hs
index 2966053..1e82b55 100644
--- a/XMonad/Util/Run.hs
+++ b/XMonad/Util/Run.hs
@@ -52,8 +52,8 @@ import Control.Monad
 -- "XMonad.Util.Dzen"
 
 -- | Returns the output.
-runProcessWithInput :: FilePath -> [String] -> String -> IO String
-runProcessWithInput cmd args input = do
+runProcessWithInput :: MonadIO m => FilePath -> [String] -> String -> m String
+runProcessWithInput cmd args input = io $ do
     (pin, pout, perr, _) <- runInteractiveProcess cmd args Nothing Nothing
     hPutStr pin input
     hClose pin
@@ -65,8 +65,8 @@ runProcessWithInput cmd args input = do
     return output
 
 -- | Wait is in µs (microseconds)
-runProcessWithInputAndWait :: FilePath -> [String] -> String -> Int -> IO ()
-runProcessWithInputAndWait cmd args input timeout = do
+runProcessWithInputAndWait :: MonadIO m => FilePath -> [String] -> String -> Int -> m ()
+runProcessWithInputAndWait cmd args input timeout = io $ do
     forkProcess $ do
         (pin, pout, perr, _) <- runInteractiveProcess cmd args Nothing Nothing
         hPutStr pin input
@@ -129,8 +129,8 @@ safeRunInTerm :: String -> String -> X ()
 safeRunInTerm options command = asks (terminal . config) >>= \t -> safeSpawn t [options, " -e " ++ command]
 
 -- | Launch an external application through the system shell and return a @Handle@ to its standard input.
-spawnPipe :: String -> IO Handle
-spawnPipe x = do
+spawnPipe :: MonadIO m => String -> m Handle
+spawnPipe x = io $ do
     (rd, wr) <- createPipe
     setFdOption wr CloseOnExec True
     h <- fdToHandle wr
-- 
cgit v1.2.3