diff options
| author | Khudyakov Alexey <alexey.skladnoy@gmail.com> | 2009-04-19 15:09:09 +0200 |
|---|---|---|
| committer | Khudyakov Alexey <alexey.skladnoy@gmail.com> | 2009-04-19 15:09:09 +0200 |
| commit | 8b6cf6c8f8ee64bbdba2a1c69744352ad2366b4b (patch) | |
| tree | 5061504a8d06be532dbc3f5259f55bd0095cf63a /XMonad/Util/Font.hsc | |
| parent | 3d040ddf0bdbf190c071918e3adb7be6db00b4e7 (diff) | |
| download | XMonadContrib-8b6cf6c8f8ee64bbdba2a1c69744352ad2366b4b.tar.gz XMonadContrib-8b6cf6c8f8ee64bbdba2a1c69744352ad2366b4b.tar.xz XMonadContrib-8b6cf6c8f8ee64bbdba2a1c69744352ad2366b4b.zip | |
Remove USE_UTF8 defines.
They are not needed any more since utf8-string is mandatory dependence.
darcs-hash:20090419130909-7ba7e-9b1d2c6e54b67f29c3f52d072a661fe9c83c15c2.gz
Diffstat (limited to 'XMonad/Util/Font.hsc')
| -rw-r--r-- | XMonad/Util/Font.hsc | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/XMonad/Util/Font.hsc b/XMonad/Util/Font.hsc index 9a3ea81..ea1da07 100644 --- a/XMonad/Util/Font.hsc +++ b/XMonad/Util/Font.hsc @@ -43,9 +43,8 @@ import Graphics.X11.Xft import Graphics.X11.Xrender #endif -#if defined XFT || defined USE_UTF8 import Codec.Binary.UTF8.String (encodeString, decodeString) -#endif + -- Hide the Core Font/Xft switching here data XMonadFont = Core FontStruct @@ -103,11 +102,7 @@ initXMF s = return (Xft xftdraw) else #endif -#ifdef USE_UTF8 fmap Utf8 $ initUtf8Font s -#else - fmap Core $ initCoreFont s -#endif #ifdef XFT where xftPrefix = "xft:" #endif @@ -195,18 +190,10 @@ printStringXMF dpy drw fs@(Xft font) gc fc bc x y s = do #endif decodeInput :: String -> String -#if defined XFT || defined USE_UTF8 decodeInput = decodeString -#else -decodeInput = id -#endif encodeOutput :: String -> String -#if defined XFT || defined USE_UTF8 encodeOutput = encodeString -#else -encodeOutput = id -#endif -- | Short-hand for 'fromIntegral' fi :: (Integral a, Num b) => a -> b |