From a378aa9de73b402c231b562a16c6e46c91f420cf Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Wed, 4 Dec 2013 17:08:30 +0400 Subject: [PATCH] * font.c (font_list_entities): Remove dummy assignment. * font.h (struct font) [HAVE_WINDOW_SYSTEM]: Group members which are used on graphic displays only. Remove unused 'font_encoder' member. * nsfont.m (nsfont_open): * w32font.c (w32font_open_internal): Adjust users. --- src/ChangeLog | 8 ++++++++ src/font.c | 2 +- src/font.h | 15 +++++++++------ src/nsfont.m | 1 - src/w32font.c | 1 - 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index f7ed14c1f40..a7e758539f4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2013-12-04 Dmitry Antipov + + * font.c (font_list_entities): Remove dummy assignment. + * font.h (struct font) [HAVE_WINDOW_SYSTEM]: Group members which are + used on graphic displays only. Remove unused 'font_encoder' member. + * nsfont.m (nsfont_open): + * w32font.c (w32font_open_internal): Adjust users. + 2013-12-03 Paul Eggert Use bool for boolean. diff --git a/src/font.c b/src/font.c index 1e1670b21af..ad604ebe744 100644 --- a/src/font.c +++ b/src/font.c @@ -2718,7 +2718,7 @@ font_list_entities (struct frame *f, Lisp_Object spec) ASET (scratch_font_spec, FONT_SPACING_INDEX, AREF (spec, FONT_SPACING_INDEX)); ASET (scratch_font_spec, FONT_EXTRA_INDEX, AREF (spec, FONT_EXTRA_INDEX)); - for (i = 0; driver_list; driver_list = driver_list->next) + for (; driver_list; driver_list = driver_list->next) if (driver_list->on && (NILP (ftype) || EQ (driver_list->driver->type, ftype))) { diff --git a/src/font.h b/src/font.h index 1f2f9bfbb19..9928fb3196d 100644 --- a/src/font.h +++ b/src/font.h @@ -312,6 +312,10 @@ struct font /* Ascent and descent of the font (in pixels). */ int ascent, descent; + /* The following members makes sense on graphic displays only. */ + +#if defined (HAVE_WINDOW_SYSTEM) + /* Vertical pixel width of the underline. If is zero if that information is not in the font. */ int underline_thickness; @@ -374,12 +378,6 @@ struct font registered in char-table `use-default-ascent'. */ int default_ascent; - /* CCL program to calculate code points of the font. */ - struct ccl_program *font_encoder; - - /* Font-driver for the font. */ - struct font_driver *driver; - /* Charset to encode a character code into a glyph code of the font. -1 means that the font doesn't require this information to encode a character. */ @@ -390,6 +388,11 @@ struct font determine it. */ int repertory_charset; +#endif /* HAVE_WINDOW_SYSTEM */ + + /* Font-driver for the font. */ + struct font_driver *driver; + /* There are more members in this structure, but they are private to the font-driver. */ }; diff --git a/src/nsfont.m b/src/nsfont.m index 58663804a2f..0f546408316 100644 --- a/src/nsfont.m +++ b/src/nsfont.m @@ -829,7 +829,6 @@ nsfont_open (struct frame *f, Lisp_Object font_entity, int pixel_size) font->vertical_centering = 0; font->baseline_offset = 0; font->relative_compose = 0; - font->font_encoder = NULL; font->props[FONT_FORMAT_INDEX] = Qns; font->props[FONT_FILE_INDEX] = Qnil; diff --git a/src/w32font.c b/src/w32font.c index 923c71b1147..654e0d9cae4 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -1012,7 +1012,6 @@ w32font_open_internal (struct frame *f, Lisp_Object font_entity, font->baseline_offset = 0; font->relative_compose = 0; font->default_ascent = w32_font->metrics.tmAscent; - font->font_encoder = NULL; font->pixel_size = size; font->driver = &w32font_driver; /* Use format cached during list, as the information we have access to -- 2.39.2