aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-01-03 14:57:44 -05:00
Code

dump: Unify detection of fullwidth characters

Browse Source 
In DUMP_FUNCTION_SPECIALIZED (used by elinks --dump), detect the
second cell of double-cell (aka fullwidth) characters by comparing to
UCS_NO_CHAR, like add_document_to_string does.  Don't use
unicode_to_cell for this any more.

Also, ignore the colors and attributes of the second cell; don't
output any escape sequences for them.
This commit is contained in:
Kalle Olavi Niemitalo 2009-06-19 14:05:51 +03:00 committed by Kalle Olavi Niemitalo
parent f0c88e1960
commit ee182ced2b
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/viewer/dump/dump-specialized.h
View File

@ -80,6 +80,16 @@ DUMP_FUNCTION_SPECIALIZED(struct document *document, int fd,
= &document->data[y].chars[x].color[3]; = &document->data[y].chars[x].color[3];
#endif /* DUMP_COLOR_MODE_TRUE */ #endif /* DUMP_COLOR_MODE_TRUE */
c = document->data[y].chars[x].data;
#ifdef DUMP_CHARSET_UTF8
if (c == UCS_NO_CHAR) {
/* This is the second cell of
* a double-cell character. */
continue;
}
#endif /* DUMP_CHARSET_UTF8 */
#ifdef DUMP_COLOR_MODE_16 #ifdef DUMP_COLOR_MODE_16
if (color != color1) { if (color != color1) {
color = color1; color = color1;
@ -114,8 +124,6 @@ DUMP_FUNCTION_SPECIALIZED(struct document *document, int fd,
} }
#endif /* DUMP_COLOR_MODE_TRUE */ #endif /* DUMP_COLOR_MODE_TRUE */
c = document->data[y].chars[x].data;
if ((attr & SCREEN_ATTR_FRAME) if ((attr & SCREEN_ATTR_FRAME)
&& c >= 176 && c < 224) && c >= 176 && c < 224)
c = frame_dumb[c - 176]; c = frame_dumb[c - 176];
@ -141,7 +149,6 @@ DUMP_FUNCTION_SPECIALIZED(struct document *document, int fd,
fd, buf, &bptr)) return -1; fd, buf, &bptr)) return -1;
} }
x += unicode_to_cell(c) - 1;
#else /* !DUMP_CHARSET_UTF8 */ #else /* !DUMP_CHARSET_UTF8 */
if (write_char(c, fd, buf, &bptr)) if (write_char(c, fd, buf, &bptr))
return -1; return -1;