procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* alloc.c, font.c, font.h, ftfont.c, ftxfont.c, macfont.m,

Browse source 
* nsfont.m, w32font.c, xfont.c, xftfont.c: Revert last and
2013-12-12 font-related change to avoid Bug#16128, which
is quite hard to fix without even more substantial changes.
This commit is contained in:
Dmitry Antipov 2013-12-13 19:55:23 +04:00
parent b6c888cc7a
commit 5035fbc19e
11 changed files with 19 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ChangeLog
View file

@ -1,3 +1,10 @@
2013-12-13 Dmitry Antipov <dmantipov@yandex.ru>
* alloc.c, font.c, font.h, ftfont.c, ftxfont.c, macfont.m,
* nsfont.m, w32font.c, xfont.c, xftfont.c: Revert last and
2013-12-12 font-related change to avoid Bug#16128, which
is quite hard to fix without even more substantial changes.
2013-12-13 Dmitry Antipov <dmantipov@yandex.ru>
* font.c (font_close_object): Check for live frame (Bug#16128).

20
src/alloc.c
View file

@ -2874,22 +2874,10 @@ vector_nbytes (struct Lisp_Vector *v)
static void
cleanup_vector (struct Lisp_Vector *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 */
}
if (PSEUDOVECTOR_TYPEP (&vector->header, PVEC_FONT)
&& ((vector->header.size & PSEUDOVECTOR_SIZE_MASK)
== FONT_OBJECT_MAX))
((struct font *) vector)->driver->close ((struct font *) vector);
}
/* Reclaim space used by unmarked vectors. */

24
src/font.c
View file

@ -173,9 +173,6 @@ font_make_entity (void)
allocate_pseudovector (VECSIZE (struct font_entity),
FONT_ENTITY_MAX, PVEC_FONT));
XSETFONT (font_entity, entity);
#ifdef HAVE_NS
entity->driver = NULL;
#endif
return font_entity;
}
@ -2884,10 +2881,10 @@ font_open_entity (struct frame *f, Lisp_Object entity, int pixel_size)
}
/* Close FONT_OBJECT. */
/* Close FONT_OBJECT that is opened on frame F. */
void
font_close_object (Lisp_Object font_object)
static void
font_close_object (struct frame *f, Lisp_Object font_object)
{
struct font *font = XFONT_OBJECT (font_object);
@ -2897,13 +2894,8 @@ font_close_object (Lisp_Object font_object)
FONT_ADD_LOG ("close", font_object, Qnil);
font->driver->close (font);
#ifdef HAVE_WINDOW_SYSTEM
eassert (font->frame);
/* If the frame is gone, we can't do anything (Bug#16128). */
if (FRAME_LIVE_P (font->frame))
{
eassert (FRAME_DISPLAY_INFO (font->frame)->n_fonts);
FRAME_DISPLAY_INFO (font->frame)->n_fonts--;
}
eassert (FRAME_DISPLAY_INFO (f)->n_fonts);
FRAME_DISPLAY_INFO (f)->n_fonts--;
#endif
}
@ -4556,11 +4548,11 @@ DEFUN ("open-font", Fopen_font, Sopen_font, 1, 3, 0,
}
DEFUN ("close-font", Fclose_font, Sclose_font, 1, 2, 0,
doc: /* Close FONT-OBJECT. Optional FRAME is unused. */)
doc: /* Close FONT-OBJECT. */)
(Lisp_Object font_object, Lisp_Object frame)
{
CHECK_FONT_OBJECT (font_object);
font_close_object (font_object);
font_close_object (decode_live_frame (frame), font_object);
return Qnil;
}
@ -4895,7 +4887,7 @@ If the named font is not yet loaded, return nil. */)
/* As font_object is still in FONT_OBJLIST of the entity, we can't
close it now. Perhaps, we should manage font-objects
by `reference-count'. */
font_close_object (font_object);
font_close_object (f, font_object);
#endif
return info;
}

7
src/font.h
View file

@ -265,9 +265,6 @@ struct font_entity
{
struct vectorlike_header header;
Lisp_Object props[FONT_ENTITY_MAX];
#ifdef HAVE_NS
struct font_driver *driver;
#endif
};
/* A value which may appear in the member `encoding' of struct font
@ -319,9 +316,6 @@ struct font
#if defined (HAVE_WINDOW_SYSTEM)
/* The frame where the font was opened. */
struct frame *frame;
/* Vertical pixel width of the underline. If is zero if that
information is not in the font. */
int underline_thickness;
@ -741,7 +735,6 @@ extern Lisp_Object merge_font_spec (Lisp_Object, Lisp_Object);
extern Lisp_Object font_make_entity (void);
extern Lisp_Object font_make_object (int, Lisp_Object, int);
extern void font_close_object (Lisp_Object);
extern Lisp_Object find_font_encoding (Lisp_Object);
extern int font_registry_charsets (Lisp_Object, struct charset **,

1
src/ftfont.c
View file

@ -1236,7 +1236,6 @@ ftfont_open (struct frame *f, Lisp_Object entity, int pixel_size)
ASET (font_object, FONT_FILE_INDEX, filename);
ASET (font_object, FONT_FORMAT_INDEX, ftfont_font_format (NULL, filename));
font = XFONT_OBJECT (font_object);
font->frame = f;
ftfont_info = (struct ftfont_info *) font;
ftfont_info->ft_size = ft_face->size;
ftfont_info->index = XINT (idx);

1
src/ftxfont.c
View file

@ -255,7 +255,6 @@ 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;
}

2
src/macfont.m
View file

@ -882,7 +882,6 @@ static void mac_font_get_glyphs_for_variants (CFDataRef, UTF32Char,
CFStringRef name;
entity = font_make_entity ();
XFONT_ENTITY (entity)->driver = &macfont_driver;
ASET (entity, FONT_TYPE_INDEX, macfont_driver.type);
ASET (entity, FONT_REGISTRY_INDEX, Qiso10646_1);
@ -2492,7 +2491,6 @@ So we use CTFontDescriptorCreateMatchingFontDescriptor (no
ASET (font_object, FONT_FULLNAME_INDEX,
AREF (font_object, FONT_NAME_INDEX));
font = XFONT_OBJECT (font_object);
font->frame = f;
font->pixel_size = size;
font->driver = &macfont_driver;
font->encoding_charset = font->repertory_charset = -1;

1
src/nsfont.m
View file

@ -805,7 +805,6 @@ when setting family in ns_spec_to_descriptor(). */
return Qnil; /* FIXME: other terms do, but return Qnil causes segfault */
}
font->frame = f;
font_info->glyphs = xzalloc (0x100 * sizeof *font_info->glyphs);
font_info->metrics = xzalloc (0x100 * sizeof *font_info->metrics);

1
src/w32font.c
View file

@ -999,7 +999,6 @@ w32font_open_internal (struct frame *f, Lisp_Object font_entity,
= DECODE_SYSTEM (build_string (logfont.lfFaceName));
}
font->frame = f;
font->max_width = w32_font->metrics.tmMaxCharWidth;
/* Parts of Emacs display assume that height = ascent + descent...
so height is defined later, after ascent and descent.

1
src/xfont.c
View file

@ -806,7 +806,6 @@ xfont_open (struct frame *f, Lisp_Object entity, int pixel_size)
ASET (font_object, FONT_FILE_INDEX, Qnil);
ASET (font_object, FONT_FORMAT_INDEX, Qx);
font = XFONT_OBJECT (font_object);
font->frame = f;
((struct xfont_info *) font)->xfont = xfont;
((struct xfont_info *) font)->display = FRAME_X_DISPLAY (f);
font->pixel_size = pixel_size;

1
src/xftfont.c
View file

@ -365,7 +365,6 @@ xftfont_open (struct frame *f, Lisp_Object entity, int pixel_size)
ASET (font_object, FONT_FORMAT_INDEX,
ftfont_font_format (xftfont->pattern, filename));
font = XFONT_OBJECT (font_object);
font->frame = f;
font->pixel_size = size;
font->driver = &xftfont_driver;
font->encoding_charset = font->repertory_charset = -1;