maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improved palette (more contrast). Started move to more efficient drawing.

Browse Source
This commit is contained in:
Michael Jumper 2011-08-17 12:30:53 -07:00
parent 31e8e8432a
commit e5619531a6
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
protocols/ssh/include/ssh_terminal.h
View File

@ -94,11 +94,16 @@ struct ssh_guac_terminal {
PangoFontDescription* font_desc; PangoFontDescription* font_desc;
/** /**
* A simple mapping of glyphs to their corresponding buffers. When a new * A single wide layer holding each glyph, with each glyph only
* glyph is drawn, the data for that glyph is saved into an off-screen * colored with foreground color (background remains transparent).
* buffer for later reuse.
*/ */
guac_layer* glyphs[256]; guac_layer* glyph_stroke;
/**
* A single wide layer holding each glyph, with each glyph properly
* colored with foreground and background color (no transparency at all).
*/
guac_layer* filled_glyphs;
/** /**
* Array of scrollback buffer rows, where each row is an array of * Array of scrollback buffer rows, where each row is an array of

34
protocols/ssh/src/ssh_terminal.c
View File

@ -53,22 +53,22 @@ const ssh_guac_terminal_color ssh_guac_terminal_palette[16] = {
/* Normal colors */ /* Normal colors */
{0x00, 0x00, 0x00}, /* Black */ {0x00, 0x00, 0x00}, /* Black */
{0x80, 0x00, 0x00}, /* Red */ {0x99, 0x3E, 0x3E}, /* Red */
{0x00, 0x80, 0x00}, /* Green */ {0x3E, 0x99, 0x3E}, /* Green */
{0x80, 0x80, 0x00}, /* Brown */ {0x99, 0x99, 0x3E}, /* Brown */
{0x00, 0x00, 0x80}, /* Blue */ {0x3E, 0x3E, 0x99}, /* Blue */
{0x80, 0x00, 0x80}, /* Magenta */ {0x99, 0x3E, 0x99}, /* Magenta */
{0x00, 0x80, 0x80}, /* Cyan */ {0x3E, 0x99, 0x99}, /* Cyan */
{0x80, 0x80, 0x80}, /* White */ {0x99, 0x99, 0x99}, /* White */
/* Intense colors */ /* Intense colors */
{0x40, 0x40, 0x40}, /* Black */ {0x3E, 0x3E, 0x3E}, /* Black */
{0xFF, 0x00, 0x00}, /* Red */ {0xFF, 0x67, 0x67}, /* Red */
{0x00, 0xFF, 0x00}, /* Green */ {0x67, 0xFF, 0x67}, /* Green */
{0xFF, 0xFF, 0x00}, /* Brown */ {0xFF, 0xFF, 0x67}, /* Brown */
{0x00, 0x00, 0xFF}, /* Blue */ {0x67, 0x67, 0xFF}, /* Blue */
{0xFF, 0x00, 0xFF}, /* Magenta */ {0xFF, 0x67, 0xFF}, /* Magenta */
{0x00, 0xFF, 0xFF}, /* Cyan */ {0x67, 0xFF, 0xFF}, /* Cyan */
{0xFF, 0xFF, 0xFF}, /* White */ {0xFF, 0xFF, 0xFF}, /* White */
}; };
@ -95,8 +95,8 @@ ssh_guac_terminal* ssh_guac_terminal_create(guac_client* client) {
term->cursor_col = 0; term->cursor_col = 0;
term->cursor_layer = guac_client_alloc_layer(client, 1); term->cursor_layer = guac_client_alloc_layer(client, 1);
term->term_width = 80; term->term_width = 100;
term->term_height = 24; term->term_height = 37;
term->char_handler = ssh_guac_terminal_echo; term->char_handler = ssh_guac_terminal_echo;
term->scroll_start = 0; term->scroll_start = 0;
@ -128,7 +128,7 @@ ssh_guac_terminal* ssh_guac_terminal_create(guac_client* client) {
term->font_desc = pango_font_description_new(); term->font_desc = pango_font_description_new();
pango_font_description_set_family(term->font_desc, "monospace"); pango_font_description_set_family(term->font_desc, "monospace");
pango_font_description_set_weight(term->font_desc, PANGO_WEIGHT_NORMAL); pango_font_description_set_weight(term->font_desc, PANGO_WEIGHT_NORMAL);
pango_font_description_set_size(term->font_desc, 14*PANGO_SCALE); pango_font_description_set_size(term->font_desc, 10*PANGO_SCALE);
font_map = pango_cairo_font_map_get_default(); font_map = pango_cairo_font_map_get_default();
context = pango_font_map_create_context(font_map); context = pango_font_map_create_context(font_map);