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

Make border color a color from the color table

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

10
clients/terminal.c
View File

@ -322,7 +322,7 @@ struct attr {
}; };
struct color_scheme { struct color_scheme {
struct terminal_color palette[16]; struct terminal_color palette[16];
struct terminal_color border; char border;
struct attr default_attr; struct attr default_attr;
}; };
@ -689,7 +689,7 @@ struct color_scheme DEFAULT_COLORS = {
{0.33, 1, 1, 1}, /* high cyan */ {0.33, 1, 1, 1}, /* high cyan */
{1, 1, 1, 1} /* white */ {1, 1, 1, 1} /* white */
}, },
{0, 0, 0, 1}, /* black border */ 0, /* black border */
{7, 0, 0, } /* bg:black (0), fg:light gray (7) */ {7, 0, 0, } /* bg:black (0), fg:light gray (7) */
}; };
@ -729,11 +729,7 @@ terminal_draw_contents(struct terminal *terminal)
surface = display_create_surface(terminal->display, &allocation); surface = display_create_surface(terminal->display, &allocation);
cr = cairo_create(surface); cr = cairo_create(surface);
cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
cairo_set_source_rgba(cr, terminal_set_color(terminal, cr, terminal->color_scheme->border);
terminal->color_scheme->border.r,
terminal->color_scheme->border.g,
terminal->color_scheme->border.b,
terminal->color_scheme->border.a);
cairo_paint(cr); cairo_paint(cr);
cairo_set_font_face(cr, terminal->font_normal); cairo_set_font_face(cr, terminal->font_normal);