* 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.

1 files changed, 16 insertions, 4 deletions

diff --git a/src/alloc.c b/src/alloc.c
index aeda42637cd..022d1e5dcbb 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -2874,10 +2874,22 @@ vector_nbytes (struct Lisp_Vector *v)
 static void
 cleanup_vector (struct Lisp_Vector *vector)
 {
-  if (PSEUDOVECTOR_TYPEP (&vector->header, PVEC_FONT)
-      && ((vector->header.size & PSEUDOVECTOR_SIZE_MASK)
-          == FONT_OBJECT_MAX))
-    ((struct font *) vector)->driver->close ((struct font *) vector);
+  if (PSEUDOVECTOR_TYPEP (&vector->header, PVEC_FONT))
+    {
+      ptrdiff_t size = vector->header.size & PSEUDOVECTOR_SIZE_MASK;
+      Lisp_Object obj = make_lisp_ptr (vector, Lisp_Vectorlike);
+
+      if (size == FONT_OBJECT_MAX)
+        font_close_object (obj);
+#ifdef HAVE_NS
+      else if (size == FONT_ENTITY_MAX)
+        {
+          struct font_entity *entity = (struct font_entity *) vector;
+          if (entity->driver && entity->driver->free_entity)
+            entity->driver->free_entity (obj);
+        }
+#endif /* HAVE_NS */
+    }
 }
 
 /* Reclaim space used by unmarked vectors.  */