aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-02-02 15:09:23 -05:00
Code

dump: Use dump functions in add_document_to_string

Browse Source 
Now that struct dump_output supports appending to a string,
add_document_to_string() can just use that feature, instead of
duplicating the code.
This commit is contained in:
Kalle Olavi Niemitalo 2009-06-19 16:55:15 +03:00 committed by Kalle Olavi Niemitalo
parent f64463a780
commit 773549180d
1 changed files with 7 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/viewer/dump/dump.c
View File

@ -599,93 +599,20 @@ dump_next(LIST_OF(struct string_list_item) *url_list)
} }
} }
/* Using this function in dump_to_file() is unfortunately slightly slower than
* the current code. However having this here instead of in the scripting
* backends is better. */
struct string * struct string *
add_document_to_string(struct string *string, struct document *document) add_document_to_string(struct string *string, struct document *document)
{ {
int y; struct dump_output *out;
int error;
assert(string && document); assert(string && document);
if_assert_failed return NULL; if_assert_failed return NULL;
#ifdef CONFIG_UTF8 out = dump_output_alloc(-1, string);
if (is_cp_utf8(document->options.cp)) if (!out) return NULL;
goto utf8;
#endif /* CONFIG_UTF8 */
for (y = 0; y < document->height; y++) { error = dump_nocolor(document, out);
int white = 0;
int x;
for (x = 0; x < document->data[y].length; x++) { mem_free(out);
struct screen_char *pos = &document->data[y].chars[x]; return error ? NULL : string;
unsigned char data = pos->data;
unsigned int frame = (pos->attr & SCREEN_ATTR_FRAME);
if (!isscreensafe(data)) {
white++;
continue;
} else {
if (frame && data >= 176 && data < 224)
data = frame_dumb[data - 176];
if (data <= ' ') {
/* Count spaces. */
white++;
} else {
/* Print spaces if any. */
if (white) {
add_xchar_to_string(string, ' ', white);
white = 0;
}
add_char_to_string(string, data);
}
}
}
add_char_to_string(string, '\n');
}
#ifdef CONFIG_UTF8
goto end;
utf8:
for (y = 0; y < document->height; y++) {
int white = 0;
int x;
for (x = 0; x < document->data[y].length; x++) {
struct screen_char *pos = &document->data[y].chars[x];
unicode_val_T data = pos->data;
unsigned int frame = (pos->attr & SCREEN_ATTR_FRAME);
if (!isscreensafe_ucs(data)) {
white++;
continue;
} else {
if (frame && data >= 176 && data < 224)
data = frame_dumb[data - 176];
if (data <= ' ') {
/* Count spaces. */
white++;
} else if (data == UCS_NO_CHAR) {
/* This is the second cell of
* a double-cell character. */
} else {
/* Print spaces if any. */
if (white) {
add_xchar_to_string(string, ' ', white);
white = 0;
}
add_to_string(string, encode_utf8(data));
}
}
}
add_char_to_string(string, '\n');
}
end:
#endif /* CONFIG_UTF8 */
return string;
} }