1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-27 07:37:33 +00:00

(ftxfont_match): New function.

(syms_of_ftxfont): Set ftxfont_driver.match to ftxfont_match.
This commit is contained in:
Kenichi Handa 2006-08-01 01:19:31 +00:00
parent 10aca0f7ef
commit 3a91626ca0

View File

@ -196,6 +196,7 @@ ftxfont_default_fid (f)
/* 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 @@ ftxfont_list (frame, spec)
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 @@ ftxfont_prepare_face (f, face)
{
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 @@ syms_of_ftxfont ()
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;