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

terminal: More character attributes

Browse source 
Implement the concealed attribute, and 16-colour attributes.  Fix a bug in
256-colour attributes that prevented them from working in elinks.

Signed-off-by: Callum Lowcay <callum@callumscode.com>
This commit is contained in:
Callum Lowcay 2011-01-10 12:14:01 +13:00
parent 86653ed273
commit 81179db42c
1 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

37
clients/terminal.c
View file

@ -51,6 +51,7 @@ static int option_fullscreen;
#define ATTRMASK_UNDERLINE 0x02 #define ATTRMASK_UNDERLINE 0x02
#define ATTRMASK_BLINK 0x04 #define ATTRMASK_BLINK 0x04
#define ATTRMASK_INVERSE 0x08 #define ATTRMASK_INVERSE 0x08
#define ATTRMASK_CONCEALED 0x10
/* Buffer sizes */ /* Buffer sizes */
#define MAX_RESPONSE 11 #define MAX_RESPONSE 11
@ -317,7 +318,7 @@ struct attr {
unsigned char fg, bg; unsigned char fg, bg;
char a; /* attributes format: char a; /* attributes format:
* 76543210 * 76543210
* ilub */ * cilub */
char r; /* reserved */ char r; /* reserved */
}; };
struct color_scheme { struct color_scheme {
@ -703,7 +704,7 @@ terminal_draw_contents(struct terminal *terminal)
union utf8_char c; union utf8_char c;
char null; char null;
} toShow; } toShow;
int foreground, background, bold, underline, tmp; int foreground, background, bold, underline, concealed, tmp;
int text_x, text_y; int text_x, text_y;
cairo_surface_t *surface; cairo_surface_t *surface;
double d; double d;
@ -763,6 +764,7 @@ terminal_draw_contents(struct terminal *terminal)
} }
bold = attr.a & (ATTRMASK_BOLD | ATTRMASK_BLINK); bold = attr.a & (ATTRMASK_BOLD | ATTRMASK_BLINK);
underline = attr.a & ATTRMASK_UNDERLINE; underline = attr.a & ATTRMASK_UNDERLINE;
concealed = attr.a & ATTRMASK_CONCEALED;
/* paint the background */ /* paint the background */
cairo_set_source_rgba(cr, cairo_set_source_rgba(cr,
@ -779,6 +781,7 @@ terminal_draw_contents(struct terminal *terminal)
cairo_fill(cr); cairo_fill(cr);
/* paint the foreground */ /* paint the foreground */
if (concealed) continue;
if (bold) if (bold)
cairo_set_font_face(cr, terminal->font_bold); cairo_set_font_face(cr, terminal->font_bold);
else else
@ -1218,16 +1221,18 @@ handle_escape(struct terminal *terminal)
} }
break; break;
case 'm': /* SGR */ case 'm': /* SGR */
if (set[0] && set[1] && set[2] && args[1] == 5) {
if (args[0] == 38) {
handle_sgr(terminal, args[2] + 256);
break;
} else if (args[0] == 48) {
handle_sgr(terminal, args[2] + 512);
break;
}
}
for(i = 0; i < 10; i++) { for(i = 0; i < 10; i++) {
if (i <= 7 && set[i] && set[i + 1] &&
set[i + 2] && args[i + 1] == 5)
{
if (args[i] == 38) {
handle_sgr(terminal, args[i + 2] + 256);
break;
} else if (args[i] == 48) {
handle_sgr(terminal, args[i + 2] + 512);
break;
}
}
if(set[i]) { if(set[i]) {
handle_sgr(terminal, args[i]); handle_sgr(terminal, args[i]);
} else if(i == 0) { } else if(i == 0) {
@ -1414,6 +1419,9 @@ handle_sgr(struct terminal *terminal, int code)
case 5: case 5:
terminal->curr_attr.a |= ATTRMASK_BLINK; terminal->curr_attr.a |= ATTRMASK_BLINK;
break; break;
case 8:
terminal->curr_attr.a |= ATTRMASK_CONCEALED;
break;
case 2: case 2:
case 21: case 21:
case 22: case 22:
@ -1434,6 +1442,9 @@ handle_sgr(struct terminal *terminal, int code)
case 27: case 27:
terminal->curr_attr.a &= ~ATTRMASK_INVERSE; terminal->curr_attr.a &= ~ATTRMASK_INVERSE;
break; break;
case 28:
terminal->curr_attr.a &= ~ATTRMASK_CONCEALED;
break;
case 39: case 39:
terminal->curr_attr.fg = terminal->color_scheme->default_attr.fg; terminal->curr_attr.fg = terminal->color_scheme->default_attr.fg;
break; break;
@ -1447,6 +1458,10 @@ handle_sgr(struct terminal *terminal, int code)
terminal->curr_attr.fg += 8; terminal->curr_attr.fg += 8;
} else if(code >= 40 && code <= 47) { } else if(code >= 40 && code <= 47) {
terminal->curr_attr.bg = code - 40; terminal->curr_attr.bg = code - 40;
} else if (code >= 90 && code <= 97) {
terminal->curr_attr.fg = code - 90 + 8;
} else if (code >= 100 && code <= 107) {
terminal->curr_attr.bg = code - 100 + 8;
} else if(code >= 256 && code < 512) { } else if(code >= 256 && code < 512) {
terminal->curr_attr.fg = code - 256; terminal->curr_attr.fg = code - 256;
} else if(code >= 512 && code < 768) { } else if(code >= 512 && code < 768) {