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

Fix a regression in 0.14.5 that caused rendering of private use glyphs with and without spaces to be identical

Browse Source 
Fixes #2117
This commit is contained in:
Kovid Goyal 2019-11-08 07:55:41 +05:30
parent c1febea659
commit de84489a20
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changelog.rst
View File

@ -28,6 +28,9 @@ To update |kitty|, :doc:`follow the instructions <binary>`.
it possible for programs running on the local machine to control kitty it possible for programs running on the local machine to control kitty
but not programs running over ssh. but not programs running over ssh.
- Fix a regression in 0.14.5 that caused rendering of private use glyphs
with and without spaces to be identical (:iss:`2117`)
0.14.6 [2019-09-25] 0.14.6 [2019-09-25]
--------------------- ---------------------

7
kitty/fonts.c
View File

@ -27,6 +27,7 @@ enum {NO_FONT=-3, MISSING_FONT=-2, BLANK_FONT=-1, BOX_FONT=0};
typedef struct { typedef struct {
glyph_index data[MAX_NUM_EXTRA_GLYPHS]; glyph_index data[MAX_NUM_EXTRA_GLYPHS];
uint8_t space_ligature_size;
} ExtraGlyphs; } ExtraGlyphs;
typedef struct SpritePosition SpritePosition; typedef struct SpritePosition SpritePosition;
@ -218,6 +219,7 @@ do_increment(FontGroup *fg, int *error) {
static inline bool static inline bool
extra_glyphs_equal(ExtraGlyphs *a, ExtraGlyphs *b) { extra_glyphs_equal(ExtraGlyphs *a, ExtraGlyphs *b) {
if (a->space_ligature_size != b->space_ligature_size) return false;
for (size_t i = 0; i < MAX_NUM_EXTRA_GLYPHS; i++) { for (size_t i = 0; i < MAX_NUM_EXTRA_GLYPHS; i++) {
if (a->data[i] != b->data[i]) return false; if (a->data[i] != b->data[i]) return false;
if (a->data[i] == 0) return true; if (a->data[i] == 0) return true;
@ -691,7 +693,7 @@ static inline void
render_group(FontGroup *fg, unsigned int num_cells, unsigned int num_glyphs, CPUCell *cpu_cells, GPUCell *gpu_cells, hb_glyph_info_t *info, hb_glyph_position_t *positions, Font *font, glyph_index glyph, ExtraGlyphs *extra_glyphs, bool center_glyph) { render_group(FontGroup *fg, unsigned int num_cells, unsigned int num_glyphs, CPUCell *cpu_cells, GPUCell *gpu_cells, hb_glyph_info_t *info, hb_glyph_position_t *positions, Font *font, glyph_index glyph, ExtraGlyphs *extra_glyphs, bool center_glyph) {
static SpritePosition* sprite_position[16]; static SpritePosition* sprite_position[16];
int error = 0; int error = 0;
num_cells = MIN(sizeof(sprite_position)/sizeof(sprite_position[0]), num_cells); num_cells = MIN(arraysz(sprite_position), num_cells);
for (unsigned int i = 0; i < num_cells; i++) { for (unsigned int i = 0; i < num_cells; i++) {
sprite_position[i] = sprite_position_for(fg, font, glyph, extra_glyphs, (uint8_t)i, &error); sprite_position[i] = sprite_position_for(fg, font, glyph, extra_glyphs, (uint8_t)i, &error);
if (error != 0) { sprite_map_set_error(error); PyErr_Print(); return; } if (error != 0) { sprite_map_set_error(error); PyErr_Print(); return; }
@ -726,6 +728,7 @@ typedef struct {
typedef struct { typedef struct {
unsigned int first_glyph_idx, first_cell_idx, num_glyphs, num_cells; unsigned int first_glyph_idx, first_cell_idx, num_glyphs, num_cells;
uint8_t space_ligature_size;
bool has_special_glyph; bool has_special_glyph;
} Group; } Group;
@ -971,6 +974,7 @@ merge_groups_for_pua_space_ligature(void) {
/* g->num_glyphs = MIN(g->num_glyphs, MAX_NUM_EXTRA_GLYPHS + 1); */ /* g->num_glyphs = MIN(g->num_glyphs, MAX_NUM_EXTRA_GLYPHS + 1); */
G(group_idx)--; G(group_idx)--;
} }
G(groups)->space_ligature_size = (uint8_t)G(groups)->num_cells;
} }
static inline void static inline void
@ -1004,6 +1008,7 @@ render_groups(FontGroup *fg, Font *font, bool center_glyph) {
int last = -1; int last = -1;
for (i = 1; i < MIN(arraysz(ed.data) + 1, group->num_glyphs); i++) { last = i - 1; ed.data[last] = G(info)[group->first_glyph_idx + i].codepoint; } for (i = 1; i < MIN(arraysz(ed.data) + 1, group->num_glyphs); i++) { last = i - 1; ed.data[last] = G(info)[group->first_glyph_idx + i].codepoint; }
if ((size_t)(last + 1) < arraysz(ed.data)) ed.data[last + 1] = 0; if ((size_t)(last + 1) < arraysz(ed.data)) ed.data[last + 1] = 0;
ed.space_ligature_size = group->space_ligature_size;
render_group(fg, group->num_cells, group->num_glyphs, G(first_cpu_cell) + group->first_cell_idx, G(first_gpu_cell) + group->first_cell_idx, G(info) + group->first_glyph_idx, G(positions) + group->first_glyph_idx, font, primary, &ed, center_glyph); render_group(fg, group->num_cells, group->num_glyphs, G(first_cpu_cell) + group->first_cell_idx, G(first_gpu_cell) + group->first_cell_idx, G(info) + group->first_glyph_idx, G(positions) + group->first_glyph_idx, font, primary, &ed, center_glyph);
idx++; idx++;
} }