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

Dont render glyphs that would overflow the canvas

Browse Source
This commit is contained in:
Kovid Goyal 2021-03-31 11:05:05 +05:30
parent 73a06b0e9e
commit debd9fe419
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kitty/freetype_render_ui_text.c
View File

@ -206,6 +206,7 @@ render_run(RenderState *rs) {
for (unsigned int i = 0; i < len; i++) { for (unsigned int i = 0; i < len; i++) {
rs->x += (float)positions[i].x_offset / 64.0f; rs->x += (float)positions[i].x_offset / 64.0f;
rs->y += (float)positions[i].y_offset / 64.0f; rs->y += (float)positions[i].y_offset / 64.0f;
if (rs->x > rs->output_width) break;
int error = FT_Load_Glyph(face, info[i].codepoint, load_flags); int error = FT_Load_Glyph(face, info[i].codepoint, load_flags);
if (error) continue; if (error) continue;
ProcessedBitmap pbm = {.factor=1}; ProcessedBitmap pbm = {.factor=1};
@ -280,7 +281,7 @@ render_single_line(const char *text, pixel fg, pixel bg, uint8_t *output_buf, si
.output = (pixel*)output_buf, .x = x_offset, .y = y_offset .output = (pixel*)output_buf, .x = x_offset, .y = y_offset
}; };
for (uint32_t i = 0, codep = 0, state = 0, prev = UTF8_ACCEPT; text[i] > 0; i++) { for (uint32_t i = 0, codep = 0, state = 0, prev = UTF8_ACCEPT; text[i] > 0 && rs.x < rs.output_width; i++) {
switch(decode_utf8(&state, &codep, text[i])) { switch(decode_utf8(&state, &codep, text[i])) {
case UTF8_ACCEPT: case UTF8_ACCEPT:
if (current_font_has_codepoint(&rs, codep)) { if (current_font_has_codepoint(&rs, codep)) {
@ -305,7 +306,7 @@ render_single_line(const char *text, pixel fg, pixel bg, uint8_t *output_buf, si
} }
prev = state; prev = state;
} }
if (rs.pending_in_buffer) { if (rs.pending_in_buffer && rs.x < rs.output_width) {
if (!render_run(&rs)) return false; if (!render_run(&rs)) return false;
rs.pending_in_buffer = 0; rs.pending_in_buffer = 0;
hb_buffer_clear_contents(hb_buffer); hb_buffer_clear_contents(hb_buffer);