diff options
| -rw-r--r-- | news.md | 6 | ||||
| -rw-r--r-- | readme.md | 2 | ||||
| -rw-r--r-- | src/Plugins/Monitors/MPD.hs | 11 | ||||
| -rw-r--r-- | src/StatFS.hsc | 2 | ||||
| -rw-r--r-- | xmobar.cabal | 14 |
5 files changed, 13 insertions, 22 deletions
@@ -1,6 +1,6 @@ % xmobar - Release notes -## Version 0.15 +## Version 0.15 (June 4, 2012) _Incompatible changes_ @@ -15,6 +15,9 @@ _New features_ - New MPRIS (versions 1 and 2) monitor, by Artem Tarasov. - New monitor option `-d` to specify the number of decimal places to display for float numbers. Defaults to 0. See [issue 58]. + - New compilation option `--with_threaded`, to use GHC's threaded + runtime to compile xmobar. Disabled by default (cf. discussion in + [github #36]). _Bug fixes_ @@ -33,6 +36,7 @@ _Bug fixes_ [issue 64]: http://code.google.com/p/xmobar/issues/detail?id=64 [issue 67]: http://code.google.com/p/xmobar/issues/detail?id=67 [issue 69]: http://code.google.com/p/xmobar/issues/detail?id=69 +[github #36]: https://github.com/jaor/xmobar/issues/38 [github #38]: https://github.com/jaor/xmobar/issues/38 ## Version 0.14 (Dec 10, 2011) @@ -1113,7 +1113,7 @@ more details. Copyright © 2007-2010 Andrea Rossato -Copyright © 2010-2011 Jose Antonio Ortega Ruiz +Copyright © 2010-2012 Jose Antonio Ortega Ruiz [Github]: http://github.com/jaor/xmobar/ [Github page]: http://github.com/jaor/xmobar diff --git a/src/Plugins/Monitors/MPD.hs b/src/Plugins/Monitors/MPD.hs index cb3acdf..450ad8f 100644 --- a/src/Plugins/Monitors/MPD.hs +++ b/src/Plugins/Monitors/MPD.hs @@ -57,12 +57,7 @@ runMPD args = do mpdWait :: IO () mpdWait = M.withMPD idle >> return () - where -#if defined LIBMPD_07 - idle = M.idle -#else - idle = M.idle [M.PlayerS, M.MixerS] -#endif + where idle = M.idle [M.PlayerS, M.MixerS] mopts :: [String] -> IO MOpts mopts argv = @@ -100,10 +95,10 @@ parseSong (Right Nothing) = return $ repeat "" parseSong (Right (Just s)) = let join [] = "" join (x:xs) = foldl (\a o -> a ++ ", " ++ o) x xs - str sel = maybe "" join (M.sgGetTag sel s) + str sel = maybe "" (join . map M.toString) (M.sgGetTag sel s) sels = [ M.Name, M.Artist, M.Composer, M.Performer , M.Album, M.Title, M.Track, M.Genre ] - fields = M.sgFilePath s : map str sels + fields = M.toString (M.sgFilePath s) : map str sels in mapM showWithPadding fields showTime :: Integer -> String diff --git a/src/StatFS.hsc b/src/StatFS.hsc index d007d08..e1cb89c 100644 --- a/src/StatFS.hsc +++ b/src/StatFS.hsc @@ -79,5 +79,5 @@ getFileSystemStats path = , fsStatByteCount = toI bcount * bpb , fsStatBytesFree = toI bfree * bpb , fsStatBytesAvailable = toI bavail * bpb - , fsStatBytesUsed = toI (bcount - bavail) * bpb + , fsStatBytesUsed = toI (max 0 (bcount - bavail)) * bpb } diff --git a/xmobar.cabal b/xmobar.cabal index 02e618f..dd46fc3 100644 --- a/xmobar.cabal +++ b/xmobar.cabal @@ -49,10 +49,6 @@ flag with_mpd description: MPD support. Needs libmpd installed. default: False -flag with_mpd_07 - description: MPD 0.7.* support. - default: False - flag all_extensions description: Includes all optional extensions. default: False @@ -116,9 +112,9 @@ executable xmobar time, filepath, X11 == 1.6.*, - mtl == 2.0.*, + mtl >= 2.0 && < 2.2, parsec == 3.1.*, - stm == 2.3.* + stm >= 2.3 && <2.5 if flag(small_base) build-depends: @@ -150,13 +146,9 @@ executable xmobar cpp-options: -DIWLIB if flag(with_mpd) || flag(all_extensions) + build-depends: libmpd == 0.8.* other-modules: Plugins.Monitors.MPD cpp-options: -DLIBMPD - if flag(with_mpd_07) - build-depends: libmpd == 0.7.* - cpp-options: -DLIBMPD_07 - else - build-depends: libmpd == 0.8.* if flag(with_alsa) || flag(all_extensions) build-depends: alsa-mixer == 0.1.* |