aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

Merge with git+ssh://pasky/srv/git/elinks.git

Browse Source
This commit is contained in:
Jonas Fonseca 2006-07-22 17:06:44 +02:00 committed by Jonas Fonseca
commit 8e438aaa33
2 changed files with 47 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/document/document.h
View File

@ -182,6 +182,10 @@ struct document {
struct search **slines1; struct search **slines1;
struct search **slines2; struct search **slines2;
#ifdef CONFIG_UTF_8
unsigned char buf[7];
unsigned char buf_length;
#endif
unsigned int id; /* Used to check cache entries. */ unsigned int id; /* Used to check cache entries. */
int cp; int cp;

55
src/document/html/renderer.c
View File

@ -408,30 +408,61 @@ set_hline(struct html_context *html_context, unsigned char *chars, int charslen,
Y(y), X(x) + charslen - 1)) Y(y), X(x) + charslen - 1))
return len; return len;
if (utf8) { if (utf8) {
unsigned char *end; unsigned char *end = chars + charslen;
unicode_val_T data;
for (end = chars + charslen; chars < end; x++) { if (part->document->buf_length) {
/* previous char was broken in the middle */
int length = utf8charlen(part->document->buf);
unsigned char i;
unsigned char *buf_ptr = part->document->buf;
for (i = part->document->buf_length; i < length && chars < end;) {
part->document->buf[i++] = *chars++;
}
part->document->buf_length = i;
part->document->buf[i] = '\0';
data = utf_8_to_unicode(&buf_ptr, buf_ptr + i);
if (data != UCS_NO_CHAR) {
part->document->buf_length = 0;
goto good_char;
} else {
/* Still not full char */
return len;
}
}
for (; chars < end; x++) {
if (*chars == NBSP_CHAR) { if (*chars == NBSP_CHAR) {
schar->data = ' '; schar->data = ' ';
part->spaces[x] = html_context->options->wrap_nbsp; part->spaces[x] = html_context->options->wrap_nbsp;
part->char_width[x] = 1; part->char_width[x] = 1;
chars++; chars++;
} else { } else {
unicode_val_T data;
part->spaces[x] = (*chars == ' '); part->spaces[x] = (*chars == ' ');
data = utf_8_to_unicode(&chars, end); data = utf_8_to_unicode(&chars, end);
if (data == UCS_NO_CHAR) { if (data == UCS_NO_CHAR) {
/* HR */ if (charslen == 1) {
unsigned char attr = schar->attr; /* HR */
unsigned char attr = schar->attr;
schar->data = *chars++; schar->data = *chars++;
schar->attr = SCREEN_ATTR_FRAME; schar->attr = SCREEN_ATTR_FRAME;
copy_screen_chars(&POS(x, y), schar, 1); copy_screen_chars(&POS(x, y), schar, 1);
schar->attr = attr; schar->attr = attr;
part->char_width[x] = 0; part->char_width[x] = 0;
continue; continue;
} else {
unsigned char i;
/* broken char */
for (i = 0; chars < end;i++) {
part->document->buf[i] = *chars++;
}
part->document->buf_length = i;
return x - x2;
}
} else { } else {
good_char:
if (unicode_to_cell(data) == 2) { if (unicode_to_cell(data) == 2) {
schar->data = (unicode_val_T)data; schar->data = (unicode_val_T)data;
part->char_width[x] = 2; part->char_width[x] = 2;