From c181919a57486c77a4238d03d885b36cd2d2da4a Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 3 Mar 2019 18:46:51 +0530 Subject: [PATCH] Fix rendering of simple strings with FreeType --- kitty/fonts.c | 2 +- kitty/fonts.h | 2 +- kitty/freetype.c | 18 ++++++++---------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/kitty/fonts.c b/kitty/fonts.c index 50529dd8b..6d8c26a48 100644 --- a/kitty/fonts.c +++ b/kitty/fonts.c @@ -1076,7 +1076,7 @@ render_line(FONTS_DATA_HANDLE fg_, Line *line) { StringCanvas render_simple_text(FONTS_DATA_HANDLE fg_, const char *text) { FontGroup *fg = (FontGroup*)fg_; - if (fg->fonts_count && fg->medium_font_idx) return render_simple_text_impl(fg->fonts[fg->medium_font_idx].face, text); + if (fg->fonts_count && fg->medium_font_idx) return render_simple_text_impl(fg->fonts[fg->medium_font_idx].face, text, fg->baseline); StringCanvas ans = {0}; return ans; } diff --git a/kitty/fonts.h b/kitty/fonts.h index 1543ee10d..ba7b87a43 100644 --- a/kitty/fonts.h +++ b/kitty/fonts.h @@ -37,7 +37,7 @@ void render_alpha_mask(uint8_t *alpha_mask, pixel* dest, Region *src_rect, Regio void render_line(FONTS_DATA_HANDLE, Line *line); void sprite_tracker_set_limits(size_t max_texture_size, size_t max_array_len); typedef void (*free_extra_data_func)(void*); -StringCanvas render_simple_text_impl(PyObject *s, const char *text); +StringCanvas render_simple_text_impl(PyObject *s, const char *text, unsigned int baseline); StringCanvas render_simple_text(FONTS_DATA_HANDLE fg_, const char *text); static inline void diff --git a/kitty/freetype.c b/kitty/freetype.c index ed1270471..90268eb95 100644 --- a/kitty/freetype.c +++ b/kitty/freetype.c @@ -576,16 +576,17 @@ extra_data(PyObject *self, PyObject *a UNUSED) { StringCanvas -render_simple_text_impl(PyObject *s, const char *text) { +render_simple_text_impl(PyObject *s, const char *text, unsigned int baseline) { Face *self = (Face*)s; StringCanvas ans = {0}; size_t num_chars = strnlen(text, 32); int max_char_width = font_units_to_pixels_x(self, self->face->max_advance_width); size_t canvas_width = max_char_width * (num_chars*2); size_t canvas_height = font_units_to_pixels_y(self, self->face->height) + 8; - unsigned char *canvas = calloc(1, canvas_width * canvas_height); + pixel *canvas = calloc(canvas_width * canvas_height, sizeof(pixel)); if (!canvas) return ans; size_t pen_x = 0; + ProcessedBitmap pbm; for (size_t n = 0; n < num_chars; n++) { FT_UInt glyph_index = FT_Get_Char_Index(self->face, text[n]); int error = FT_Load_Glyph(self->face, glyph_index, FT_LOAD_DEFAULT); @@ -593,12 +594,9 @@ render_simple_text_impl(PyObject *s, const char *text) { error = FT_Render_Glyph(self->face->glyph, FT_RENDER_MODE_NORMAL); if (error) continue; FT_Bitmap *bitmap = &self->face->glyph->bitmap; - const unsigned char *rowp = bitmap->buffer; - for (size_t row = 0; row < MIN(bitmap->rows, canvas_height); row++) { - rowp += bitmap->pitch; - unsigned char *canvasp = canvas + ((row * canvas_width) + pen_x); - memcpy(canvasp, rowp, MIN(bitmap->width, canvas_width - pen_x)); - } + pbm = EMPTY_PBM; + populate_processed_bitmap(self->face->glyph, bitmap, &pbm, false); + place_bitmap_in_canvas(canvas, &pbm, canvas_width, canvas_height, pen_x, 0, baseline); pen_x += self->face->glyph->advance.x >> 6; } ans.width = pen_x; ans.height = canvas_height; @@ -606,8 +604,8 @@ render_simple_text_impl(PyObject *s, const char *text) { if (ans.canvas) { for (size_t row = 0; row < ans.height; row++) { unsigned char *destp = ans.canvas + (ans.width * row); - unsigned char *srcp = canvas + (canvas_width * row); - memcpy(destp, srcp, ans.width); + pixel *srcp = canvas + (canvas_width * row); + for (size_t i = 0; i < ans.width; i++) destp[i] = srcp[i] & 0xff; } } free(canvas);