twin/xmonad
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad.git synced 2025-05-19 08:30:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

Pester the user with one (not two) xmessages on config errors

Browse Source
This commit is contained in:
Adam Vogt 2009-03-21 23:37:36 +00:00
parent d9d3e40112
commit 66e7715ea6
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Main.hs
View File

@ -16,10 +16,12 @@ module Main (main) where
import XMonad import XMonad
import Control.Monad (unless)
import System.IO import System.IO
import System.Info import System.Info
import System.Environment import System.Environment
import System.Posix.Process (executeFile) import System.Posix.Process (executeFile)
import System.Exit (exitFailure)
import Paths_xmonad (version) import Paths_xmonad (version)
import Data.Version (showVersion) import Data.Version (showVersion)
@ -39,7 +41,7 @@ main = do
[] -> launch [] -> launch
["--resume", _] -> launch ["--resume", _] -> launch
["--help"] -> usage ["--help"] -> usage
["--recompile"] -> recompile True >> return () ["--recompile"] -> recompile True >>= flip unless exitFailure
["--restart"] -> sendRestart >> return () ["--restart"] -> sendRestart >> return ()
["--version"] -> putStrLn ("xmonad " ++ showVersion version) ["--version"] -> putStrLn ("xmonad " ++ showVersion version)
#ifdef TESTING #ifdef TESTING

2
XMonad/Config.hs
View File

@ -218,7 +218,7 @@ keys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
-- quit, or restart -- quit, or restart
, ((modMask .|. shiftMask, xK_q ), io (exitWith ExitSuccess)) -- %! Quit xmonad , ((modMask .|. shiftMask, xK_q ), io (exitWith ExitSuccess)) -- %! Quit xmonad
, ((modMask , xK_q ), spawn "xmonad --recompile; xmonad --restart") -- %! Restart xmonad , ((modMask , xK_q ), spawn "xmonad --recompile && xmonad --restart") -- %! Restart xmonad
] ]
++ ++
-- mod-[1..9] %! Switch to workspace N -- mod-[1..9] %! Switch to workspace N