Mercurial > emacs
changeset 90560:c443c8a56b84
(ftxfont_match): New function.
(syms_of_ftxfont): Set ftxfont_driver.match to ftxfont_match.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Tue, 01 Aug 2006 01:19:31 +0000 |
| parents | fb5d3ac2d786 |
| children | 73750c4e078a |
| files | src/ftxfont.c |
| diffstat | 1 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ftxfont.c Tue Aug 01 01:18:34 2006 +0000 +++ b/src/ftxfont.c Tue Aug 01 01:19:31 2006 +0000 @@ -196,6 +196,7 @@ /* Prototypes for font-driver methods. */ static Lisp_Object ftxfont_list P_ ((Lisp_Object, Lisp_Object)); +static Lisp_Object ftxfont_match P_ ((Lisp_Object, Lisp_Object)); static struct font *ftxfont_open P_ ((FRAME_PTR, Lisp_Object, int)); static void ftxfont_close P_ ((FRAME_PTR, struct font *)); static int ftxfont_prepare_face (FRAME_PTR, struct face *); @@ -222,6 +223,18 @@ return val; } +static Lisp_Object +ftxfont_match (frame, spec) + Lisp_Object frame; + Lisp_Object spec; +{ + Lisp_Object entity = ftfont_driver.match (frame, spec); + + if (VECTORP (entity)) + ASET (entity, FONT_TYPE_INDEX, Qftx); + return entity; +} + static struct font * ftxfont_open (f, entity, pixel_size) FRAME_PTR f; @@ -289,9 +302,6 @@ { struct font *font = (struct font *) face->font_info; GC gcs[6]; - XColor colors[3]; - XGCValues xgcv; - unsigned long mask = GCForeground | GCBackground | GCGraphicsExposures; int i; face->extra = NULL; @@ -413,6 +423,7 @@ ftxfont_driver = ftfont_driver; ftxfont_driver.type = Qftx; ftxfont_driver.list = ftxfont_list; + ftxfont_driver.match = ftxfont_match; ftxfont_driver.open = ftxfont_open; ftxfont_driver.close = ftxfont_close; ftxfont_driver.prepare_face = ftxfont_prepare_face;