mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-03 09:01:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Factor out decoding of character attributes

Browse source
This commit is contained in:
Kristian Høgsberg 2011-01-11 10:26:04 -05:00
parent fb266a3207
commit 01994a5964
1 changed files with 52 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

114
clients/terminal.c
View file

@ -461,10 +461,51 @@ terminal_get_attr_row(struct terminal *terminal, int row)
return &terminal->data_attr[index * terminal->width]; return &terminal->data_attr[index * terminal->width];
} }
static struct attr struct decoded_attr {
terminal_get_attr(struct terminal *terminal, int row, int col) int foreground;
int background;
int bold;
int underline;
};
static void
terminal_decode_attr(struct terminal *terminal, int row, int col,
struct decoded_attr *decoded)
{ {
return terminal_get_attr_row(terminal, row)[col]; struct attr attr;
int foreground, background, tmp;
/* get the attributes for this character cell */
attr = terminal_get_attr_row(terminal, row)[col];
if ((attr.a & ATTRMASK_INVERSE) ||
((terminal->mode & MODE_SHOW_CURSOR) &&
terminal->focused && terminal->row == row &&
terminal->column == col)) {
foreground = attr.bg;
background = attr.fg;
if (attr.a & ATTRMASK_BOLD) {
if (foreground <= 16) foreground |= 0x08;
if (background <= 16) background &= 0x07;
}
} else {
foreground = attr.fg;
background = attr.bg;
}
if (terminal->mode & MODE_INVERSE) {
tmp = foreground;
foreground = background;
background = tmp;
if (attr.a & ATTRMASK_BOLD) {
if (foreground <= 16) foreground |= 0x08;
if (background <= 16) background &= 0x07;
}
}
decoded->foreground = foreground;
decoded->background = background;
decoded->bold = attr.a & (ATTRMASK_BOLD | ATTRMASK_BLINK);
decoded->underline = attr.a & ATTRMASK_UNDERLINE;
} }
static void static void
@ -711,13 +752,12 @@ terminal_draw_contents(struct terminal *terminal)
cairo_font_extents_t extents; cairo_font_extents_t extents;
int top_margin, side_margin; int top_margin, side_margin;
int row, col; int row, col;
struct attr attr;
union utf8_char *p_row; union utf8_char *p_row;
struct utf8_chars { struct utf8_chars {
union utf8_char c; union utf8_char c;
char null; char null;
} toShow; } toShow;
int foreground, background, bold, underline, tmp; struct decoded_attr attr;
int text_x, text_y; int text_x, text_y;
cairo_surface_t *surface; cairo_surface_t *surface;
double d; double d;
@ -746,36 +786,12 @@ terminal_draw_contents(struct terminal *terminal)
p_row = terminal_get_row(terminal, row); p_row = terminal_get_row(terminal, row);
for (col = 0; col < terminal->width; col++) { for (col = 0; col < terminal->width; col++) {
/* get the attributes for this character cell */ /* get the attributes for this character cell */
attr = terminal_get_attr(terminal, row, col); terminal_decode_attr(terminal, row, col, &attr);
if ((attr.a & ATTRMASK_INVERSE) ||
((terminal->mode & MODE_SHOW_CURSOR) &&
terminal->focused && terminal->row == row &&
terminal->column == col))
{
foreground = attr.bg;
background = attr.fg;
if (attr.a & ATTRMASK_BOLD) {
if (foreground <= 16) foreground |= 0x08;
if (background <= 16) background &= 0x07;
}
} else {
foreground = attr.fg;
background = attr.bg;
}
if (terminal->mode & MODE_INVERSE) {
tmp = foreground;
foreground = background;
background = tmp;
if (attr.a & ATTRMASK_BOLD) {
if (foreground <= 16) foreground |= 0x08;
if (background <= 16) background &= 0x07;
}
}
if (background == terminal->color_scheme->border) if (attr.background == terminal->color_scheme->border)
continue; continue;
terminal_set_color(terminal, cr, background); terminal_set_color(terminal, cr, attr.background);
cairo_move_to(cr, side_margin + (col * extents.max_x_advance), cairo_move_to(cr, side_margin + (col * extents.max_x_advance),
top_margin + (row * extents.height)); top_margin + (row * extents.height));
cairo_rel_line_to(cr, extents.max_x_advance, 0); cairo_rel_line_to(cr, extents.max_x_advance, 0);
@ -793,42 +809,16 @@ terminal_draw_contents(struct terminal *terminal)
p_row = terminal_get_row(terminal, row); p_row = terminal_get_row(terminal, row);
for (col = 0; col < terminal->width; col++) { for (col = 0; col < terminal->width; col++) {
/* get the attributes for this character cell */ /* get the attributes for this character cell */
attr = terminal_get_attr(terminal, row, col); terminal_decode_attr(terminal, row, col, &attr);
if ((attr.a & ATTRMASK_INVERSE) ||
((terminal->mode & MODE_SHOW_CURSOR) &&
terminal->focused && terminal->row == row &&
terminal->column == col))
{
foreground = attr.bg;
background = attr.fg;
if (attr.a & ATTRMASK_BOLD) {
if (foreground <= 16) foreground |= 0x08;
if (background <= 16) background &= 0x07;
}
} else {
foreground = attr.fg;
background = attr.bg;
}
if (terminal->mode & MODE_INVERSE) {
tmp = foreground;
foreground = background;
background = tmp;
if (attr.a & ATTRMASK_BOLD) {
if (foreground <= 16) foreground |= 0x08;
if (background <= 16) background &= 0x07;
}
}
bold = attr.a & (ATTRMASK_BOLD | ATTRMASK_BLINK);
underline = attr.a & ATTRMASK_UNDERLINE;
if (bold) if (attr.bold)
cairo_set_font_face(cr, terminal->font_bold); cairo_set_font_face(cr, terminal->font_bold);
else else
cairo_set_font_face(cr, terminal->font_normal); cairo_set_font_face(cr, terminal->font_normal);
terminal_set_color(terminal, cr, foreground); terminal_set_color(terminal, cr, attr.foreground);
text_x = side_margin + col * extents.max_x_advance; text_x = side_margin + col * extents.max_x_advance;
text_y = top_margin + extents.ascent + row * extents.height; text_y = top_margin + extents.ascent + row * extents.height;
if (underline) { if (attr.underline) {
cairo_move_to(cr, text_x, (double)text_y + 1.5); cairo_move_to(cr, text_x, (double)text_y + 1.5);
cairo_line_to(cr, text_x + extents.max_x_advance, (double) text_y + 1.5); cairo_line_to(cr, text_x + extents.max_x_advance, (double) text_y + 1.5);
cairo_stroke(cr); cairo_stroke(cr);