Use FC_DUAL only when it is defined.

[bpt/emacs.git] / src / xftfont.c

diff --git a/src/xftfont.c b/src/xftfont.c
index 5d4581b..de2572c 100644 (file)
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -1,6 +1,6 @@
 /* xftfont.c -- XFT font driver.
 /* xftfont.c -- XFT font driver.

-   Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-   Copyright (C) 2006, 2007, 2008, 2009, 2010
+   Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011

      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
 
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
 


@@ -32,6 +32,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "blockinput.h"
 #include "character.h"
 #include "charset.h"
 #include "blockinput.h"
 #include "character.h"
 #include "charset.h"

+#include "composite.h"

 #include "fontset.h"
 #include "font.h"
 #include "ftfont.h"
 #include "fontset.h"
 #include "font.h"
 #include "ftfont.h"


@@ -429,7 +430,11 @@ xftfont_open (f, entity, pixel_size)
        ascii_printable[i] = ' ' + i;
     }
   BLOCK_INPUT;
        ascii_printable[i] = ' ' + i;
     }
   BLOCK_INPUT;

-  if (spacing != FC_PROPORTIONAL)
+  if (spacing != FC_PROPORTIONAL
+#ifdef FC_DUAL
+      && spacing != FC_DUAL
+#endif /* FC_DUAL */
+      )

     {
       font->min_width = font->average_width = font->space_width
        = xftfont->max_advance_width;
     {
       font->min_width = font->average_width = font->space_width
        = xftfont->max_advance_width;


@@ -702,6 +707,23 @@ xftfont_draw (s, from, to, x, y, with_background)
   return len;
 }
 
   return len;
 }
 

+Lisp_Object
+xftfont_shape (Lisp_Object lgstring)
+{
+  struct font *font;
+  struct xftfont_info *xftfont_info;
+  FT_Face ft_face;
+  Lisp_Object val;
+
+  CHECK_FONT_GET_OBJECT (LGSTRING_FONT (lgstring), font);
+  xftfont_info = (struct xftfont_info *) font;
+  ft_face = XftLockFace (xftfont_info->xftfont);
+  xftfont_info->ft_size = ft_face->size;
+  val = ftfont_driver.shape (lgstring);
+  XftUnlockFace (xftfont_info->xftfont);
+  return val;
+}
+

 static int
 xftfont_end_for_frame (f)
      FRAME_PTR f;
 static int
 xftfont_end_for_frame (f)
      FRAME_PTR f;


@@ -796,6 +818,9 @@ syms_of_xftfont ()
   xftfont_driver.draw = xftfont_draw;
   xftfont_driver.end_for_frame = xftfont_end_for_frame;
   xftfont_driver.cached_font_ok = xftfont_cached_font_ok;
   xftfont_driver.draw = xftfont_draw;
   xftfont_driver.end_for_frame = xftfont_end_for_frame;
   xftfont_driver.cached_font_ok = xftfont_cached_font_ok;

+#if defined (HAVE_M17N_FLT) && defined (HAVE_LIBOTF)
+  xftfont_driver.shape = xftfont_shape;
+#endif

 
   register_font_driver (&xftfont_driver, NULL);
 }
 
   register_font_driver (&xftfont_driver, NULL);
 }