mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add helper to set color from color table

Browse Source
This commit is contained in:
Kristian Høgsberg 2011-01-11 10:11:39 -05:00
parent 8c25420a50
commit f106fd5b67
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
clients/terminal.c
View File

@ -693,6 +693,16 @@ struct color_scheme DEFAULT_COLORS = {
{7, 0, 0, } /* bg:black (0), fg:light gray (7) */
};
static void
terminal_set_color(struct terminal *terminal, cairo_t *cr, int index)
{
cairo_set_source_rgba(cr,
terminal->color_table[index].r,
terminal->color_table[index].g,
terminal->color_table[index].b,
terminal->color_table[index].a);
}
static void
terminal_draw_contents(struct terminal *terminal)
{
@ -766,11 +776,7 @@ terminal_draw_contents(struct terminal *terminal)
}
}
cairo_set_source_rgba(cr,
terminal->color_table[background].r,
terminal->color_table[background].g,
terminal->color_table[background].b,
terminal->color_table[background].a);
terminal_set_color(terminal, cr, background);
cairo_move_to(cr, side_margin + (col * extents.max_x_advance),
top_margin + (row * extents.height));
cairo_rel_line_to(cr, extents.max_x_advance, 0);
@ -820,12 +826,7 @@ terminal_draw_contents(struct terminal *terminal)
cairo_set_font_face(cr, terminal->font_bold);
else
cairo_set_font_face(cr, terminal->font_normal);
cairo_set_source_rgba(cr,
terminal->color_table[foreground].r,
terminal->color_table[foreground].g,
terminal->color_table[foreground].b,
terminal->color_table[foreground].a);
terminal_set_color(terminal, cr, foreground);
text_x = side_margin + col * extents.max_x_advance;
text_y = top_margin + extents.ascent + row * extents.height;
if (underline) {