From bc0a97a08790c59062b1d238a6cf1d53afa44034 Mon Sep 17 00:00:00 2001
From: Spencer Janssen <sjanssen@cse.unl.edu>
Date: Wed, 24 Oct 2007 13:02:19 +0200
Subject: Use new terminal config option

darcs-hash:20071024110219-a5988-a8ca4fc9a920d04c71af52adbbe1f85d014f238e.gz
---
 Commands.hs  |  4 ++--
 Run.hs       | 17 ++++++-----------
 SshPrompt.hs |  4 ++--
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/Commands.hs b/Commands.hs
index 26e3cab..bb04e1e 100644
--- a/Commands.hs
+++ b/Commands.hs
@@ -29,7 +29,7 @@ import XMonad
 import Operations
 import StackSet hiding (workspaces)
 import XMonadContrib.Dmenu (dmenu)
-import {-# SOURCE #-} Config (workspaces,serialisedLayouts)
+import {-# SOURCE #-} Config (workspaces,serialisedLayouts, terminal)
 
 import qualified Data.Map as M
 import System.Exit
@@ -84,7 +84,7 @@ defaultCommands = workspaceCommands ++ screenCommands
                      , ("default-layout"      , setLayout (head serialisedLayouts)                 )
                      , ("restart-wm"          , sr >> restart Nothing True                       )
                      , ("restart-wm-no-resume", sr >> restart Nothing False                      )
-                     , ("xterm"               , spawn "xterm"                                    )
+                     , ("xterm"               , spawn terminal                                   )
                      , ("run"                 , spawn "exe=`dmenu_path | dmenu -b` && exec $exe" )
                      , ("kill"                , kill                                             )
                      , ("refresh"             , refresh                                          )
diff --git a/Run.hs b/Run.hs
index 0ce361d..1016cc8 100644
--- a/Run.hs
+++ b/Run.hs
@@ -24,7 +24,6 @@ module XMonadContrib.Run (
                           unsafeSpawn,
                           runInTerm,
                           safeRunInTerm,
-                          runInXTerm,
                           seconds
                          ) where
 
@@ -37,6 +36,7 @@ import System.Exit (ExitCode(ExitSuccess), exitWith)
 import System.IO (IO, FilePath, hPutStr, hGetContents, hFlush, hClose)
 import System.Process (runInteractiveProcess, waitForProcess)
 import XMonad (X, io, spawn)
+import {-# SOURCE #-} Config (terminal)
 
 -- $usage
 -- For an example usage of runInXTerm see XMonadContrib.SshPrompt
@@ -106,15 +106,10 @@ safeSpawn prog arg = io (try (forkProcess $ executeFile prog True [arg] Nothing)
 unsafeSpawn :: String -> X ()
 unsafeSpawn = spawn
 
--- | Run a given program in a given X terminal emulator. This uses safeSpawn.
-safeRunInTerm :: String -> String -> X ()
-safeRunInTerm term command = safeSpawn term ("-e " ++ command)
+-- | Run a given program in the preferred terminal emulator. This uses safeSpawn.
+safeRunInTerm :: String -> X ()
+safeRunInTerm command = safeSpawn terminal ("-e " ++ command)
 
-unsafeRunInTerm, runInTerm :: String -> String -> X ()
-unsafeRunInTerm term command = unsafeSpawn $ term ++ " -e " ++ command
+unsafeRunInTerm, runInTerm :: String -> X ()
+unsafeRunInTerm command = unsafeSpawn $ terminal ++ " -e " ++ command
 runInTerm = unsafeRunInTerm
-
--- | Runs a given program in XTerm, the X terminal emulator included by default in X.org installations.
---   Specializes runInTerm to use XTerm instead of an arbitrary other terminal emulator.
-runInXTerm :: String -> X ()
-runInXTerm = runInTerm "xterm"
diff --git a/SshPrompt.hs b/SshPrompt.hs
index 2db9f74..023bf96 100644
--- a/SshPrompt.hs
+++ b/SshPrompt.hs
@@ -26,7 +26,7 @@ import Data.Maybe (Maybe(..), catMaybes)
 import Data.Set (toList, fromList)
 import System.Directory (doesFileExist)
 import XMonad (X, io)
-import XMonadContrib.Run (runInXTerm)
+import XMonadContrib.Run (runInTerm)
 import XMonadContrib.XPrompt (XPrompt(..), XPConfig, mkXPrompt,
 			     mkComplFunFromList)
 -- $usage
@@ -55,7 +55,7 @@ sshPrompt c = do
   mkXPrompt Ssh c (mkComplFunFromList sc) ssh
 
 ssh :: String -> X ()
-ssh s = runInXTerm ("ssh " ++ s)
+ssh s = runInTerm ("ssh " ++ s)
 
 sshComplList :: IO [String]
 sshComplList =  (sort . toList . fromList) `fmap` liftM2 (++) sshComplListLocal sshComplListGlobal
-- 
cgit v1.2.3