KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix rendering of simple strings with FreeType

Browse Source
This commit is contained in:
Kovid Goyal 2019-03-03 18:46:51 +05:30
parent 5955b44c74
commit c181919a57
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kitty/fonts.c
View File

@ -1076,7 +1076,7 @@ render_line(FONTS_DATA_HANDLE fg_, Line *line) {
StringCanvas StringCanvas
render_simple_text(FONTS_DATA_HANDLE fg_, const char *text) { render_simple_text(FONTS_DATA_HANDLE fg_, const char *text) {
FontGroup *fg = (FontGroup*)fg_; 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}; StringCanvas ans = {0};
return ans; return ans;
} }

2
kitty/fonts.h
View File

@ -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 render_line(FONTS_DATA_HANDLE, Line *line);
void sprite_tracker_set_limits(size_t max_texture_size, size_t max_array_len); void sprite_tracker_set_limits(size_t max_texture_size, size_t max_array_len);
typedef void (*free_extra_data_func)(void*); 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); StringCanvas render_simple_text(FONTS_DATA_HANDLE fg_, const char *text);
static inline void static inline void

18
kitty/freetype.c
View File

@ -576,16 +576,17 @@ extra_data(PyObject *self, PyObject *a UNUSED) {
StringCanvas 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; Face *self = (Face*)s;
StringCanvas ans = {0}; StringCanvas ans = {0};
size_t num_chars = strnlen(text, 32); size_t num_chars = strnlen(text, 32);
int max_char_width = font_units_to_pixels_x(self, self->face->max_advance_width); 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_width = max_char_width * (num_chars*2);
size_t canvas_height = font_units_to_pixels_y(self, self->face->height) + 8; 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; if (!canvas) return ans;
size_t pen_x = 0; size_t pen_x = 0;
ProcessedBitmap pbm;
for (size_t n = 0; n < num_chars; n++) { for (size_t n = 0; n < num_chars; n++) {
FT_UInt glyph_index = FT_Get_Char_Index(self->face, text[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); 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); error = FT_Render_Glyph(self->face->glyph, FT_RENDER_MODE_NORMAL);
if (error) continue; if (error) continue;
FT_Bitmap *bitmap = &self->face->glyph->bitmap; FT_Bitmap *bitmap = &self->face->glyph->bitmap;
const unsigned char *rowp = bitmap->buffer; pbm = EMPTY_PBM;
for (size_t row = 0; row < MIN(bitmap->rows, canvas_height); row++) { populate_processed_bitmap(self->face->glyph, bitmap, &pbm, false);
rowp += bitmap->pitch; place_bitmap_in_canvas(canvas, &pbm, canvas_width, canvas_height, pen_x, 0, baseline);
unsigned char *canvasp = canvas + ((row * canvas_width) + pen_x);
memcpy(canvasp, rowp, MIN(bitmap->width, canvas_width - pen_x));
}
pen_x += self->face->glyph->advance.x >> 6; pen_x += self->face->glyph->advance.x >> 6;
} }
ans.width = pen_x; ans.height = canvas_height; ans.width = pen_x; ans.height = canvas_height;
@ -606,8 +604,8 @@ render_simple_text_impl(PyObject *s, const char *text) {
if (ans.canvas) { if (ans.canvas) {
for (size_t row = 0; row < ans.height; row++) { for (size_t row = 0; row < ans.height; row++) {
unsigned char *destp = ans.canvas + (ans.width * row); unsigned char *destp = ans.canvas + (ans.width * row);
unsigned char *srcp = canvas + (canvas_width * row); pixel *srcp = canvas + (canvas_width * row);
memcpy(destp, srcp, ans.width); for (size_t i = 0; i < ans.width; i++) destp[i] = srcp[i] & 0xff;
} }
} }
free(canvas); free(canvas);