From: Jan Djärv <jan.h.d@swipnet.se>
Date: Tue, 17 Nov 2009 13:47:29 +0000 (+0000)
Subject: * xftfont.c (xftfont_fix_match): Older versions of fontconfig does
X-Git-Tag: emacs-pretest-23.1.90~369
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=21050de1b8b5246823b9cdb652fdf25105b48616;p=emacs.git

* xftfont.c (xftfont_fix_match): Older versions of fontconfig does
not have FC_LCD_*.  #define them if not there.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 3bac10b58ba..0716a577cbe 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,7 @@
 2009-11-17  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* xftfont.c (xftfont_fix_match): Older versions of fontconfig does
-	not have FC_LCD_FILTER.  #ifdef it.
+	not have FC_LCD_*.  #define them if not there.
 
 	* xsettings.c (parse_xft_settings, apply_xft_settings): Ditto
 
diff --git a/src/xftfont.c b/src/xftfont.c
index 130bd84c69b..d5ea4aa2ac3 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -214,14 +214,15 @@ xftfont_fix_match (pat, match)
       FcPatternDel (match, FC_HINT_STYLE);
       FcPatternAddInteger (match, FC_HINT_STYLE, i);
     }
-#ifdef FC_LCD_FILTER
+#ifndef FC_LCD_FILTER
   /* Older fontconfig versions don't have FC_LCD_FILTER. */
+#define FC_LCD_FILTER "lcdfilter"
+#endif
   if (FcResultMatch == FcPatternGetInteger (pat, FC_LCD_FILTER, 0, &i))
     {
       FcPatternDel (match, FC_LCD_FILTER);
       FcPatternAddInteger (match, FC_LCD_FILTER, i);
     }
-#endif
   if (FcResultMatch == FcPatternGetInteger (pat, FC_RGBA, 0, &i))
     {
       FcPatternDel (match, FC_RGBA);
diff --git a/src/xsettings.c b/src/xsettings.c
index f84dd6cb7ca..99ddd004718 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -105,6 +105,17 @@ something_changedCB (client, cnxn_id, entry, user_data)
 
 #ifdef HAVE_XFT
 
+/* Older fontconfig versions don't have FC_LCD_*.  */
+#ifndef FC_LCD_NONE
+#define FC_LCD_NONE 0
+#endif
+#ifndef FC_LCD_DEFAULT
+#define FC_LCD_DEFAULT 1
+#endif
+#ifndef FC_LCD_FILTER
+#define FC_LCD_FILTER "lcdfilter"
+#endif
+
 /* Find the window that contains the XSETTINGS property values.  */
 
 static void
@@ -310,8 +321,6 @@ parse_xft_settings (prop, bytes, settings)
             }
           else if (strcmp (name, "Xft/DPI") == 0)
             settings->dpi = (double)ival/1024.0;
-#ifdef FC_LCD_FILTER
-          /* Older fontconfig versions don't have FC_LCD_FILTER. */
           else if (strcmp (name, "Xft/lcdfilter") == 0)
             {
               if (strcmp (sval, "none") == 0)
@@ -319,7 +328,6 @@ parse_xft_settings (prop, bytes, settings)
               else if (strcmp (sval, "lcddefault") == 0)
                 settings->lcdfilter = FC_LCD_DEFAULT;
             }
-#endif
         }
     }
 
@@ -379,10 +387,7 @@ apply_xft_settings (dpyinfo, send_event_p)
   FcPatternGetBool (pat, FC_ANTIALIAS, 0, &oldsettings.aa);
   FcPatternGetBool (pat, FC_HINTING, 0, &oldsettings.hinting);
   FcPatternGetInteger (pat, FC_HINT_STYLE, 0, &oldsettings.hintstyle);
-#ifdef FC_LCD_FILTER
-  /* Older fontconfig versions don't have FC_LCD_FILTER. */
   FcPatternGetInteger (pat, FC_LCD_FILTER, 0, &oldsettings.lcdfilter);
-#endif
   FcPatternGetInteger (pat, FC_RGBA, 0, &oldsettings.rgba);
   FcPatternGetDouble (pat, FC_DPI, 0, &oldsettings.dpi);
 
@@ -404,7 +409,6 @@ apply_xft_settings (dpyinfo, send_event_p)
       FcPatternAddInteger (pat, FC_RGBA, settings.rgba);
       ++changed;
     }
-#ifdef FC_LCD_FILTER
   /* Older fontconfig versions don't have FC_LCD_FILTER. */
   if (oldsettings.lcdfilter != settings.lcdfilter)
     {
@@ -412,7 +416,6 @@ apply_xft_settings (dpyinfo, send_event_p)
       FcPatternAddInteger (pat, FC_LCD_FILTER, settings.lcdfilter);
       ++changed;
     }
-#endif
   if (oldsettings.hintstyle != settings.hintstyle)
     {
       FcPatternDel (pat, FC_HINT_STYLE);