twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-08-07 23:41:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

-DUTF8 flag with -DUSE_UTF8

Browse Source
This commit is contained in:
gwern0
2008-09-21 15:40:14 +00:00
parent 07e9192f6f
commit b0c3dcc192
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
XMonad/Util/Font.hsc
View File

@@ -43,7 +43,7 @@ import Graphics.X11.Xft
import Graphics.X11.Xrender import Graphics.X11.Xrender
#endif #endif
#if defined XFT || defined UTF8 #if defined XFT || defined USE_UTF8
import Codec.Binary.UTF8.String (encodeString, decodeString) import Codec.Binary.UTF8.String (encodeString, decodeString)
#endif #endif
@@ -103,7 +103,7 @@ initXMF s =
return (Xft xftdraw) return (Xft xftdraw)
else else
#endif #endif
#ifdef UTF8 #ifdef USE_UTF8
fmap Utf8 $ initUtf8Font s fmap Utf8 $ initUtf8Font s
#else #else
fmap Core $ initCoreFont s fmap Core $ initCoreFont s

2
XMonad/Util/XSelection.hs
View File

@@ -30,7 +30,7 @@ import Data.Maybe (fromMaybe)
import XMonad import XMonad
import XMonad.Util.Run (safeSpawn, unsafeSpawn) import XMonad.Util.Run (safeSpawn, unsafeSpawn)
#ifdef UTF8 #ifdef USE_UTF8
import Codec.Binary.UTF8.String (decode) import Codec.Binary.UTF8.String (decode)
#else #else
import Data.Bits (shiftL, (.&.), (.|.)) import Data.Bits (shiftL, (.&.), (.|.))

2
xmonad-contrib.cabal
View File

@@ -55,7 +55,7 @@ library
if flag(with_utf8) if flag(with_utf8)
build-depends: utf8-string build-depends: utf8-string
extensions: ForeignFunctionInterface extensions: ForeignFunctionInterface
cpp-options: -DUTF8 cpp-options: -DUSE_UTF8
build-depends: mtl, unix, X11>=1.4.3, xmonad>=0.8, xmonad<0.9 build-depends: mtl, unix, X11>=1.4.3, xmonad>=0.8, xmonad<0.9
ghc-options: -Wall ghc-options: -Wall