[Emacs-diffs] emacs/src ChangeLog xftfont.c xsettings.c

[Jan Dj�rv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd> 09/11/17 13:47:31

Modified files:
        src            : ChangeLog xftfont.c xsettings.c 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7875&r2=1.7876
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xftfont.c?cvsroot=emacs&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xsettings.c?cvsroot=emacs&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7875
retrieving revision 1.7876
diff -u -b -r1.7875 -r1.7876
--- ChangeLog   17 Nov 2009 09:53:45 -0000      1.7875
+++ ChangeLog   17 Nov 2009 13:47:29 -0000      1.7876
@@ -1,7 +1,7 @@
 2009-11-17  Jan Djärv  <address@hidden>
 
        * 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
 

Index: xftfont.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xftfont.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- xftfont.c   17 Nov 2009 09:53:47 -0000      1.29
+++ xftfont.c   17 Nov 2009 13:47:31 -0000      1.30
@@ -214,14 +214,15 @@
       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);

Index: xsettings.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xsettings.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- xsettings.c 17 Nov 2009 09:53:47 -0000      1.2
+++ xsettings.c 17 Nov 2009 13:47:31 -0000      1.3
@@ -105,6 +105,17 @@
 
 #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 @@
             }
           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 @@
               else if (strcmp (sval, "lcddefault") == 0)
                 settings->lcdfilter = FC_LCD_DEFAULT;
             }
-#endif
         }
     }
 
@@ -379,10 +387,7 @@
   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 @@
       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 @@
       FcPatternAddInteger (pat, FC_LCD_FILTER, settings.lcdfilter);
       ++changed;
     }
-#endif
   if (oldsettings.hintstyle != settings.hintstyle)
     {
       FcPatternDel (pat, FC_HINT_STYLE);