From cf86e18b159f754d6e5537b7b9cbefc32297f7d2 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Thu, 12 Dec 2013 18:26:06 +0400 Subject: * font.h (struct font_entity) [HAVE_NS]: New field to record font driver which was used to create this entity. (struct font) [HAVE_WINDOW_SYSTEM]: New field to record frame where the font was opened. (font_close_object): Add prototype. * font.c (font_make_entity) [HAVE_NS]: Zero out driver field. (font_close_object): Not static any more. Lost frame arg. Adjust comment and users. * alloc.c (cleanup_vector): Call font_close_object to adjust per-frame font counters correctly. If HAVE_NS, also call driver-specific cleanup for font-entity objects. * ftfont.c (ftfont_open): * nsfont.m (nsfont_open): * w32font.c (w32font_open_internal): * xfont.c (xfont_open): * xftfont.c (xftfont_open): Save frame pointer in font object. * macfont.m (macfont_open): Likewise. (macfont_descriptor_entity): Save driver pointer to be able to call its free_entity routine when font-entity is swept. * ftxfont.c (ftxfont_open): Add eassert because frame pointer should be saved by ftfont_driver.open. --- src/ftxfont.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/ftxfont.c') diff --git a/src/ftxfont.c b/src/ftxfont.c index d1aa3e40403..b44905d88cd 100644 --- a/src/ftxfont.c +++ b/src/ftxfont.c @@ -255,6 +255,7 @@ ftxfont_open (struct frame *f, Lisp_Object entity, int pixel_size) if (NILP (font_object)) return Qnil; font = XFONT_OBJECT (font_object); + eassert (font->frame == f); font->driver = &ftxfont_driver; return font_object; } -- cgit v1.2.1