From be7429427b84c7c1221041e94d1a28d00e8030b3 Mon Sep 17 00:00:00 2001 From: gwern0 Date: Tue, 15 Jun 2010 01:23:00 +0200 Subject: remove decodeInput/encodeOutput Ignore-this: 2ed6a014130dba95c6b0a6fcac055110 see http://code.google.com/p/xmonad/issues/detail?id48 they are just synonyms for 2 utf8-string functions, and don't really help darcs-hash:20100614232300-f7719-66f0606d9c7323186cb6aa56dff11c506bb79c4e.gz --- XMonad/Hooks/DynamicLog.hs | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'XMonad/Hooks') diff --git a/XMonad/Hooks/DynamicLog.hs b/XMonad/Hooks/DynamicLog.hs index 4777134..6081135 100644 --- a/XMonad/Hooks/DynamicLog.hs +++ b/XMonad/Hooks/DynamicLog.hs @@ -54,27 +54,26 @@ module XMonad.Hooks.DynamicLog ( ) where --- -- Useful imports --- -import XMonad -import Control.Monad + +import Codec.Binary.UTF8.String (encodeString) +import Control.Monad (liftM2) import Data.Char ( isSpace, ord ) +import Data.List (intersperse, isPrefixOf, sortBy) import Data.Maybe ( isJust, catMaybes ) -import Data.List -import qualified Data.Map as M import Data.Ord ( comparing ) +import qualified Data.Map as M import qualified XMonad.StackSet as S -import System.IO import Foreign.C (CChar) +import XMonad + import XMonad.Util.WorkspaceCompare import XMonad.Util.NamedWindows import XMonad.Util.Run import XMonad.Layout.LayoutModifier -import XMonad.Util.Font import XMonad.Hooks.UrgencyHook import XMonad.Hooks.ManageDocks @@ -277,7 +276,7 @@ dynamicLogString pp = do -- run extra loggers, ignoring any that generate errors. extras <- mapM (flip catchX (return Nothing)) $ ppExtras pp - return $ encodeOutput . sepBy (ppSep pp) . ppOrder pp $ + return $ encodeString . sepBy (ppSep pp) . ppOrder pp $ [ ws , ppLayout pp ld , ppTitle pp wt -- cgit v1.2.3