stop using the Xft Utf8 functions. They break the non-english locales.

diff --git a/CHANGELOG b/CHANGELOG
index dc9486dafe5d5decf6c02e14358db9824259cecb..85e43cf246028e63800a7b23307ff2e60e39b195 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,10 @@ Changelog for Openbox:
 2.2.1:
  * Fix bug with mutltibyte fonts being really tiny.     (Ben Jansens)
 
+ * Stop using Utf8 drawing routines for Xft. These      (Ben Jansens)
+   don't work at all for high-ascii letters, which are
+   used in the non-english locales.
+
  * Fix menu redraw bug when dragging them off-screen or (Scott Moynes)
    under other menus, with Xft fonts.
 

diff --git a/configure.in b/configure.in
index 9b83fe5039af3e2dfe5c33476c571bfb125028f1..b3becdf6597a8ba69690841beb865de10afc8aa1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -137,7 +137,7 @@ fi
 
 dnl Check for Xft extension support and proper library files.
 XFT=""
-XFT_UTF8=""
+dnl XFT_UTF8=""
 AC_MSG_CHECKING([whether to build support for the Xft extension])
 AC_ARG_ENABLE(
   xft, [  --enable-xft            enable support of the Xft extension [default=yes]])
@@ -156,9 +156,10 @@ if test "$enableval" = "yes"; then
       LIBS="$LIBS -lXft"
 
       dnl Check for utf8 support in the Xft library
-      AC_CHECK_LIB(Xft, XftDrawStringUtf8,
-        XFT_UTF8="yes",
-      ),
+      dnl AC_CHECK_LIB(Xft, XftDrawStringUtf8,
+      dnl  XFT_UTF8="yes",
+      dnl),
+      ,
 
       AC_MSG_RESULT([no])
     )
@@ -169,9 +170,9 @@ else
 fi
 if test "$XFT" = "yes"; then
   AC_DEFINE(XFT,1,[Enable support of the Xft extension])
-  if test "$XFT_UTF8" = "yes"; then
-    AC_DEFINE(XFT_UTF8,1,[Support for Utf8 text in the Xft extension])
-  fi
+  dnl if test "$XFT_UTF8" = "yes"; then
+    dnl AC_DEFINE(XFT_UTF8,1,[Support for Utf8 text in the Xft extension])
+  dnl fi
 fi
 
 dnl Check for ordered 8bpp dithering