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

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd> 09/12/13 13:16:19

Modified files:
        src            : ChangeLog xftfont.c 

Log message:
        xftfont.c: Parse symbolic names for constants also.
        
        (QClcdfilter): New variable.
        (xftfont_open): Parse constant names for RGBA, HINT_STYLE and LCDFILTER.
        (syms_of_xftfont): Initialize QClcdfilter.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7921&r2=1.7922
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xftfont.c?cvsroot=emacs&r1=1.32&r2=1.33

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7921
retrieving revision 1.7922
diff -u -b -r1.7921 -r1.7922
--- ChangeLog   12 Dec 2009 17:11:41 -0000      1.7921
+++ ChangeLog   13 Dec 2009 13:16:17 -0000      1.7922
@@ -1,3 +1,9 @@
+2009-12-13  Jan Djärv  <address@hidden>
+
+       * xftfont.c (QClcdfilter): New variable.
+       (xftfont_open): Parse constant names for RGBA, HINT_STYLE and LCDFILTER.
+       (syms_of_xftfont): Initialize QClcdfilter.
+
 2009-12-12  Jan Djärv  <address@hidden>
 
        * xsettings.c (struct xsettings): Add member seen.

Index: xftfont.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xftfont.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- xftfont.c   12 Dec 2009 02:11:29 -0000      1.32
+++ xftfont.c   13 Dec 2009 13:16:19 -0000      1.33
@@ -39,7 +39,8 @@
 /* Xft font driver.  */
 
 static Lisp_Object Qxft;
-static Lisp_Object QChinting , QCautohint, QChintstyle, QCrgba, QCembolden;
+static Lisp_Object QChinting, QCautohint, QChintstyle, QCrgba, QCembolden,
+  QClcdfilter;
 
 /* The actual structure for Xft font that can be casted to struct
    font.  */
@@ -252,7 +253,7 @@
   XftFont *xftfont = NULL;
   int spacing;
   char name[256];
-  int len, i;
+  int len, i, ival;
   XGlyphInfo extents;
   FT_Face ft_face;
   FcMatrix *matrix;
@@ -311,11 +312,25 @@
        {
          if (INTEGERP (val))
            FcPatternAddInteger (pat, FC_HINT_STYLE, XINT (val));
+          else if (SYMBOLP (val)
+                   && FcNameConstant (SDATA (SYMBOL_NAME (val)), &ival))
+           FcPatternAddInteger (pat, FC_HINT_STYLE, ival);
        }
       else if (EQ (key, QCrgba))
        {
          if (INTEGERP (val))
            FcPatternAddInteger (pat, FC_RGBA, XINT (val));
+          else if (SYMBOLP (val)
+                   && FcNameConstant (SDATA (SYMBOL_NAME (val)), &ival))
+           FcPatternAddInteger (pat, FC_RGBA, ival);
+       }
+      else if (EQ (key, QClcdfilter))
+       {
+         if (INTEGERP (val))
+           FcPatternAddInteger (pat, FC_LCD_FILTER, ival = XINT (val));
+          else if (SYMBOLP (val)
+                   && FcNameConstant (SDATA (SYMBOL_NAME (val)), &ival))
+           FcPatternAddInteger (pat, FC_LCD_FILTER, ival);
        }
 #ifdef FC_EMBOLDEN
       else if (EQ (key, QCembolden))
@@ -706,6 +721,7 @@
   DEFSYM (QChintstyle, ":hintstyle");
   DEFSYM (QCrgba, ":rgba");
   DEFSYM (QCembolden, ":embolden");
+  DEFSYM (QClcdfilter, ":lcdfilter");
 
   xftfont_driver = ftfont_driver;
   xftfont_driver.type = Qxft;