[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src ChangeLog xftfont.c xsettings.c
From: |
Jan Djärv |
Subject: |
[Emacs-diffs] emacs/src ChangeLog xftfont.c xsettings.c |
Date: |
Tue, 17 Nov 2009 09:53:47 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Jan Djärv <jhd> 09/11/17 09:53:47
Modified files:
src : ChangeLog xftfont.c xsettings.c
Log message:
#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.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7874&r2=1.7875
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xftfont.c?cvsroot=emacs&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xsettings.c?cvsroot=emacs&r1=1.1&r2=1.2
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7874
retrieving revision 1.7875
diff -u -b -r1.7874 -r1.7875
--- ChangeLog 17 Nov 2009 08:21:31 -0000 1.7874
+++ ChangeLog 17 Nov 2009 09:53:45 -0000 1.7875
@@ -1,5 +1,10 @@
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.
+
+ * 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
Index: xftfont.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xftfont.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- xftfont.c 17 Nov 2009 08:21:36 -0000 1.28
+++ xftfont.c 17 Nov 2009 09:53:47 -0000 1.29
@@ -214,11 +214,14 @@
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);
Index: xsettings.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xsettings.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- xsettings.c 17 Nov 2009 08:21:36 -0000 1.1
+++ xsettings.c 17 Nov 2009 09:53:47 -0000 1.2
@@ -310,6 +310,8 @@
}
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 @@
else if (strcmp (sval, "lcddefault") == 0)
settings->lcdfilter = FC_LCD_DEFAULT;
}
+#endif
}
}
@@ -376,7 +379,10 @@
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 @@
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);
- [Emacs-diffs] emacs/src ChangeLog xftfont.c xsettings.c,
Jan Djärv <=