diff options
| author | gwern0 <gwern0@gmail.com> | 2008-09-21 17:40:14 +0200 |
|---|---|---|
| committer | gwern0 <gwern0@gmail.com> | 2008-09-21 17:40:14 +0200 |
| commit | 4d4d494ed4e8a815add619fb4faed31e907f3196 (patch) | |
| tree | 71dd22a39dc7d7e1b60f18e802a88ba025319ca1 | |
| parent | e17e6eadf6a1dbcff7b78d74ea013b5c5187e55b (diff) | |
| download | XMonadContrib-4d4d494ed4e8a815add619fb4faed31e907f3196.tar.gz XMonadContrib-4d4d494ed4e8a815add619fb4faed31e907f3196.tar.xz XMonadContrib-4d4d494ed4e8a815add619fb4faed31e907f3196.zip | |
-DUTF8 flag with -DUSE_UTF8
darcs-hash:20080921154014-f7719-42b0056cce0872dbd95dafcb07244a1bd8dabad1.gz
| -rw-r--r-- | XMonad/Util/Font.hsc | 4 | ||||
| -rw-r--r-- | XMonad/Util/Paste.hs | 2 | ||||
| -rw-r--r-- | XMonad/Util/XSelection.hs | 2 | ||||
| -rw-r--r-- | xmonad-contrib.cabal | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/XMonad/Util/Font.hsc b/XMonad/Util/Font.hsc index e9484e6..76bfebc 100644 --- a/XMonad/Util/Font.hsc +++ b/XMonad/Util/Font.hsc @@ -43,7 +43,7 @@ import Graphics.X11.Xft import Graphics.X11.Xrender #endif -#if defined XFT || defined UTF8 +#if defined XFT || defined USE_UTF8 import Codec.Binary.UTF8.String (encodeString, decodeString) #endif @@ -103,7 +103,7 @@ initXMF s = return (Xft xftdraw) else #endif -#ifdef UTF8 +#ifdef USE_UTF8 fmap Utf8 $ initUtf8Font s #else fmap Core $ initCoreFont s diff --git a/XMonad/Util/Paste.hs b/XMonad/Util/Paste.hs index e57e6e8..e5c65e6 100644 --- a/XMonad/Util/Paste.hs +++ b/XMonad/Util/Paste.hs @@ -77,4 +77,4 @@ sendKeyWindow mods key w = withDisplay $ \d -> do setKeyEvent ev w rootw none mods keycode True sendEvent d w True keyPressMask ev setEventType ev keyRelease - sendEvent d w True keyReleaseMask ev + sendEvent d w True keyReleaseMask ev
\ No newline at end of file diff --git a/XMonad/Util/XSelection.hs b/XMonad/Util/XSelection.hs index c9cb410..fdea2cf 100644 --- a/XMonad/Util/XSelection.hs +++ b/XMonad/Util/XSelection.hs @@ -30,7 +30,7 @@ import Data.Maybe (fromMaybe) import XMonad import XMonad.Util.Run (safeSpawn, unsafeSpawn) -#ifdef UTF8 +#ifdef USE_UTF8 import Codec.Binary.UTF8.String (decode) #else import Data.Bits (shiftL, (.&.), (.|.)) diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal index 0163ea9..0eba71c 100644 --- a/xmonad-contrib.cabal +++ b/xmonad-contrib.cabal @@ -55,7 +55,7 @@ library if flag(with_utf8) build-depends: utf8-string extensions: ForeignFunctionInterface - cpp-options: -DUTF8 + cpp-options: -DUSE_UTF8 build-depends: mtl, unix, X11>=1.4.3, xmonad>=0.8, xmonad<0.9 ghc-options: -Wall |