summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Main.hs12
-rw-r--r--man/xmonad.1.markdown3
2 files changed, 12 insertions, 3 deletions
diff --git a/Main.hs b/Main.hs
index abcab51..2d16db6 100644
--- a/Main.hs
+++ b/Main.hs
@@ -26,6 +26,8 @@ import System.Exit (exitFailure)
import Paths_xmonad (version)
import Data.Version (showVersion)
+import Graphics.X11.Xinerama (compiledWithXinerama)
+
#ifdef TESTING
import qualified Properties
#endif
@@ -43,13 +45,17 @@ main = do
["--help"] -> usage
["--recompile"] -> recompile True >>= flip unless exitFailure
["--restart"] -> sendRestart >> return ()
- ["--version"] -> putStrLn ("xmonad " ++ showVersion version)
- ["--verbose-version"] -> putStrLn ("xmonad " ++ showVersion version ++ " compiled by " ++ compilerName
- ++ " " ++ showVersion compilerVersion ++ " for " ++ os ++ "/" ++ arch)
+ ["--version"] -> putStrLn $ unwords shortVersion
+ ["--verbose-version"] -> putStrLn . unwords $ shortVersion ++ longVersion
#ifdef TESTING
("--run-tests":_) -> Properties.main
#endif
_ -> fail "unrecognized flags"
+ where
+ shortVersion = ["xmonad", showVersion version]
+ longVersion = [ "compiled by", compilerName, showVersion compilerVersion
+ , "for", arch ++ "-" ++ os
+ , "\nXinerama:", show compiledWithXinerama ]
usage :: IO ()
usage = do
diff --git a/man/xmonad.1.markdown b/man/xmonad.1.markdown
index c7c2519..1099fdb 100644
--- a/man/xmonad.1.markdown
+++ b/man/xmonad.1.markdown
@@ -60,6 +60,9 @@ These flags are:
--version
: Display version of _xmonad_
+--verbose-version
+: Display detailed version of _xmonad_
+
##Default keyboard bindings
___KEYBINDINGS___