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

Use color.background instead of bgcolor in struct document too.

Not useful but coherent with other changes.
This commit is contained in:
Laurent MONIN 2007-10-12 16:50:47 +02:00
parent bc498c00da
commit f150f22ac9
5 changed files with 8 additions and 5 deletions

View File

@ -208,7 +208,10 @@ struct document {
int width, height; /**< size of document */ int width, height; /**< size of document */
int nlinks; int nlinks;
int nsearch; int nsearch;
color_T bgcolor;
struct {
color_T background;
} color;
enum cp_status cp_status; enum cp_status cp_status;
unsigned int links_sorted:1; /**< whether links are already sorted */ unsigned int links_sorted:1; /**< whether links are already sorted */

View File

@ -99,7 +99,7 @@ render_dom_document(struct cache_entry *cached, struct document *document,
init_dom_renderer(&renderer, document, buffer, convert_table); init_dom_renderer(&renderer, document, buffer, convert_table);
document->bgcolor = document->options.default_style.color.background; document->color.background = document->options.default_style.color.background;
#ifdef CONFIG_UTF8 #ifdef CONFIG_UTF8
document->options.utf8 = is_cp_utf8(document->options.cp); document->options.utf8 = is_cp_utf8(document->options.cp);
#endif /* CONFIG_UTF8 */ #endif /* CONFIG_UTF8 */

View File

@ -2278,7 +2278,7 @@ render_html_document(struct cache_entry *cached, struct document *document,
>= document->options.width)); >= document->options.width));
#endif #endif
document->bgcolor = par_format.bgcolor; document->color.background = par_format.bgcolor;
done_html_parser(html_context); done_html_parser(html_context);

View File

@ -637,7 +637,7 @@ render_plain_document(struct cache_entry *cached, struct document *document,
renderer.max_width = document->options.wrap ? document->options.box.width renderer.max_width = document->options.wrap ? document->options.box.width
: INT_MAX; : INT_MAX;
document->bgcolor = document->options.default_style.color.background; document->color.background = document->options.default_style.color.background;
document->width = 0; document->width = 0;
#ifdef CONFIG_UTF8 #ifdef CONFIG_UTF8
document->options.utf8 = is_cp_utf8(document->options.cp); document->options.utf8 = is_cp_utf8(document->options.cp);

View File

@ -229,7 +229,7 @@ draw_doc(struct session *ses, struct document_view *doc_view, int active)
color.foreground = get_opt_color("document.colors.text", ses); color.foreground = get_opt_color("document.colors.text", ses);
color.background = doc_view->document->height color.background = doc_view->document->height
? doc_view->document->bgcolor ? doc_view->document->color.background
: get_opt_color("document.colors.background", ses); : get_opt_color("document.colors.background", ses);
vs = doc_view->vs; vs = doc_view->vs;