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

More wrap behaviour improvement.

Browse Source
This commit is contained in:
Michael Drake 2013-01-10 19:43:22 +00:00
parent 694c1e7eea
commit ab5d165659
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
desktop/textarea.c
View File

@ -301,7 +301,7 @@ static bool textarea_reflow(struct textarea *ta, unsigned int line)
unsigned int len; unsigned int len;
size_t b_off; size_t b_off;
int x; int x;
char *space; char *space, *para_end;
unsigned int line_count = 0; unsigned int line_count = 0;
/** \todo pay attention to line parameter */ /** \todo pay attention to line parameter */
@ -331,15 +331,22 @@ static bool textarea_reflow(struct textarea *ta, unsigned int line)
for (len = ta->text_len - 1, text = ta->text; len > 0; for (len = ta->text_len - 1, text = ta->text; len > 0;
len -= b_off, text += b_off) { len -= b_off, text += b_off) {
nsfont.font_split(&ta->fstyle, text, len, /* Find end of paragraph */
for (para_end = text; para_end < text + len; para_end++) {
if (*para_end == '\n')
break;
}
/* Wrap current line in paragraph */
nsfont.font_split(&ta->fstyle, text, para_end - text,
ta->vis_width - MARGIN_LEFT - MARGIN_RIGHT, ta->vis_width - MARGIN_LEFT - MARGIN_RIGHT,
&b_off, &x); &b_off, &x);
if (b_off == 0) { if (b_off == 0) {
/* Text wasn't split */ /* Text wasn't split */
b_off = len; b_off = para_end - text;
} }
/* b_off now marks space, or end of text */ /* b_off now marks space, or end of paragraph */
if (line_count > 0 && line_count % LINE_CHUNK_SIZE == 0) { if (line_count > 0 && line_count % LINE_CHUNK_SIZE == 0) {
struct line_info *temp = realloc(ta->lines, struct line_info *temp = realloc(ta->lines,
@ -353,19 +360,14 @@ static bool textarea_reflow(struct textarea *ta, unsigned int line)
ta->lines = temp; ta->lines = temp;
} }
/* handle LF */ if (para_end == text + b_off && *para_end == '\n') {
for (space = text; space <= text + b_off; space++) { /* Not found any spaces to wrap at, and we
if (*space == '\n') * have a newline char */
break;
}
/* space now marks newline, or b_off -- whichever's first */
if (space < text + b_off) {
/* Found newline; use it */
ta->lines[line_count].b_start = text - ta->text; ta->lines[line_count].b_start = text - ta->text;
ta->lines[line_count++].b_length = space - text; ta->lines[line_count++].b_length = para_end - text;
b_off = space + 1 - text; /* Jump newline */
b_off++;
if (len - b_off == 0) { if (len - b_off == 0) {
/* reached end of input => add last line */ /* reached end of input => add last line */