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: Elide trailing spaces in UTF-8 mode too

Browse Source
This commit is contained in:
Kalle Olavi Niemitalo 2009-06-09 03:36:25 +03:00 committed by Kalle Olavi Niemitalo
parent 20dfdb284f
commit 79ea8d087d
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,20 +108,6 @@ DUMP_FUNCTION_SPECIALIZED(struct document *document, int fd,
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];
#ifdef DUMP_CHARSET_UTF8
else {
unsigned char *utf8_buf = encode_utf8(c);
while (*utf8_buf) {
if (write_char(*utf8_buf++,
fd, buf, &bptr)) return -1;
}
x += unicode_to_cell(c) - 1;
continue;
}
#endif /* DUMP_CHARSET_UTF8 */
if (c <= ' ') { if (c <= ' ') {
/* Count spaces. */ /* Count spaces. */
@ -137,9 +123,23 @@ DUMP_FUNCTION_SPECIALIZED(struct document *document, int fd,
} }
/* Print normal char. */ /* Print normal char. */
#ifdef DUMP_CHARSET_UTF8
{
unsigned char *utf8_buf = encode_utf8(c);
while (*utf8_buf) {
if (write_char(*utf8_buf++,
fd, buf, &bptr)) return -1;
}
x += unicode_to_cell(c) - 1;
}
#else /* !DUMP_CHARSET_UTF8 */
if (write_char(c, fd, buf, &bptr)) if (write_char(c, fd, buf, &bptr))
return -1; return -1;
#endif /* !DUMP_CHARSET_UTF8 */
} }
#if defined(DUMP_COLOR_MODE_16) || defined(DUMP_COLOR_MODE_256) || defined(DUMP_COLOR_MODE_TRUE) #if defined(DUMP_COLOR_MODE_16) || defined(DUMP_COLOR_MODE_256) || defined(DUMP_COLOR_MODE_TRUE)
for (;x < width; x++) { for (;x < width; x++) {
if (write_char(' ', fd, buf, &bptr)) if (write_char(' ', fd, buf, &bptr))