summaryrefslogtreecommitdiffstats
path: root/XMonad
diff options
context:
space:
mode:
Diffstat (limited to 'XMonad')
-rw-r--r--XMonad/Config.hs2
-rw-r--r--XMonad/Core.hs16
2 files changed, 6 insertions, 12 deletions
diff --git a/XMonad/Config.hs b/XMonad/Config.hs
index da00e1d..e0429da 100644
--- a/XMonad/Config.hs
+++ b/XMonad/Config.hs
@@ -207,7 +207,7 @@ keys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
-- quit, or restart
, ((modMask .|. shiftMask, xK_q ), io (exitWith ExitSuccess)) -- %! Quit xmonad
- , ((modMask , xK_q ), restart (Just "xmonad") True) -- %! Restart xmonad
+ , ((modMask , xK_q ), restart "xmonad" True) -- %! Restart xmonad
]
++
-- mod-[1..9] %! Switch to workspace N
diff --git a/XMonad/Core.hs b/XMonad/Core.hs
index d2195d6..ee16f9c 100644
--- a/XMonad/Core.hs
+++ b/XMonad/Core.hs
@@ -43,7 +43,6 @@ import System.Posix.Process (executeFile, forkProcess, getProcessStatus, createS
import System.Process
import System.Directory
import System.Exit
-import System.Environment
import Graphics.X11.Xlib
import Graphics.X11.Xlib.Extras (Event)
import Data.Typeable
@@ -321,19 +320,14 @@ runOnWorkspaces job =do
$ current ws : visible ws
modify $ \s -> s { windowset = ws { current = c, visible = v, hidden = h } }
--- | Restart xmonad via exec().
+-- | @restart name resume@. Attempt to restart xmonad by executing the program
+-- @name@. If @resume@ is 'True', restart with the current window state.
+-- When executing another window manager, @resume@ should be 'False'.
--
--- If the first parameter is 'Just name', restart will attempt to execute the
--- program corresponding to 'name'. Otherwise, xmonad will attempt to execute
--- the name of the current program.
---
--- When the second parameter is 'True', xmonad will attempt to resume with the
--- current window state.
-restart :: Maybe String -> Bool -> X ()
-restart mprog resume = do
+restart :: String -> Bool -> X ()
+restart prog resume = do
broadcastMessage ReleaseResources
io . flush =<< asks display
- prog <- maybe (io getProgName) return mprog
args <- if resume then gets (("--resume":) . return . showWs . windowset) else return []
catchIO (executeFile prog True args Nothing)
where showWs = show . mapLayout show