From bc0a97a08790c59062b1d238a6cf1d53afa44034 Mon Sep 17 00:00:00 2001 From: Spencer Janssen Date: Wed, 24 Oct 2007 13:02:19 +0200 Subject: Use new terminal config option darcs-hash:20071024110219-a5988-a8ca4fc9a920d04c71af52adbbe1f85d014f238e.gz --- Run.hs | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'Run.hs') 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" -- cgit v1.2.3