diff options
| -rw-r--r-- | Commands.hs | 2 | ||||
| -rw-r--r-- | Config.hs | 2 | ||||
| -rw-r--r-- | Main.hs | 2 | ||||
| -rw-r--r-- | Parsers.hs | 2 | ||||
| -rw-r--r-- | Plugins.hs | 2 | ||||
| -rw-r--r-- | Plugins/CommandReader.hs | 4 | ||||
| -rw-r--r-- | Plugins/Date.hs | 2 | ||||
| -rw-r--r-- | Plugins/HelloWorld.hs | 6 | ||||
| -rw-r--r-- | Plugins/Monitors.hs | 2 | ||||
| -rw-r--r-- | Plugins/Monitors/Batt.hs | 2 | ||||
| -rw-r--r-- | Plugins/Monitors/Common.hs | 2 | ||||
| -rw-r--r-- | Plugins/Monitors/Cpu.hs | 2 | ||||
| -rw-r--r-- | Plugins/Monitors/Mem.hs | 2 | ||||
| -rw-r--r-- | Plugins/Monitors/Net.hs | 9 | ||||
| -rw-r--r-- | Plugins/Monitors/Swap.hs | 2 | ||||
| -rw-r--r-- | Plugins/Monitors/Top.hs | 2 | ||||
| -rw-r--r-- | Plugins/Monitors/Weather.hs | 8 | ||||
| -rw-r--r-- | Plugins/PipeReader.hs | 2 | ||||
| -rw-r--r-- | Plugins/StdinReader.hs | 2 | ||||
| -rw-r--r-- | README | 22 | ||||
| -rw-r--r-- | Runnable.hs | 2 | ||||
| -rw-r--r-- | Xmobar.hs | 2 |
22 files changed, 43 insertions, 40 deletions
diff --git a/Commands.hs b/Commands.hs index 8baaaf5..ce778cf 100644 --- a/Commands.hs +++ b/Commands.hs @@ -4,7 +4,7 @@ -- Copyright : (c) Andrea Rossato -- License : BSD-style (see LICENSE) -- --- Maintainer : Andrea Rossato <andrea.rossato@unibz.it> +-- Maintainer : Jose A. Ortega Ruiz <jao@gnu.org> -- Stability : unstable -- Portability : unportable -- @@ -6,7 +6,7 @@ -- Copyright : (c) Andrea Rossato -- License : BSD-style (see LICENSE) -- --- Maintainer : Andrea Rossato <andrea.rossato@unitn.it> +-- Maintainer : Jose A. Ortega Ruiz <jao@gnu.org> -- Stability : unstable -- Portability : unportable -- @@ -5,7 +5,7 @@ -- Copyright : (c) Andrea Rossato -- License : BSD-style (see LICENSE) -- --- Maintainer : Andrea Rossato <andrea.rossato@unitn.it> +-- Maintainer : Jose A. Ortega Ruiz <jao@gnu.org> -- Stability : unstable -- Portability : unportable -- @@ -5,7 +5,7 @@ -- Copyright : (c) Andrea Rossato -- License : BSD-style (see LICENSE) -- --- Maintainer : Andrea Rossato <andrea.rossato@unitn.it> +-- Maintainer : Jose A. Ortega Ruiz <jao@gnu.org> -- Stability : unstable -- Portability : unportable -- @@ -4,7 +4,7 @@ -- Copyright : (c) Andrea Rossato -- License : BSD-style (see LICENSE) -- --- Maintainer : Andrea Rossato <andrea.rossato@unitn.it> +-- Maintainer : Jose A. Ortega Ruiz <jao@gnu.org> -- Stability : unstable -- Portability : unportable -- diff --git a/Plugins/CommandReader.hs b/Plugins/CommandReader.hs index eee23a6..7c7c92d 100644 --- a/Plugins/CommandReader.hs +++ b/Plugins/CommandReader.hs @@ -4,7 +4,7 @@ -- Copyright : (c) John Goerzen -- License : BSD-style (see LICENSE) -- --- Maintainer : Andrea Rossato <andrea.rossato@unibz.it> +-- Maintainer : Jose A. Ortega Ruiz <jao@gnu.org> -- Stability : unstable -- Portability : unportable -- @@ -31,7 +31,7 @@ instance Exec CommandReader where hSetBinaryMode hstdout False hSetBuffering hstdout LineBuffering forever ph (hGetLineSafe hstdout >>= cb) - where forever ph a = + where forever ph a = do a ec <- getProcessExitCode ph case ec of diff --git a/Plugins/Date.hs b/Plugins/Date.hs index a9e48aa..a4ed80f 100644 --- a/Plugins/Date.hs +++ b/Plugins/Date.hs @@ -4,7 +4,7 @@ -- Copyright : (c) Andrea Rossato -- License : BSD-style (see LICENSE) -- --- Maintainer : Andrea Rossato <andrea.rossato@unibz.it> +-- Maintainer : Jose A. Ortega Ruiz <jao@gnu.org> -- Stability : unstable -- Portability : unportable -- diff --git a/Plugins/HelloWorld.hs b/Plugins/HelloWorld.hs index 352a8a8..df5cff6 100644 --- a/Plugins/HelloWorld.hs +++ b/Plugins/HelloWorld.hs @@ -3,12 +3,12 @@ -- Module : Plugins.HelloWorld -- Copyright : (c) Andrea Rossato -- License : BSD-style (see LICENSE) --- --- Maintainer : Andrea Rossato <andrea.rossato@unibz.it> +-- +-- Maintainer : Jose A. Ortega Ruiz <jao@gnu.org> -- Stability : unstable -- Portability : unportable -- --- A plugin example for Xmobar, a text based status bar +-- A plugin example for Xmobar, a text based status bar -- ----------------------------------------------------------------------------- diff --git a/Plugins/Monitors.hs b/Plugins/Monitors.hs index dd01ce3..98949cf 100644 --- a/Plugins/Monitors.hs +++ b/Plugins/Monitors.hs @@ -6,7 +6,7 @@ -- Copyright : (c) Andrea Rossato -- License : BSD-style (see LICENSE) -- --- Maintainer : Andrea Rossato <andrea.rossato@unibz.it> +-- Maintainer : Jose A. Ortega Ruiz <jao@gnu.org> -- Stability : unstable -- Portability : unportable -- diff --git a/Plugins/Monitors/Batt.hs b/Plugins/Monitors/Batt.hs index b860210..11b2d6c 100644 --- a/Plugins/Monitors/Batt.hs +++ b/Plugins/Monitors/Batt.hs @@ -4,7 +4,7 @@ -- Copyright : (c) Andrea Rossato, 2010 Petr Rockai, 2010 Jose A Ortega -- License : BSD-style (see LICENSE) -- --- Maintainer : Andrea Rossato <andrea.rossato@unibz.it> +-- Maintainer : Jose A. Ortega Ruiz <jao@gnu.org> -- Stability : unstable -- Portability : unportable -- diff --git a/Plugins/Monitors/Common.hs b/Plugins/Monitors/Common.hs index 9a76be5..a00cd48 100644 --- a/Plugins/Monitors/Common.hs +++ b/Plugins/Monitors/Common.hs @@ -4,7 +4,7 @@ -- Copyright : (c) Andrea Rossato -- License : BSD-style (see LICENSE) -- --- Maintainer : Andrea Rossato <andrea.rossato@unibz.it> +-- Maintainer : Jose A. Ortega Ruiz <jao@gnu.org> -- Stability : unstable -- Portability : unportable -- diff --git a/Plugins/Monitors/Cpu.hs b/Plugins/Monitors/Cpu.hs index 78e3ec7..71e8ac3 100644 --- a/Plugins/Monitors/Cpu.hs +++ b/Plugins/Monitors/Cpu.hs @@ -4,7 +4,7 @@ -- Copyright : (c) Andrea Rossato -- License : BSD-style (see LICENSE) -- --- Maintainer : Andrea Rossato <andrea.rossato@unibz.it> +-- Maintainer : Jose A. Ortega Ruiz <jao@gnu.org> -- Stability : unstable -- Portability : unportable -- diff --git a/Plugins/Monitors/Mem.hs b/Plugins/Monitors/Mem.hs index a55d58e..5c55ee2 100644 --- a/Plugins/Monitors/Mem.hs +++ b/Plugins/Monitors/Mem.hs @@ -4,7 +4,7 @@ -- Copyright : (c) Andrea Rossato -- License : BSD-style (see LICENSE) -- --- Maintainer : Andrea Rossato <andrea.rossato@unibz.it> +-- Maintainer : Jose A. Ortega Ruiz <jao@gnu.org> -- Stability : unstable -- Portability : unportable -- diff --git a/Plugins/Monitors/Net.hs b/Plugins/Monitors/Net.hs index d08f96e..64e7eaf 100644 --- a/Plugins/Monitors/Net.hs +++ b/Plugins/Monitors/Net.hs @@ -4,7 +4,7 @@ -- Copyright : (c) Andrea Rossato -- License : BSD-style (see LICENSE) -- --- Maintainer : Andrea Rossato <andrea.rossato@unibz.it> +-- Maintainer : Jose A. Ortega Ruiz <jao@gnu.org> -- Stability : unstable -- Portability : unportable -- @@ -28,7 +28,7 @@ interval = 500000 netConfig :: IO MConfig netConfig = mkMConfig - "<dev>: <rx>|<tx>" -- template + "<dev>: <rx>KB|<tx>KB" -- template ["dev", "rx", "tx", "rxbar", "txbar"] -- available replacements -- Given a list of indexes, take the indexed elements from a list. @@ -64,10 +64,9 @@ netParser = formatNet :: Float -> Monitor (String, String) formatNet d = do - b <- showLogBar 0.8 d - x <- showWithColors f d + b <- showLogBar 0.6 d + x <- showWithColors (showDigits 1) d return (x, b) - where f s = showDigits 1 s ++ "Kb" printNet :: NetDev -> Monitor String printNet nd = diff --git a/Plugins/Monitors/Swap.hs b/Plugins/Monitors/Swap.hs index d2e6077..e466dbb 100644 --- a/Plugins/Monitors/Swap.hs +++ b/Plugins/Monitors/Swap.hs @@ -4,7 +4,7 @@ -- Copyright : (c) Andrea Rossato -- License : BSD-style (see LICENSE) -- --- Maintainer : Andrea Rossato <andrea.rossato@unibz.it> +-- Maintainer : Jose A. Ortega Ruiz <jao@gnu.org> -- Stability : unstable -- Portability : unportable -- diff --git a/Plugins/Monitors/Top.hs b/Plugins/Monitors/Top.hs index d475204..924d4b6 100644 --- a/Plugins/Monitors/Top.hs +++ b/Plugins/Monitors/Top.hs @@ -134,7 +134,7 @@ topProcesses tref scale = do atomicModifyIORef tref $ \(t0, c0) -> let scx = realToFrac (diffUTCTime c1 c0) * scale / 100 ts = M.elems $ combineTimeInfos t0 t1 - nts = map (\(nm, t) -> (nm, t / scx)) ts + nts = map (\(nm, t) -> (nm, min 100 (t / scx))) ts in ((t1, c1), (len, sortTop nts, sortTop mis)) showTimeInfo :: TimeInfo -> Monitor [String] diff --git a/Plugins/Monitors/Weather.hs b/Plugins/Monitors/Weather.hs index 15d084e..1277438 100644 --- a/Plugins/Monitors/Weather.hs +++ b/Plugins/Monitors/Weather.hs @@ -3,8 +3,8 @@ -- Module : Plugins.Monitors.Weather -- Copyright : (c) Andrea Rossato -- License : BSD-style (see LICENSE) --- --- Maintainer : Andrea Rossato <andrea.rossato@unibz.it> +-- +-- Maintainer : Jose A. Ortega Ruiz <jao@gnu.org> -- Stability : unstable -- Portability : unportable -- @@ -90,8 +90,8 @@ pPressure = do manyTill anyChar $ char '(' return $ read s parseData :: Parser [WeatherInfo] -parseData = - do st <- getAllBut "," +parseData = + do st <- getAllBut "," space ss <- getAllBut "(" skipRestOfLine >> getAllBut "/" diff --git a/Plugins/PipeReader.hs b/Plugins/PipeReader.hs index 3886ec6..3fd0dd4 100644 --- a/Plugins/PipeReader.hs +++ b/Plugins/PipeReader.hs @@ -4,7 +4,7 @@ -- Copyright : (c) Andrea Rossato -- License : BSD-style (see LICENSE) -- --- Maintainer : Andrea Rossato <andrea.rossato@unibz.it> +-- Maintainer : Jose A. Ortega Ruiz <jao@gnu.org> -- Stability : unstable -- Portability : unportable -- diff --git a/Plugins/StdinReader.hs b/Plugins/StdinReader.hs index 0c075e6..2ee217e 100644 --- a/Plugins/StdinReader.hs +++ b/Plugins/StdinReader.hs @@ -4,7 +4,7 @@ -- Copyright : (c) Andrea Rossato -- License : BSD-style (see LICENSE) -- --- Maintainer : Andrea Rossato <andrea.rossato@unibz.it> +-- Maintainer : Jose A. Ortega Ruiz <jao@gnu.org> -- Stability : unstable -- Portability : unportable -- @@ -13,12 +13,14 @@ features, like dynamic color management, output templates, and extensibility through plugins. [This is a screen shot] of Andrea's desktop with [xmonad] and xmobar. -And [this] is xmobar running under [sawfish], with antialiased fonts. +[This] is xmobar running under [sawfish], with antialiased fonts. And +[this one] is my desktop with [xmonad] and two instances of xmobar. [xmonad]: http://xmonad.org [Ion3]: http://tuomov.iki.fi/software/ [This is a screen shot]: http://haskell.org/sitewiki/images/a/ae/Arossato-config.png -[this]: http://projects.haskell.org/xmobar/xmobar-sawfish.png +[This]: http://projects.haskell.org/xmobar/xmobar-sawfish.png +[this one]: http://projects.haskell.org/xmobar/xmobar-xmonad.png Installation ============ @@ -286,13 +288,15 @@ to run the Memory monitor plugin with the specified template, and the swap monitor plugin, with default options, every second. The only internal available command is `Com` (see below Executing -External Commands). All other commands are provided by plugins. -xmobar comes with some plugins, providing a set of system monitors, -a standard input reader, an Unix named pipe reader, and a configurable +External Commands). All other commands are provided by plugins. xmobar +comes with some plugins, providing a set of system monitors, a +standard input reader, an Unix named pipe reader, and a configurable date plugin. These plugins install the following internal commands: -`Weather`, `Network`, `Memory`, `Swap`, `Cpu`, `MultiCpu`, `Battery`, -`Thermal`, `CpuFreq`, `CoreTemp`, `Date`, `StdinReader`, -`CommandReader`, and `PipeReader`. +`Weather`, `Network`, `Wireless` (optional), `Memory`, `Swap`, `Cpu`, +`MultiCpu`, `Battery`, `TopProc`, `TopMem`, `DiskU`, `DiskIO`, +`Thermal`, `CpuFreq`, `CoreTemp`, `MPD` (optional), `Mail` (optional), +`MBox` (optional), `Date`, `StdinReader`, `CommandReader`, and +`PipeReader`. To remove them see below Installing/Removing a Plugin @@ -326,7 +330,7 @@ Monitors have default aliases. - Args: default monitor arguments (see below) - Variables that can be used with the `-t`/`--template` argument: `dev`, `rx`, `tx`, `rxbar`, `txbar` -- Default template: `<dev>: <rx>|<tx>` +- Default template: `<dev>: <rx>KB|<tx>KB` `Wireless Interface Args RefreshRate` diff --git a/Runnable.hs b/Runnable.hs index 4cd33dd..56fedb3 100644 --- a/Runnable.hs +++ b/Runnable.hs @@ -5,7 +5,7 @@ -- Copyright : (c) Andrea Rossato -- License : BSD-style (see LICENSE) -- --- Maintainer : Andrea Rossato <andrea.rossato@unitn.it> +-- Maintainer : Jose A. Ortega Ruiz <jao@gnu.org> -- Stability : unstable -- Portability : unportable -- @@ -5,7 +5,7 @@ -- Copyright : (c) Andrea Rossato -- License : BSD-style (see LICENSE) -- --- Maintainer : Andrea Rossato <andrea.rossato@unitn.it> +-- Maintainer : Jose A. Ortega Ruiz <jao@gnu.org> -- Stability : unstable -- Portability : unportable -- |