From 23956e063b42e4d6d020b6d9d661eba5a703da5f Mon Sep 17 00:00:00 2001 From: ndwarshuis Date: Tue, 27 Dec 2022 14:18:56 -0500 Subject: [PATCH] REF get rid of dead code --- bin/xmonad.hs | 1 - lib/XMonad/Internal/Command/Desktop.hs | 1 - lib/XMonad/Internal/Command/Power.hs | 2 -- lib/XMonad/Internal/Process.hs | 26 +++++++++++++------------- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/bin/xmonad.hs b/bin/xmonad.hs index 55a160e..f01daaa 100644 --- a/bin/xmonad.hs +++ b/bin/xmonad.hs @@ -203,7 +203,6 @@ evalConf db@DBusState { dbSysClient = cl } = do startDBusInterfaces fs = mapM_ (\f -> executeSometimes $ f $ dbSesClient db) $ fsDBusExporters fs startChildDaemons fs = do - -- (h, p) <- io $ spawnPipe "xmobar" (h, _, _, p) <- io $ createProcess $ (shell "xmobar") { std_in = CreatePipe } io $ case h of Just h' -> hSetBuffering h' LineBuffering diff --git a/lib/XMonad/Internal/Command/Desktop.hs b/lib/XMonad/Internal/Command/Desktop.hs index ebd16bc..b5270a0 100644 --- a/lib/XMonad/Internal/Command/Desktop.hs +++ b/lib/XMonad/Internal/Command/Desktop.hs @@ -257,7 +257,6 @@ runNetAppDaemon cl = Sometimes "network applet" xpfVPN where tree = toAnd_ app $ Bus networkManagerPkgs networkManagerBus app = DBusIO $ sysExe [Package Official "network-manager-applet"] "nm-applet" - -- cmd _ = snd <$> spawnPipe "nm-applet" cmd _ = spawnProcess "nm-applet" [] runToggleBluetooth :: Maybe SysClient -> SometimesX diff --git a/lib/XMonad/Internal/Command/Power.hs b/lib/XMonad/Internal/Command/Power.hs index 3cb9128..df4b86a 100644 --- a/lib/XMonad/Internal/Command/Power.hs +++ b/lib/XMonad/Internal/Command/Power.hs @@ -45,7 +45,6 @@ import System.IO.Error import System.Process (ProcessHandle, spawnProcess) import XMonad.Core --- import XMonad.Internal.Process (spawnPipeArgs) import XMonad.Internal.Shell import qualified XMonad.Internal.Theme as XT import XMonad.Prompt @@ -96,7 +95,6 @@ runAutolock = sometimesIO_ "automatic screen lock" "xss-lock" tree cmd where tree = And_ (Only_ $ sysExe [Package Official "xss-lock"] "xss-lock") $ Only_ $ IOSometimes_ runScreenLock - -- cmd = snd <$> spawnPipeArgs "xss-lock" ["--ignore-sleep", "screenlock"] cmd = spawnProcess "xss-lock" ["--ignore-sleep", "screenlock"] -------------------------------------------------------------------------------- diff --git a/lib/XMonad/Internal/Process.hs b/lib/XMonad/Internal/Process.hs index 9d92e8b..79f3d21 100644 --- a/lib/XMonad/Internal/Process.hs +++ b/lib/XMonad/Internal/Process.hs @@ -4,9 +4,9 @@ module XMonad.Internal.Process ( waitUntilExit , killHandle - , spawnPipe' - , spawnPipe - , spawnPipeArgs + -- , spawnPipe' + -- , spawnPipe + -- , spawnPipeArgs , createProcess' , readCreateProcessWithExitCode' , proc' @@ -82,15 +82,15 @@ spawn = io . void . createProcess' . shell' spawnAt :: MonadIO m => FilePath -> String -> m () spawnAt fp cmd = io $ void $ createProcess' $ (shell' cmd) { cwd = Just fp } -spawnPipe' :: CreateProcess -> IO (Handle, ProcessHandle) -spawnPipe' cp = do - -- ASSUME creating a pipe will always succeed in making a Just Handle - (Just h, _, _, p) <- createProcess' $ cp { std_in = CreatePipe } - hSetBuffering h LineBuffering - return (h, p) +-- spawnPipe' :: CreateProcess -> IO (Handle, ProcessHandle) +-- spawnPipe' cp = do +-- -- ASSUME creating a pipe will always succeed in making a Just Handle +-- (Just h, _, _, p) <- createProcess' $ cp { std_in = CreatePipe } +-- hSetBuffering h LineBuffering +-- return (h, p) -spawnPipe :: String -> IO (Handle, ProcessHandle) -spawnPipe = spawnPipe' . shell +-- spawnPipe :: String -> IO (Handle, ProcessHandle) +-- spawnPipe = spawnPipe' . shell -spawnPipeArgs :: FilePath -> [String] -> IO (Handle, ProcessHandle) -spawnPipeArgs cmd = spawnPipe' . proc cmd +-- spawnPipeArgs :: FilePath -> [String] -> IO (Handle, ProcessHandle) +-- spawnPipeArgs cmd = spawnPipe' . proc cmd