mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-17 01:33:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix plain text rendering line breaking with mutibyte sequences (fixes bug #2134)

Browse Source
This commit is contained in:
Vincent Sanders 2014-05-29 11:25:52 +01:00
parent 7c0da1e94f
commit 4acfda898b
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
render/textplain.c
View File

@ -29,6 +29,7 @@
#include <math.h> #include <math.h>
#include <parserutils/input/inputstream.h> #include <parserutils/input/inputstream.h>
#include <parserutils/charset/utf8.h>
#include "content/content_protected.h" #include "content/content_protected.h"
#include "content/hlcache.h" #include "content/hlcache.h"
@ -465,6 +466,8 @@ void textplain_reformat(struct content *c, int width, int height)
int character_width; int character_width;
size_t line_start; size_t line_start;
LOG(("content %p w:%d h:%d",c, width, height));
/* compute available columns (assuming monospaced font) - use 8 /* compute available columns (assuming monospaced font) - use 8
* characters for better accuracy */ * characters for better accuracy */
if (!nsfont.font_width(&textplain_style, "ABCDEFGH", 8, &character_width)) if (!nsfont.font_width(&textplain_style, "ABCDEFGH", 8, &character_width))
@ -485,12 +488,27 @@ void textplain_reformat(struct content *c, int width, int height)
line[line_count++].start = line_start = 0; line[line_count++].start = line_start = 0;
space = 0; space = 0;
for (i = 0, col = 0; i != utf8_data_size; i++) { i = 0;
bool term = (utf8_data[i] == '\n' || utf8_data[i] == '\r'); col = 0;
size_t next_col = col + 1; while (i < utf8_data_size) {
size_t csize; /* number of bytes in character */
uint32_t chr;
bool term;
size_t next_col;
parserutils_error perror;
if (utf8_data[i] == '\t') perror = parserutils_charset_utf8_to_ucs4((const uint8_t *)utf8_data + i, utf8_data_size - i, &chr, &csize);
if (perror != PARSERUTILS_OK) {
chr = 0xfffd;
}
term = (chr == '\n' || chr == '\r');
next_col = col + 1;
if (chr == '\t') {
next_col = (next_col + TAB_WIDTH - 1) & ~(TAB_WIDTH - 1); next_col = (next_col + TAB_WIDTH - 1) & ~(TAB_WIDTH - 1);
}
if (term || next_col >= columns) { if (term || next_col >= columns) {
if (line_count % 1024 == 0) { if (line_count % 1024 == 0) {
@ -515,7 +533,6 @@ void textplain_reformat(struct content *c, int width, int height)
/* break at last space in line */ /* break at last space in line */
i = space; i = space;
line[line_count-1].length = (i + 1) - line_start; line[line_count-1].length = (i + 1) - line_start;
} else } else
line[line_count-1].length = i - line_start; line[line_count-1].length = i - line_start;
} }
@ -524,9 +541,10 @@ void textplain_reformat(struct content *c, int width, int height)
space = 0; space = 0;
} else { } else {
col++; col++;
if (utf8_data[i] == ' ') if (chr == ' ')
space = i; space = i;
} }
i += csize;
} }
line[line_count-1].length = i - line[line_count-1].start; line[line_count-1].length = i - line[line_count-1].start;
line[line_count].start = utf8_data_size; line[line_count].start = utf8_data_size;