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

GUAC-727: Remove glyph cache from terminal.

Browse Source
This commit is contained in:
Michael Jumper 2014-06-05 18:51:54 -07:00
parent 6473f5029a
commit 6433115468
2 changed files with 88 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

274
src/terminal/display.c
View File

@ -24,6 +24,7 @@
#include "common.h" #include "common.h"
#include "display.h" #include "display.h"
#include "guac_surface.h"
#include "types.h" #include "types.h"
#include <math.h> #include <math.h>
@ -121,14 +122,42 @@ int __guac_terminal_hash_codepoint(int codepoint) {
} }
/** /**
* Returns a cached glyph for the given codepoint, rendering and caching it first if necessary. * Sets the attributes of the display such that future glyphs will render as
* expected.
*/ */
guac_terminal_glyph* __guac_terminal_get_glyph(guac_terminal_display* display, int codepoint) { int __guac_terminal_set_colors(guac_terminal_display* display,
guac_terminal_attributes* attributes) {
guac_socket* socket = display->client->socket; int background, foreground;
int cell_width = display->char_width * GUAC_TERMINAL_MAX_CHAR_WIDTH;
/* Handle reverse video */
if (attributes->reverse != attributes->cursor) {
background = attributes->foreground;
foreground = attributes->background;
}
else {
foreground = attributes->foreground;
background = attributes->background;
}
/* Handle bold */
if (attributes->bold && foreground <= 7)
foreground += 8;
display->glyph_foreground = foreground;
display->glyph_background = background;
return 0;
}
/**
* Sends the given character to the terminal at the given row and column,
* rendering the character immediately. This bypasses the guac_terminal_display
* mechanism and is intended for flushing of updates only.
*/
int __guac_terminal_set(guac_terminal_display* display, int row, int col, int codepoint) {
int location;
int width; int width;
int bytes; int bytes;
@ -150,35 +179,18 @@ guac_terminal_glyph* __guac_terminal_get_glyph(guac_terminal_display* display, i
int layout_width, layout_height; int layout_width, layout_height;
int ideal_layout_width, ideal_layout_height; int ideal_layout_width, ideal_layout_height;
/* Get codepoint hash */
int hashcode = __guac_terminal_hash_codepoint(codepoint);
guac_terminal_glyph* glyph = &(display->glyphs[hashcode]);
/* If something already stored here, either same codepoint or collision */
if (glyph->location) {
location = glyph->location - 1;
/* If match, return match. */
if (glyph->codepoint == codepoint)
return glyph;
/* Otherwise, reuse location */
}
/* If no collision, allocate new glyph location */
else
location = display->next_glyph++;
/* Convert to UTF-8 */
bytes = guac_terminal_encode_utf8(codepoint, utf8);
/* Calculate width in columns */ /* Calculate width in columns */
width = wcwidth(codepoint); width = wcwidth(codepoint);
if (width < 0) if (width < 0)
width = 1; width = 1;
/* Do nothing if glyph is empty */
if (width == 0)
return 0;
/* Convert to UTF-8 */
bytes = guac_terminal_encode_utf8(codepoint, utf8);
surface_width = width * display->char_width; surface_width = width * display->char_width;
surface_height = display->char_height; surface_height = display->char_height;
@ -186,10 +198,19 @@ guac_terminal_glyph* __guac_terminal_get_glyph(guac_terminal_display* display, i
ideal_layout_height = surface_height * PANGO_SCALE; ideal_layout_height = surface_height * PANGO_SCALE;
/* Prepare surface */ /* Prepare surface */
surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, surface = cairo_image_surface_create(CAIRO_FORMAT_RGB24,
surface_width, surface_height); surface_width, surface_height);
cairo = cairo_create(surface); cairo = cairo_create(surface);
/* Fill background */
cairo_set_source_rgb(cairo,
background->red / 255.0,
background->green / 255.0,
background->blue / 255.0);
cairo_rectangle(cairo, 0, 0, surface_width, surface_height);
cairo_fill(cairo);
/* Get layout */ /* Get layout */
layout = pango_cairo_create_layout(cairo); layout = pango_cairo_create_layout(cairo);
pango_layout_set_font_description(layout, display->font_desc); pango_layout_set_font_description(layout, display->font_desc);
@ -214,161 +235,29 @@ guac_terminal_glyph* __guac_terminal_get_glyph(guac_terminal_display* display, i
} }
/* Draw */ /* Draw */
cairo_set_source_rgba(cairo, cairo_set_source_rgb(cairo,
color->red / 255.0, color->red / 255.0,
color->green / 255.0, color->green / 255.0,
color->blue / 255.0, color->blue / 255.0);
1.0 /* alpha */ );
cairo_move_to(cairo, 0.0, 0.0); cairo_move_to(cairo, 0.0, 0.0);
pango_cairo_show_layout(cairo, layout); pango_cairo_show_layout(cairo, layout);
/* Draw */
guac_common_surface_draw(display->default_surface,
display->char_width * col,
display->char_height * row,
surface);
/* Free all */ /* Free all */
g_object_unref(layout); g_object_unref(layout);
cairo_destroy(cairo); cairo_destroy(cairo);
/* Clear existing glyph (if any) */
guac_protocol_send_rect(socket, display->glyph_stroke,
location * cell_width, 0,
cell_width, display->char_height);
guac_protocol_send_cfill(socket, GUAC_COMP_ROUT, display->glyph_stroke,
0x00, 0x00, 0x00, 0xFF);
/* Send glyph */
guac_protocol_send_png(socket, GUAC_COMP_OVER, display->glyph_stroke, location * cell_width, 0, surface);
/* Update filled glyphs */
guac_protocol_send_rect(socket, display->filled_glyphs,
location * cell_width, 0,
cell_width, display->char_height);
guac_protocol_send_cfill(socket, GUAC_COMP_OVER, display->filled_glyphs,
background->red,
background->green,
background->blue,
0xFF);
guac_protocol_send_copy(socket, display->glyph_stroke,
location * cell_width, 0, cell_width, display->char_height,
GUAC_COMP_OVER, display->filled_glyphs, location * cell_width, 0);
cairo_surface_destroy(surface); cairo_surface_destroy(surface);
/* Return glyph */
glyph->location = location+1;
glyph->codepoint = codepoint;
glyph->width = width;
return glyph;
}
/**
* Sets the attributes of the glyph cache layer such that future copies from
* this layer will display as expected.
*/
int __guac_terminal_set_colors(guac_terminal_display* display,
guac_terminal_attributes* attributes) {
guac_socket* socket = display->client->socket;
const guac_terminal_color* background_color;
int cell_width = display->char_width * GUAC_TERMINAL_MAX_CHAR_WIDTH;
int background, foreground;
/* Handle reverse video */
if (attributes->reverse != attributes->cursor) {
background = attributes->foreground;
foreground = attributes->background;
}
else {
foreground = attributes->foreground;
background = attributes->background;
}
/* Handle bold */
if (attributes->bold && foreground <= 7)
foreground += 8;
/* Get background color */
background_color = &guac_terminal_palette[background];
/* If foreground different from current, colorize */
if (foreground != display->glyph_foreground) {
/* Get color */
const guac_terminal_color* color =
&guac_terminal_palette[foreground];
/* Colorize letter */
guac_protocol_send_rect(socket, display->glyph_stroke,
0, 0,
cell_width * display->next_glyph, display->char_height);
guac_protocol_send_cfill(socket, GUAC_COMP_ATOP, display->glyph_stroke,
color->red,
color->green,
color->blue,
255);
}
/* If any color change at all, update filled */
if (foreground != display->glyph_foreground
|| background != display->glyph_background) {
/* Set background */
guac_protocol_send_rect(socket, display->filled_glyphs,
0, 0,
cell_width * display->next_glyph, display->char_height);
guac_protocol_send_cfill(socket, GUAC_COMP_OVER, display->filled_glyphs,
background_color->red,
background_color->green,
background_color->blue,
255);
/* Copy stroke */
guac_protocol_send_copy(socket, display->glyph_stroke,
0, 0,
cell_width * display->next_glyph, display->char_height,
GUAC_COMP_OVER, display->filled_glyphs,
0, 0);
}
display->glyph_foreground = foreground;
display->glyph_background = background;
return 0; return 0;
} }
/**
* Sends the given character to the terminal at the given row and column,
* rendering the charater immediately. This bypasses the guac_terminal_display
* mechanism and is intended for flushing of updates only.
*/
int __guac_terminal_set(guac_terminal_display* display, int row, int col, int codepoint) {
guac_socket* socket = display->client->socket;
guac_terminal_glyph* glyph = __guac_terminal_get_glyph(display, codepoint);
int cell_width = display->char_width * GUAC_TERMINAL_MAX_CHAR_WIDTH;
/* Do nothing if glyph is empty */
if (glyph->width == 0)
return 0;
return guac_protocol_send_copy(socket,
display->filled_glyphs,
(glyph->location-1) * cell_width, 0, glyph->width * display->char_width, display->char_height,
GUAC_COMP_OVER, GUAC_DEFAULT_LAYER,
display->char_width * col,
display->char_height * row);
}
guac_terminal_display* guac_terminal_display_alloc(guac_client* client, guac_terminal_display* guac_terminal_display_alloc(guac_client* client,
const char* font_name, int font_size, int dpi, const char* font_name, int font_size, int dpi,
int foreground, int background) { int foreground, int background) {
@ -382,10 +271,8 @@ guac_terminal_display* guac_terminal_display_alloc(guac_client* client,
guac_terminal_display* display = malloc(sizeof(guac_terminal_display)); guac_terminal_display* display = malloc(sizeof(guac_terminal_display));
display->client = client; display->client = client;
memset(display->glyphs, 0, sizeof(display->glyphs)); /* Create default surface */
display->glyph_stroke = guac_client_alloc_buffer(client); display->default_surface = guac_common_surface_alloc(client->socket, GUAC_DEFAULT_LAYER, 0, 0);
display->filled_glyphs = guac_client_alloc_buffer(client);
display->select_layer = guac_client_alloc_layer(client); display->select_layer = guac_client_alloc_layer(client);
/* Get font */ /* Get font */
@ -625,9 +512,9 @@ void guac_terminal_display_resize(guac_terminal_display* display, int width, int
display->width = width; display->width = width;
display->height = height; display->height = height;
/* Send initial display size */ /* Send display size */
guac_protocol_send_size(display->client->socket, guac_common_surface_resize(
GUAC_DEFAULT_LAYER, display->default_surface,
display->char_width * width, display->char_width * width,
display->char_height * height); display->char_height * height);
@ -745,16 +632,15 @@ void __guac_terminal_display_flush_copy(guac_terminal_display* display) {
} }
/* Send copy */ /* Send copy */
guac_protocol_send_copy(display->client->socket, guac_common_surface_copy(
GUAC_DEFAULT_LAYER, display->default_surface,
current->column * display->char_width, current->column * display->char_width,
current->row * display->char_height, current->row * display->char_height,
rect_width * display->char_width, rect_width * display->char_width,
rect_height * display->char_height, rect_height * display->char_height,
GUAC_COMP_OVER, display->default_surface,
GUAC_DEFAULT_LAYER,
col * display->char_width, col * display->char_width,
row * display->char_height); row * display->char_height);
@ -882,18 +768,13 @@ void __guac_terminal_display_flush_clear(guac_terminal_display* display) {
} }
/* Send rect */ /* Send rect */
guac_protocol_send_rect(display->client->socket, guac_common_surface_rect(
GUAC_DEFAULT_LAYER, display->default_surface,
col * display->char_width, col * display->char_width,
row * display->char_height, row * display->char_height,
rect_width * display->char_width, rect_width * display->char_width,
rect_height * display->char_height); rect_height * display->char_height,
guac_color->red, guac_color->green, guac_color->blue);
guac_protocol_send_cfill(display->client->socket,
GUAC_COMP_OVER,
GUAC_DEFAULT_LAYER,
guac_color->red, guac_color->green, guac_color->blue,
0xFF);
} /* end if clear operation */ } /* end if clear operation */
@ -905,6 +786,7 @@ void __guac_terminal_display_flush_clear(guac_terminal_display* display) {
} }
void __guac_terminal_display_flush_set(guac_terminal_display* display) { void __guac_terminal_display_flush_set(guac_terminal_display* display) {
guac_terminal_operation* current = display->operations; guac_terminal_operation* current = display->operations;
@ -917,13 +799,18 @@ void __guac_terminal_display_flush_set(guac_terminal_display* display) {
/* Perform given operation */ /* Perform given operation */
if (current->type == GUAC_CHAR_SET) { if (current->type == GUAC_CHAR_SET) {
int codepoint = current->character.value;
/* Use space if no glyph */
if (!guac_terminal_has_glyph(codepoint))
codepoint = ' ';
/* Set attributes */ /* Set attributes */
__guac_terminal_set_colors(display, __guac_terminal_set_colors(display,
&(current->character.attributes)); &(current->character.attributes));
/* Send character */ /* Send character */
__guac_terminal_set(display, row, col, __guac_terminal_set(display, row, col, codepoint);
current->character.value);
/* Mark operation as handled */ /* Mark operation as handled */
current->type = GUAC_CHAR_NOP; current->type = GUAC_CHAR_NOP;
@ -945,6 +832,9 @@ void guac_terminal_display_flush(guac_terminal_display* display) {
__guac_terminal_display_flush_clear(display); __guac_terminal_display_flush_clear(display);
__guac_terminal_display_flush_set(display); __guac_terminal_display_flush_set(display);
/* Flush surface */
guac_common_surface_flush(display->default_surface);
} }
void guac_terminal_display_commit_select(guac_terminal_display* display) { void guac_terminal_display_commit_select(guac_terminal_display* display) {

50
src/terminal/display.h
View File

@ -25,6 +25,7 @@
#define _GUAC_TERMINAL_DISPLAY_H #define _GUAC_TERMINAL_DISPLAY_H
#include "config.h" #include "config.h"
#include "guac_surface.h"
#include "types.h" #include "types.h"
@ -95,28 +96,6 @@ typedef struct guac_terminal_operation {
} guac_terminal_operation; } guac_terminal_operation;
/**
* A cached glyph.
*/
typedef struct guac_terminal_glyph {
/**
* The location within the glyph layer that this glyph can be found.
*/
int location;
/**
* The codepoint currently stored at that location.
*/
int codepoint;
/**
* The width of this glyph, in columns.
*/
int width;
} guac_terminal_glyph;
/** /**
* Set of all pending operations for the currently-visible screen area. * Set of all pending operations for the currently-visible screen area.
*/ */
@ -157,16 +136,6 @@ typedef struct guac_terminal_display {
*/ */
int char_height; int char_height;
/**
* Index of next glyph to create
*/
int next_glyph;
/**
* Index of locations for each glyph in the stroke and fill layers.
*/
guac_terminal_glyph glyphs[512];
/** /**
* Color of glyphs in copy buffer * Color of glyphs in copy buffer
*/ */
@ -177,23 +146,16 @@ typedef struct guac_terminal_display {
*/ */
int glyph_background; int glyph_background;
/**
* The display.
*/
guac_common_surface* default_surface;
/** /**
* Layer above default layer which highlights selected text. * Layer above default layer which highlights selected text.
*/ */
guac_layer* select_layer; guac_layer* select_layer;
/**
* A single wide layer holding each glyph, with each glyph only
* colored with foreground color (background remains transparent).
*/
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;
/** /**
* Whether text is being selected. * Whether text is being selected.
*/ */