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

Introduce set_screen_char_color() and reduce code redundancy.

Browse Source
This commit is contained in:
Laurent MONIN 2005-10-20 10:07:50 +02:00 committed by Laurent MONIN
parent c88afeb1c2
commit 6cc441f34a
1 changed files with 21 additions and 20 deletions

41
src/document/html/renderer.c

@ -137,11 +137,21 @@ void put_chars(struct html_context *, unsigned char *, int);
#define ALIGN_SPACES(x, o, n) mem_align_alloc(x, o, n, unsigned char, SPACES_GRANULARITY) #define ALIGN_SPACES(x, o, n) mem_align_alloc(x, o, n, unsigned char, SPACES_GRANULARITY)
static inline void
set_screen_char_color(struct screen_char *schar,
color_T bgcolor, color_T fgcolor,
enum color_flags color_flags,
enum color_mode color_mode)
{
struct color_pair colors = INIT_COLOR_PAIR(bgcolor, fgcolor);
set_term_color(schar, &colors, color_flags, color_mode);
}
static int static int
realloc_line(struct html_context *html_context, struct document *document, realloc_line(struct html_context *html_context, struct document *document,
int y, int length) int y, int length)
{ {
struct color_pair colors = INIT_COLOR_PAIR(par_format.bgcolor, 0x0);
struct screen_char *pos, *end; struct screen_char *pos, *end;
struct line *line; struct line *line;
@ -162,7 +172,8 @@ realloc_line(struct html_context *html_context, struct document *document,
end = &line->chars[length]; end = &line->chars[length];
end->data = ' '; end->data = ' ';
end->attr = 0; end->attr = 0;
set_term_color(end, &colors, 0, document->options.color_mode); set_screen_char_color(end, par_format.bgcolor, 0x0,
0, document->options.color_mode);
for (pos = &line->chars[line->length]; pos < end; pos++) { for (pos = &line->chars[line->length]; pos < end; pos++) {
copy_screen_chars(pos, end, 1); copy_screen_chars(pos, end, 1);
@ -219,7 +230,6 @@ static inline void
clear_hchars(struct html_context *html_context, int x, int y, int width) clear_hchars(struct html_context *html_context, int x, int y, int width)
{ {
struct part *part; struct part *part;
struct color_pair colors = INIT_COLOR_PAIR(par_format.bgcolor, 0x0);
struct screen_char *pos, *end; struct screen_char *pos, *end;
assert(html_context); assert(html_context);
@ -240,7 +250,8 @@ clear_hchars(struct html_context *html_context, int x, int y, int width)
end = pos + width - 1; end = pos + width - 1;
end->data = ' '; end->data = ' ';
end->attr = 0; end->attr = 0;
set_term_color(end, &colors, 0, part->document->options.color_mode); set_screen_char_color(end, par_format.bgcolor, 0x0,
0, part->document->options.color_mode);
while (pos < end) while (pos < end)
copy_screen_chars(pos++, end, 1); copy_screen_chars(pos++, end, 1);
@ -254,10 +265,7 @@ get_frame_char(struct html_context *html_context, struct part *part,
int x, int y, unsigned char data, int x, int y, unsigned char data,
color_T bgcolor, color_T fgcolor) color_T bgcolor, color_T fgcolor)
{ {
struct color_pair colors = INIT_COLOR_PAIR(bgcolor, fgcolor);
struct screen_char *template; struct screen_char *template;
static enum color_flags color_flags;
static enum color_mode color_mode;
assert(html_context); assert(html_context);
if_assert_failed return NULL; if_assert_failed return NULL;
@ -274,11 +282,9 @@ get_frame_char(struct html_context *html_context, struct part *part,
template = &POS(x, y); template = &POS(x, y);
template->data = data; template->data = data;
template->attr = SCREEN_ATTR_FRAME; template->attr = SCREEN_ATTR_FRAME;
set_screen_char_color(template, bgcolor, fgcolor,
color_mode = part->document->options.color_mode; part->document->options.color_flags,
color_flags = part->document->options.color_flags; part->document->options.color_mode);
set_term_color(template, &colors, color_flags, color_mode);
return template; return template;
} }
@ -356,14 +362,9 @@ get_format_screen_char(struct html_context *html_context,
schar_cache.attr |= SCREEN_ATTR_UNDERLINE; schar_cache.attr |= SCREEN_ATTR_UNDERLINE;
} }
{ set_screen_char_color(&schar_cache, format.style.bg, format.style.fg,
struct color_pair colors = INIT_COLOR_PAIR(format.style.bg, html_context->options->color_flags,
format.style.fg); html_context->options->color_mode);
set_term_color(&schar_cache, &colors,
html_context->options->color_flags,
html_context->options->color_mode);
}
if (html_context->options->display_subs) { if (html_context->options->display_subs) {
if (format.style.attr & AT_SUBSCRIPT) { if (format.style.attr & AT_SUBSCRIPT) {