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/Prompt.hs | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'XMonad/Prompt.hs') diff --git a/XMonad/Prompt.hs b/XMonad/Prompt.hs index 53ec2e5..946d0dc 100644 --- a/XMonad/Prompt.hs +++ b/XMonad/Prompt.hs @@ -52,8 +52,6 @@ module XMonad.Prompt , splitInSubListsAt , breakAtSpace , uniqSort - , decodeInput - , encodeOutput , historyCompletion , historyCompletionP -- * History filters @@ -75,22 +73,21 @@ import XMonad.Util.Types import XMonad.Util.XSelection (getSelection) import XMonad.Util.XUtils (fi) +import Codec.Binary.UTF8.String (decodeString) +import Control.Applicative ((<$>)) import Control.Arrow ((&&&),first) import Control.Concurrent (threadDelay) -import Control.Monad.Reader +import Control.Exception.Extensible hiding (handle) import Control.Monad.State -import Control.Applicative ((<$>)) -import Data.Char import Data.Bits -import Data.Maybe -import Data.List +import Data.Char (isSpace) import Data.IORef +import Data.List +import Data.Maybe (fromMaybe) import Data.Set (fromList, toList) -import System.Directory +import System.Directory (getAppUserDataDirectory) import System.IO import System.Posix.Files -import Control.Exception.Extensible hiding (handle) - import qualified Data.Map as M -- $usage @@ -452,7 +449,7 @@ keyPressHandle m (ks,str) = do Nothing -> case str of "" -> eventLoop handle _ -> when (mask .&. controlMask == 0) $ do - insertString (decodeInput str) + insertString (decodeString str) updateWindows completed <- tryAutoComplete when completed $ setSuccess True >> setDone True -- cgit v1.2.3