diff options
author | makefu <github@syntax-fehler.de> | 2018-11-30 23:19:32 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2018-11-30 23:19:32 +0100 |
commit | b8db7293383772b936b6937cc05b5588021ca693 (patch) | |
tree | 74cd0a8da1fd703080697bed04ffc1a8279a60ae /tv/5pkgs/simple/xmonad-tv/default.nix | |
parent | 861d4481f710d60d0d84aa8b1f8997f7fc18890d (diff) | |
parent | 7f5431a4999fea9626df300f707aa8c62de894e3 (diff) |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv/5pkgs/simple/xmonad-tv/default.nix')
-rw-r--r-- | tv/5pkgs/simple/xmonad-tv/default.nix | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/tv/5pkgs/simple/xmonad-tv/default.nix b/tv/5pkgs/simple/xmonad-tv/default.nix index ab4be91f..edfee98a 100644 --- a/tv/5pkgs/simple/xmonad-tv/default.nix +++ b/tv/5pkgs/simple/xmonad-tv/default.nix @@ -19,10 +19,7 @@ pkgs.writeHaskellPackage "xmonad-tv" { module Main where -import System.IO.Error (isDoesNotExistError, tryIOError) import System.Exit (exitFailure) -import Control.Monad (forever) -import Control.Concurrent (threadDelay) import Control.Exception import Control.Monad.Extra (whenJustM) @@ -32,8 +29,6 @@ import XMonad import System.IO (hPutStrLn, stderr) import System.Environment (getArgs, getEnv, getEnvironment, lookupEnv) import System.Posix.Process (executeFile) -import System.Posix.Signals (nullSignal, signalProcess) -import System.Posix.Types (ProcessID) import XMonad.Actions.DynamicWorkspaces ( addWorkspacePrompt, renameWorkspace , removeEmptyWorkspace) import XMonad.Actions.GridSelect @@ -65,26 +60,13 @@ myFont = "-schumacher-*-*-*-*-*-*-*-*-*-*-*-iso10646-*" main :: IO () main = getArgs >>= \case [] -> mainNoArgs - ["--shutdown", pidArg] -> mainShutdown (read pidArg) + ["--shutdown"] -> shutdown args -> hPutStrLn stderr ("bad arguments: " <> show args) >> exitFailure -mainShutdown :: ProcessID -> IO () -mainShutdown pid = do - sendShutdownEvent - hPutStrLn stderr ("waiting for: " <> show pid) - result <- tryIOError (waitProcess pid) - if isSuccess result - then hPutStrLn stderr ("result: " <> show result <> " [AKA success^_^]") - else hPutStrLn stderr ("result: " <> show result) - where - isSuccess = either isDoesNotExistError (const False) - -waitProcess :: ProcessID -> IO () -waitProcess pid = forever (signalProcess nullSignal pid >> threadDelay 10000) - mainNoArgs :: IO () mainNoArgs = do workspaces0 <- getWorkspaces0 + handleShutdownEvent <- newShutdownEventHandler xmonad $ withUrgencyHook (SpawnUrgencyHook "echo emit Urgency ") $ def |