From cb02c9cf416815c5d55254d3c81647b28ca0aa47 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sun, 28 Jul 2019 12:09:22 +0200 Subject: font: load FreeType face, and set it's pixel sizes --- main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index 8248e28a..31de1b58 100644 --- a/main.c +++ b/main.c @@ -409,20 +409,19 @@ main(int argc, char *const *argv) thrd_t keyboard_repeater_id; thrd_create(&keyboard_repeater_id, &keyboard_repeater, &term); - term.fonts[0].font = font_from_name(conf.font); - if (term.fonts[0].font == NULL) + if (!font_from_name(conf.font, &term.fonts[0])) goto out; { char fname[1024]; snprintf(fname, sizeof(fname), "%s:style=bold", conf.font); - term.fonts[1].font = font_from_name(fname); + font_from_name(fname, &term.fonts[1]); snprintf(fname, sizeof(fname), "%s:style=italic", conf.font); - term.fonts[2].font = font_from_name(fname); + font_from_name(fname, &term.fonts[2]); snprintf(fname, sizeof(fname), "%s:style=bold italic", conf.font); - term.fonts[3].font = font_from_name(fname); + font_from_name(fname, &term.fonts[3]); } /* Underline position and size */ @@ -924,6 +923,9 @@ out: for (size_t j = 0; j < 256; j++) cairo_glyph_free(f->glyph_cache[j].glyphs); + + if (f->face != NULL) + FT_Done_Face(f->face); } if (term.flash.fd != -1) -- cgit v1.3 From c399c329b67d1655cf6fa48a180f29c5019a7c88 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sun, 28 Jul 2019 12:39:56 +0200 Subject: main: calculate *all* font metrics from the FreeType face --- main.c | 25 +++++++++++++++++-------- terminal.h | 8 +++++++- 2 files changed, 24 insertions(+), 9 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index 31de1b58..80ec053e 100644 --- a/main.c +++ b/main.c @@ -428,10 +428,10 @@ main(int argc, char *const *argv) for (size_t i = 0; i < sizeof(term.fonts) / sizeof(term.fonts[0]); i++) { struct font *f = &term.fonts[i]; - if (f->font == NULL) + if (f->face == NULL) continue; - FT_Face ft_face = cairo_ft_scaled_font_lock_face(f->font); + FT_Face ft_face = f->face; double x_scale = ft_face->size->metrics.x_scale / 65526.; double height = ft_face->size->metrics.height / 64; @@ -464,18 +464,27 @@ main(int argc, char *const *argv) LOG_DBG("strikeout: pos=%f, thick=%f", f->strikeout.position, f->strikeout.thickness); + } + + { + FT_Face ft_face = term.fonts[0].face; + int max_x_advance = ft_face->size->metrics.max_advance / 64; + int height = ft_face->size->metrics.height / 64; + int descent = ft_face->size->metrics.descender / 64; + int ascent = ft_face->size->metrics.ascender / 64; - cairo_ft_scaled_font_unlock_face(f->font); + term.fextents.height = height; + term.fextents.descent = -descent; + term.fextents.ascent = ascent; + term.fextents.max_x_advance = max_x_advance; + + LOG_WARN("metrics: height: %d, descent: %d, ascent: %d, x-advance: %d", + height, descent, ascent, max_x_advance); } - cairo_scaled_font_extents(term.fonts[0].font, &term.fextents); term.cell_width = (int)ceil(term.fextents.max_x_advance); term.cell_height = (int)ceil(term.fextents.height); - LOG_DBG("font: height: %.2f, x-advance: %.2f", - term.fextents.height, term.fextents.max_x_advance); - assert(term.fextents.max_y_advance == 0); - /* Glyph cache */ for (size_t i = 0; i < sizeof(term.fonts) / sizeof(term.fonts[0]); i++) { struct font *f = &term.fonts[i]; diff --git a/terminal.h b/terminal.h index ed8adf0d..6c0b81f1 100644 --- a/terminal.h +++ b/terminal.h @@ -325,7 +325,13 @@ struct terminal { struct grid *grid; struct font fonts[4]; - cairo_font_extents_t fextents; + //cairo_font_extents_t fextents; + struct { + int height; + int descent; + int ascent; + int max_x_advance; + } fextents; struct wayland wl; struct { -- cgit v1.3 From 175dc9cf9483e389c2440a68b9472b1befc4d459 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sun, 28 Jul 2019 12:45:01 +0200 Subject: cairo-ft: remove all usages of cairo-ft --- font.c | 38 -------------------------------------- main.c | 34 ---------------------------------- meson.build | 3 +-- render.c | 4 +++- terminal.h | 3 --- 5 files changed, 4 insertions(+), 78 deletions(-) (limited to 'main.c') diff --git a/font.c b/font.c index d16cc5ee..5686c12a 100644 --- a/font.c +++ b/font.c @@ -5,7 +5,6 @@ #include #include -#include #define LOG_MODULE "font" #include "log.h" @@ -43,12 +42,6 @@ font_from_name(const char *name, struct font *font) return false; } - cairo_font_options_t *options = cairo_font_options_create(); - cairo_font_options_set_hint_style(options, CAIRO_HINT_STYLE_DEFAULT); - cairo_font_options_set_antialias(options, CAIRO_ANTIALIAS_DEFAULT); - cairo_font_options_set_subpixel_order(options, CAIRO_SUBPIXEL_ORDER_DEFAULT); - cairo_ft_font_options_substitute(options, pattern); - FcDefaultSubstitute(pattern); FcResult result; @@ -98,39 +91,8 @@ font_from_name(const char *name, struct font *font) if (FcPatternGetBool(final_pattern, FC_ANTIALIAS, 0, &fc_antialias) != FcResultMatch) fc_antialias = FcTrue; - cairo_font_options_set_hint_style( - options, fc_hinting ? CAIRO_HINT_STYLE_DEFAULT : CAIRO_HINT_STYLE_NONE); - cairo_font_options_set_antialias( - options, fc_antialias ? CAIRO_ANTIALIAS_DEFAULT : CAIRO_ANTIALIAS_NONE); - - cairo_font_face_t *face = cairo_ft_font_face_create_for_pattern( - final_pattern); - FcPatternDestroy(final_pattern); - if (cairo_font_face_status(face) != CAIRO_STATUS_SUCCESS) { - LOG_ERR("%s: failed to create cairo font face", name); - cairo_font_face_destroy(face); - return false; - } - - cairo_matrix_t matrix, ctm; - cairo_matrix_init_identity(&ctm); - cairo_matrix_init_scale(&matrix, size, size); - - cairo_scaled_font_t *scaled_font = cairo_scaled_font_create( - face, &matrix, &ctm, options); - - cairo_font_options_destroy(options); - cairo_font_face_destroy(face); - - if (cairo_scaled_font_status(scaled_font) != CAIRO_STATUS_SUCCESS) { - LOG_ERR("%s: failed to create scaled font", name); - cairo_scaled_font_destroy(scaled_font); - return false; - } - font->face = ft_face; - font->font = scaled_font; return true; } diff --git a/main.c b/main.c index 80ec053e..dfcc28ab 100644 --- a/main.c +++ b/main.c @@ -485,34 +485,6 @@ main(int argc, char *const *argv) term.cell_width = (int)ceil(term.fextents.max_x_advance); term.cell_height = (int)ceil(term.fextents.height); - /* Glyph cache */ - for (size_t i = 0; i < sizeof(term.fonts) / sizeof(term.fonts[0]); i++) { - struct font *f = &term.fonts[i]; - - for (int j = 0; j < 256; j++) { - cairo_glyph_t *glyphs = NULL; - int count = 0; - - char c = j; - cairo_status_t status = cairo_scaled_font_text_to_glyphs( - f->font, 0, 0 + term.fextents.ascent, - &c, 1, &glyphs, &count, - NULL, NULL, NULL); - - if (status != CAIRO_STATUS_SUCCESS) - continue; - - if (count == 0) - continue; - - assert(glyphs != NULL); - assert(count == 1); - - f->glyph_cache[j].glyphs = glyphs; - f->glyph_cache[j].count = count; - } - } - term.wl.display = wl_display_connect(NULL); if (term.wl.display == NULL) { LOG_ERR("failed to connect to wayland; no compositor running?"); @@ -927,12 +899,6 @@ out: for (size_t i = 0; i < sizeof(term.fonts) / sizeof(term.fonts[0]); i++) { struct font *f = &term.fonts[i]; - if (f->font != NULL) - cairo_scaled_font_destroy(f->font); - - for (size_t j = 0; j < 256; j++) - cairo_glyph_free(f->glyph_cache[j].glyphs); - if (f->face != NULL) FT_Done_Face(f->face); } diff --git a/meson.build b/meson.build index a6da9aba..95a139d7 100644 --- a/meson.build +++ b/meson.build @@ -23,7 +23,6 @@ math = cc.find_library('m') threads = dependency('threads') fontconfig = dependency('fontconfig') cairo = dependency('cairo') -cairo_ft = dependency('cairo-ft') wayland_protocols = dependency('wayland-protocols') wayland_client = dependency('wayland-client') wayland_cursor = dependency('wayland-cursor') @@ -78,7 +77,7 @@ executable( 'tllist.h', 'vt.c', 'vt.h', wl_proto_src + wl_proto_headers, - dependencies: [threads, math, cairo, cairo_ft, fontconfig, wayland_client, wayland_cursor, xkb], + dependencies: [threads, math, cairo, fontconfig, wayland_client, wayland_cursor, xkb], install: true) custom_target( diff --git a/render.c b/render.c index 5d16689d..e1340a86 100644 --- a/render.c +++ b/render.c @@ -61,15 +61,17 @@ gseq_flush(struct terminal *term, struct buffer *buf) if (gseq.count == 0) return; + assert(NULL); struct rgb fg = color_hex_to_rgb(gseq.foreground); if (gseq.attrs.dim) color_dim(&fg); +#if 0 cairo_set_scaled_font(buf->cairo, attrs_to_font(term, &gseq.attrs)->font); cairo_set_source_rgb(buf->cairo, fg.r, fg.g, fg.b); cairo_show_glyphs(buf->cairo, gseq.glyphs, gseq.count); - +#endif gseq.g = gseq.glyphs; gseq.count = 0; } diff --git a/terminal.h b/terminal.h index 6c0b81f1..b5fea057 100644 --- a/terminal.h +++ b/terminal.h @@ -213,7 +213,6 @@ struct glyph_cache { struct font { FT_Face face; - cairo_scaled_font_t *font; struct { double position; double thickness; @@ -222,8 +221,6 @@ struct font { double position; double thickness; } strikeout; - - struct glyph_cache glyph_cache[256]; }; enum cursor_style { CURSOR_BLOCK, CURSOR_UNDERLINE, CURSOR_BAR }; -- cgit v1.3 From fe882bddbab2b3c75220976ba01cc998773fdfa5 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sun, 28 Jul 2019 21:03:38 +0200 Subject: font: populate glyph cache (ASCII characters only) when instantiating font --- font.c | 25 ++++++++++++++++++ font.h | 1 + main.c | 9 +++---- render.c | 89 +++++++++----------------------------------------------------- terminal.h | 2 ++ 5 files changed, 44 insertions(+), 82 deletions(-) (limited to 'main.c') diff --git a/font.c b/font.c index b22e4457..49fd8130 100644 --- a/font.c +++ b/font.c @@ -25,6 +25,14 @@ fini(void) FT_Done_FreeType(ft_lib); } +static void +font_populate_glyph_cache(struct font *font) +{ + memset(font->cache, 0, sizeof(font->cache)); + for (size_t i = 0; i < 256; i++) + font_glyph_for_utf8(font, &(char){i}, &font->cache[i]); +} + bool font_from_name(const char *name, struct font *font) { @@ -94,6 +102,7 @@ font_from_name(const char *name, struct font *font) FcPatternDestroy(final_pattern); font->face = ft_face; + font_populate_glyph_cache(font); return true; } @@ -114,6 +123,8 @@ font_glyph_for_utf8(const struct font *font, const char *utf8, if (err != 0) return false; + assert(font->face->glyph->format == FT_GLYPH_FORMAT_BITMAP); + FT_Bitmap *bitmap = &font->face->glyph->bitmap; assert(bitmap->pixel_mode == FT_PIXEL_MODE_GRAY || bitmap->pixel_mode == FT_PIXEL_MODE_MONO); @@ -172,3 +183,17 @@ font_glyph_for_utf8(const struct font *font, const char *utf8, }; return true; } + +void +font_destroy(struct font *font) +{ + if (font->face != NULL) + FT_Done_Face(font->face); + + for (size_t i = 0; i < 256; i++) { + if (font->cache[i].surf != NULL) + cairo_surface_destroy(font->cache[i].surf); + if (font->cache[i].data != NULL) + free(font->cache[i].data); + } +} diff --git a/font.h b/font.h index d8efd509..c02e4ac1 100644 --- a/font.h +++ b/font.h @@ -6,3 +6,4 @@ bool font_from_name(const char *name, struct font *result); bool font_glyph_for_utf8( const struct font *font, const char *utf8, struct glyph *glyph); +void font_destroy(struct font *font); diff --git a/main.c b/main.c index dfcc28ab..7d0fa355 100644 --- a/main.c +++ b/main.c @@ -896,12 +896,8 @@ out: free(term.window_title); tll_free_and_free(term.window_title_stack, free); - for (size_t i = 0; i < sizeof(term.fonts) / sizeof(term.fonts[0]); i++) { - struct font *f = &term.fonts[i]; - - if (f->face != NULL) - FT_Done_Face(f->face); - } + for (size_t i = 0; i < sizeof(term.fonts) / sizeof(term.fonts[0]); i++) + font_destroy(&term.fonts[i]); if (term.flash.fd != -1) close(term.flash.fd); @@ -921,4 +917,5 @@ out: cairo_debug_reset_static_data(); return ret; + } diff --git a/render.c b/render.c index 7bebbbce..cf6c013e 100644 --- a/render.c +++ b/render.c @@ -258,93 +258,30 @@ render_cell(struct terminal *term, struct buffer *buf, const struct cell *cell, gseq.foreground = _fg; } -#if 0 - int new_glyphs - = sizeof(gseq.glyphs) / sizeof(gseq.glyphs[0]) - gseq.count; -#endif - struct font *font = attrs_to_font(term, &cell->attrs); -#if 0 - struct glyph_cache *entry = cell->c[1] == '\0' - ? &font->glyph_cache[(unsigned char)cell->c[0]] - : NULL; - - if (likely(entry != NULL && entry->glyphs != NULL)) { - /* Copy cached glyph(s) and upate position */ - memcpy(gseq.g, entry->glyphs, entry->count * sizeof(gseq.g[0])); - for (size_t i = 0; i < entry->count; i++) { - gseq.g[i].x += x; - gseq.g[i].y += y; - } - - new_glyphs = entry->count; - } else { - /* Must generate new glyph(s) */ - cairo_status_t status = cairo_scaled_font_text_to_glyphs( - font->font, x, y + term->fextents.ascent, - cell->c, strnlen(cell->c, 4), &gseq.g, &new_glyphs, - NULL, NULL, NULL); - - if (status != CAIRO_STATUS_SUCCESS) - return; + struct glyph *glyph = NULL; + if (strnlen(cell->c, 4) == 1) { + if (font->cache[(unsigned char)cell->c[0]].surf != NULL) + glyph = &font->cache[(unsigned char)cell->c[0]]; } - gseq.g += new_glyphs; - gseq.count += new_glyphs; - assert(gseq.count <= sizeof(gseq.glyphs) / sizeof(gseq.glyphs[0])); -#else - - struct foo_cache { - uint8_t *data; - cairo_surface_t *surf; - int left; - int top; - }; - static struct foo_cache foo_cache[4][256] = {0}; - - cairo_surface_t *glyph = NULL; - double left, top; - - struct foo_cache *e = strnlen(cell->c, 4) == 1 - ? &foo_cache[cell->attrs.italic << 1 | cell->attrs.bold][(unsigned char)cell->c[0]] - : NULL; - - if (e == NULL || e->data == NULL) { - struct glyph g; - if (!font_glyph_for_utf8(font, cell->c, &g)) - goto done; - - if (e != NULL) { - e->data = g.data; - e->surf = g.surf; - e->left = g.left; - e->top = g.top; - } - - glyph = g.surf; - left = g.left; - top = g.top; - } else { - glyph = e->surf; - left = e->left; - top = e->top; + struct glyph _glyph; + if (glyph == NULL) { + if (!font_glyph_for_utf8(font, cell->c, &_glyph)) + return; + glyph = &_glyph; } assert(glyph != NULL); cairo_set_source_rgb(buf->cairo, fg.r, fg.g, fg.b); cairo_set_operator(buf->cairo, CAIRO_OPERATOR_OVER); - cairo_mask_surface(buf->cairo, glyph, x + left, y + term->fextents.ascent - top); + cairo_mask_surface(buf->cairo, glyph->surf, x + glyph->left, y + term->fextents.ascent - glyph->top); - if (e == NULL) { - void *raw = cairo_image_surface_get_data(glyph); - cairo_surface_destroy(glyph); - free(raw); + if (glyph == &_glyph) { + cairo_surface_destroy(_glyph.surf); + free(_glyph.data); } - -done: - return; -#endif } static void diff --git a/terminal.h b/terminal.h index 83efe69a..89f3dc39 100644 --- a/terminal.h +++ b/terminal.h @@ -223,6 +223,8 @@ struct font { double position; double thickness; } strikeout; + + struct glyph cache[256]; }; enum cursor_style { CURSOR_BLOCK, CURSOR_UNDERLINE, CURSOR_BAR }; -- cgit v1.3