[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src xftfont.c
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] emacs/src xftfont.c |
Date: |
Thu, 29 Jan 2009 12:13:48 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kenichi Handa <handa> 09/01/29 12:13:48
Modified files:
src : xftfont.c
Log message:
(xftfont_has_char): New function.
(syms_of_xftfont): Register xftfont_has_char in xftfont_driver.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xftfont.c?cvsroot=emacs&r1=1.19&r2=1.20
Patches:
Index: xftfont.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xftfont.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- xftfont.c 27 Jan 2009 05:08:40 -0000 1.19
+++ xftfont.c 29 Jan 2009 12:13:47 -0000 1.20
@@ -144,6 +144,7 @@
static void xftfont_close P_ ((FRAME_PTR, struct font *));
static int xftfont_prepare_face P_ ((FRAME_PTR, struct face *));
static void xftfont_done_face P_ ((FRAME_PTR, struct face *));
+static int xftfont_has_char P_ ((Lisp_Object, int));
static unsigned xftfont_encode_char P_ ((struct font *, int));
static int xftfont_text_extents P_ ((struct font *, unsigned *, int,
struct font_metrics *));
@@ -466,6 +467,21 @@
}
}
+static int
+xftfont_has_char (font, c)
+ Lisp_Object font;
+ int c;
+{
+ struct xftfont_info *xftfont_info;
+
+ if (FONT_ENTITY_P (font))
+ return ftfont_driver.has_char (font, c);
+
+ xftfont_info = (struct xftfont_info *) XFONT_OBJECT (font);
+ return (XftCharExists (xftfont_info->display, xftfont_info->xftfont,
+ (FcChar32) c) == FcTrue);
+}
+
static unsigned
xftfont_encode_char (font, c)
struct font *font;
@@ -604,6 +620,7 @@
xftfont_driver.close = xftfont_close;
xftfont_driver.prepare_face = xftfont_prepare_face;
xftfont_driver.done_face = xftfont_done_face;
+ xftfont_driver.has_char = xftfont_has_char;
xftfont_driver.encode_char = xftfont_encode_char;
xftfont_driver.text_extents = xftfont_text_extents;
xftfont_driver.draw = xftfont_draw;