#ifdef on FC_LCD_FILTER.

* xftfont.c (xftfont_fix_match): Older versions of fontconfig does
not have FC_LCD_FILTER.  #ifdef it.

* xsettings.c (parse_xft_settings, apply_xft_settings): Ditto

* xftfont.c (xftfont_fix_match): New function.
(xftfont_open): Call XftDefaultSubstitute before XftFontMatch.
Call xftfont_fix_match after XftFontMatch.

diff --git a/src/ChangeLog b/src/ChangeLog
index c09d11d5ecf99572f337e9fe553cfe39a05ef477..3bac10b58ba340044765d52c21e1aa160eb9e65e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 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.
+
+       * xsettings.c (parse_xft_settings, apply_xft_settings): Ditto
+
        * xterm.h (struct x_display_info): Add atoms and Window for xsettings.
 
        * xterm.c (handle_one_xevent): Call xft_settings_event for

diff --git a/src/xftfont.c b/src/xftfont.c
index 6455c5f2c5233f52a1683789b2d6c41dac19f40a..130bd84c69b43558a41cae8e89d46fec51bb7d8b 100644 (file)
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -214,11 +214,14 @@ xftfont_fix_match (pat, match)
       FcPatternDel (match, FC_HINT_STYLE);
       FcPatternAddInteger (match, FC_HINT_STYLE, i);
     }
+#ifdef FC_LCD_FILTER
+  /* Older fontconfig versions don't have FC_LCD_FILTER. */
   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 84e05a1898adf6bb4ae439a6d4d556b6b8104a51..f84dd6cb7cad0b79bcd7eee5cd027a96ed8d1975 100644 (file)
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -310,6 +310,8 @@ 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)
@@ -317,6 +319,7 @@ parse_xft_settings (prop, bytes, settings)
               else if (strcmp (sval, "lcddefault") == 0)
                 settings->lcdfilter = FC_LCD_DEFAULT;
             }
+#endif
         }
     }
 
@@ -376,7 +379,10 @@ 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);
 
@@ -398,12 +404,15 @@ 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)
     {
       FcPatternDel (pat, FC_LCD_FILTER);
       FcPatternAddInteger (pat, FC_LCD_FILTER, settings.lcdfilter);
       ++changed;
     }
+#endif
   if (oldsettings.hintstyle != settings.hintstyle)
     {
       FcPatternDel (pat, FC_HINT_STYLE);