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

Revert "Refactor delta to display."

Browse Source 
This reverts commit 4b34bbbf3feb2c0053a64f978e9890824b2e8320.

Conflicts:
	src/ssh_handlers.c
This commit is contained in:
Michael Jumper 2013-03-27 12:44:40 -07:00
parent fa0522503b
commit 38794ed94b
3 changed files with 141 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
protocols/ssh/include/terminal.h
View File

@ -186,33 +186,14 @@ typedef struct guac_terminal_operation {
} guac_terminal_operation; } guac_terminal_operation;
/** /**
* A terminal character with two states - a current state, and a future state * Set of all pending operations for the currently-visible screen area.
* represented by a pairing of an operation with a terminal character.
*/ */
typedef struct guac_terminal_display_char { typedef struct guac_terminal_delta {
/** /**
* The current state of this character. * Array of all operations pending for the visible screen area.
*/ */
guac_terminal_char current; guac_terminal_operation* operations;
/**
* The next state of this character, as an operation upon this
* character.
*/
guac_terminal_operation next;
} guac_terminal_display_char;
/**
* Set of all characters for the currently-visible screen area.
*/
typedef struct guac_terminal_display {
/**
* Array of all characters within the visible screen area.
*/
guac_terminal_display_char* characters;
/** /**
* The width of the screen, in characters. * The width of the screen, in characters.
@ -224,7 +205,7 @@ typedef struct guac_terminal_display {
*/ */
int height; int height;
} guac_terminal_display; } guac_terminal_delta;
/** /**
* Represents a terminal emulator which uses a given Guacamole client to * Represents a terminal emulator which uses a given Guacamole client to
@ -343,9 +324,10 @@ struct guac_terminal {
guac_terminal_char_handler* char_handler; guac_terminal_char_handler* char_handler;
/** /**
* The current display state and pending state. * The difference between the currently-rendered screen and the current
* state of the terminal.
*/ */
guac_terminal_display* display; guac_terminal_delta* delta;
}; };
@ -407,32 +389,32 @@ int guac_terminal_scroll_down(guac_terminal* term,
int start_row, int end_row, int amount); int start_row, int end_row, int amount);
/** /**
* Allocates a new guac_terminal_display. * Allocates a new guac_terminal_delta.
*/ */
guac_terminal_display* guac_terminal_display_alloc(int width, int height); guac_terminal_delta* guac_terminal_delta_alloc(int width, int height);
/** /**
* Frees the given guac_terminal_display. * Frees the given guac_terminal_delta.
*/ */
void guac_terminal_display_free(guac_terminal_display* display); void guac_terminal_delta_free(guac_terminal_delta* delta);
/** /**
* Resizes the given guac_terminal_display to the given dimensions. * Resizes the given guac_terminal_delta to the given dimensions.
*/ */
void guac_terminal_display_resize(guac_terminal_display* display, void guac_terminal_delta_resize(guac_terminal_delta* delta,
int width, int height); int width, int height);
/** /**
* Stores a set operation at the given location. * Stores a set operation at the given location.
*/ */
void guac_terminal_display_set(guac_terminal_display* display, int r, int c, void guac_terminal_delta_set(guac_terminal_delta* delta, int r, int c,
guac_terminal_char* character); guac_terminal_char* character);
/** /**
* Stores a rectangle of copy operations, copying existing operations as * Stores a rectangle of copy operations, copying existing operations as
* necessary. * necessary.
*/ */
void guac_terminal_display_copy(guac_terminal_display* display, void guac_terminal_delta_copy(guac_terminal_delta* delta,
int dst_row, int dst_column, int dst_row, int dst_column,
int src_row, int src_column, int src_row, int src_column,
int w, int h); int w, int h);
@ -440,15 +422,15 @@ void guac_terminal_display_copy(guac_terminal_display* display,
/** /**
* Sets a rectangle of character data to the given character value. * Sets a rectangle of character data to the given character value.
*/ */
void guac_terminal_display_set_rect(guac_terminal_display* display, void guac_terminal_delta_set_rect(guac_terminal_delta* delta,
int row, int column, int w, int h, int row, int column, int w, int h,
guac_terminal_char* character); guac_terminal_char* character);
/** /**
* Flushes all pending operations within the given guac_terminal_display to the * Flushes all pending operations within the given guac_client_delta to the
* given guac_terminal. * given guac_terminal.
*/ */
void guac_terminal_display_flush(guac_terminal_display* display, void guac_terminal_delta_flush(guac_terminal_delta* delta,
guac_terminal* terminal); guac_terminal* terminal);
/** /**

4
protocols/ssh/src/ssh_handlers.c
View File

@ -104,8 +104,8 @@ int ssh_guac_client_handle_messages(guac_client* client) {
} }
} }
/* Flush terminal display */ /* Flush terminal delta */
guac_terminal_display_flush(client_data->term->display, client_data->term); guac_terminal_delta_flush(client_data->term->delta, client_data->term);
/* Update cursor */ /* Update cursor */
guac_terminal_redraw_cursor(client_data->term); guac_terminal_redraw_cursor(client_data->term);

256
protocols/ssh/src/terminal.c
View File

@ -164,8 +164,8 @@ guac_terminal* guac_terminal_create(guac_client* client,
} }
/* Init display */ /* Init delta */
term->display = guac_terminal_display_alloc(term->term_width, term->delta = guac_terminal_delta_alloc(term->term_width,
term->term_height); term->term_height);
/* Clear with background color */ /* Clear with background color */
@ -185,8 +185,8 @@ void guac_terminal_free(guac_terminal* term) {
free(term->scrollback); free(term->scrollback);
/* Free display */ /* Free delta */
guac_terminal_display_free(term->display); guac_terminal_delta_free(term->delta);
} }
@ -354,7 +354,7 @@ int __guac_terminal_set_colors(guac_terminal* term,
/** /**
* Sends the given character to the terminal at the given row and column, * Sends the given character to the terminal at the given row and column,
* rendering the charater immediately. This bypasses the guac_terminal_display * rendering the charater immediately. This bypasses the guac_terminal_delta
* mechanism and is intended for flushing of updates only. * mechanism and is intended for flushing of updates only.
*/ */
int __guac_terminal_set(guac_terminal* term, int row, int col, char c) { int __guac_terminal_set(guac_terminal* term, int row, int col, char c) {
@ -378,8 +378,8 @@ int guac_terminal_set(guac_terminal* term, int row, int col, char c) {
guac_char.value = c; guac_char.value = c;
guac_char.attributes = term->current_attributes; guac_char.attributes = term->current_attributes;
/* Set display */ /* Set delta */
guac_terminal_display_set(term->display, row, col, &guac_char); guac_terminal_delta_set(term->delta, row, col, &guac_char);
return 0; return 0;
} }
@ -399,8 +399,8 @@ int guac_terminal_copy(guac_terminal* term,
int src_row, int src_col, int rows, int cols, int src_row, int src_col, int rows, int cols,
int dst_row, int dst_col) { int dst_row, int dst_col) {
/* Update display */ /* Update delta */
guac_terminal_display_copy(term->display, guac_terminal_delta_copy(term->delta,
dst_row, dst_col, dst_row, dst_col,
src_row, src_col, src_row, src_col,
cols, rows); cols, rows);
@ -420,7 +420,7 @@ int guac_terminal_clear(guac_terminal* term,
character.attributes.background = background_color; character.attributes.background = background_color;
/* Fill with color */ /* Fill with color */
guac_terminal_display_set_rect(term->display, guac_terminal_delta_set_rect(term->delta,
row, col, cols, rows, &character); row, col, cols, rows, &character);
return 0; return 0;
@ -514,76 +514,64 @@ int guac_terminal_clear_range(guac_terminal* term,
} }
guac_terminal_display* guac_terminal_display_alloc(int width, int height) { guac_terminal_delta* guac_terminal_delta_alloc(int width, int height) {
guac_terminal_display_char* current; guac_terminal_operation* current;
int x, y; int x, y;
/* Allocate display */ /* Allocate delta */
guac_terminal_display* display = malloc(sizeof(guac_terminal_display)); guac_terminal_delta* delta = malloc(sizeof(guac_terminal_delta));
/* Initial value of all characters in the display */
guac_terminal_char blank = {
.value = ' ',
.attributes = {
.background = 0
}
};
/* Set width and height */ /* Set width and height */
display->width = width; delta->width = width;
display->height = height; delta->height = height;
/* Alloc display */ /* Alloc operations */
display->characters = malloc(width * height * delta->operations = malloc(width * height *
sizeof(guac_terminal_display_char)); sizeof(guac_terminal_operation));
/* Init each display buffer row */ /* Init each operation buffer row */
current = display->characters; current = delta->operations;
for (y=0; y<height; y++) { for (y=0; y<height; y++) {
/* Init entire row to NOP */ /* Init entire row to NOP */
for (x=0; x<width; x++) { for (x=0; x<width; x++)
current->current = blank; (current++)->type = GUAC_CHAR_NOP;
current->next.type = GUAC_CHAR_NOP;
current++;
}
} }
return display; return delta;
} }
void guac_terminal_display_free(guac_terminal_display* display) { void guac_terminal_delta_free(guac_terminal_delta* delta) {
/* Free characters buffer */ /* Free operations buffer */
free(display->characters); free(delta->operations);
/* Free display */ /* Free delta */
free(display); free(delta);
} }
void guac_terminal_display_resize(guac_terminal_display* display, void guac_terminal_delta_resize(guac_terminal_delta* delta,
int width, int height) { int width, int height) {
/* STUB */ /* STUB */
} }
void guac_terminal_display_set(guac_terminal_display* display, int r, int c, void guac_terminal_delta_set(guac_terminal_delta* delta, int r, int c,
guac_terminal_char* character) { guac_terminal_char* character) {
/* Get operation at coordinate */ /* Get operation at coordinate */
guac_terminal_display_char* disp_char = guac_terminal_operation* op = &(delta->operations[r*delta->width + c]);
&(display->characters[r*display->width + c]);
/* Store operation */ /* Store operation */
disp_char->next.type = GUAC_CHAR_SET; op->type = GUAC_CHAR_SET;
disp_char->next.character = *character; op->character = *character;
} }
void guac_terminal_display_copy(guac_terminal_display* display, void guac_terminal_delta_copy(guac_terminal_delta* delta,
int dst_row, int dst_column, int dst_row, int dst_column,
int src_row, int src_column, int src_row, int src_column,
int w, int h) { int w, int h) {
@ -592,30 +580,30 @@ void guac_terminal_display_copy(guac_terminal_display* display,
/* FIXME: Handle intersections between src and dst rects */ /* FIXME: Handle intersections between src and dst rects */
guac_terminal_display_char* current_row = guac_terminal_operation* current_row =
&(display->characters[dst_row*display->width + dst_column]); &(delta->operations[dst_row*delta->width + dst_column]);
guac_terminal_display_char* src_current_row = guac_terminal_operation* src_current_row =
&(display->characters[src_row*display->width + src_column]); &(delta->operations[src_row*delta->width + src_column]);
/* Set rectangle to copy operations */ /* Set rectangle to copy operations */
for (row=0; row<h; row++) { for (row=0; row<h; row++) {
guac_terminal_display_char* current = current_row; guac_terminal_operation* current = current_row;
guac_terminal_display_char* src_current = src_current_row; guac_terminal_operation* src_current = src_current_row;
for (column=0; column<w; column++) { for (column=0; column<w; column++) {
/* If copying existing display operation, just copy that rather /* If copying existing delta operation, just copy that rather
* than create a new copy op */ * than create a new copy op */
if (src_current->next.type != GUAC_CHAR_NOP) if (src_current->type != GUAC_CHAR_NOP)
current->next = src_current->next; *current = *src_current;
/* Store operation */ /* Store operation */
else { else {
current->next.type = GUAC_CHAR_COPY; current->type = GUAC_CHAR_COPY;
current->next.row = src_row + row; current->row = src_row + row;
current->next.column = src_column + column; current->column = src_column + column;
} }
/* Next column */ /* Next column */
@ -625,8 +613,8 @@ void guac_terminal_display_copy(guac_terminal_display* display,
} }
/* Next row */ /* Next row */
current_row += display->width; current_row += delta->width;
src_current_row += display->width; src_current_row += delta->width;
} }
@ -634,23 +622,23 @@ void guac_terminal_display_copy(guac_terminal_display* display,
} }
void guac_terminal_display_set_rect(guac_terminal_display* display, void guac_terminal_delta_set_rect(guac_terminal_delta* delta,
int row, int column, int w, int h, int row, int column, int w, int h,
guac_terminal_char* character) { guac_terminal_char* character) {
guac_terminal_display_char* current_row = guac_terminal_operation* current_row =
&(display->characters[row*display->width + column]); &(delta->operations[row*delta->width + column]);
/* Set rectangle contents to given character */ /* Set rectangle contents to given character */
for (row=0; row<h; row++) { for (row=0; row<h; row++) {
guac_terminal_display_char* current = current_row; guac_terminal_operation* current = current_row;
for (column=0; column<w; column++) { for (column=0; column<w; column++) {
/* Store operation */ /* Store operation */
current->next.type = GUAC_CHAR_SET; current->type = GUAC_CHAR_SET;
current->next.character = *character; current->character = *character;
/* Next column */ /* Next column */
current++; current++;
@ -658,24 +646,24 @@ void guac_terminal_display_set_rect(guac_terminal_display* display,
} }
/* Next row */ /* Next row */
current_row += display->width; current_row += delta->width;
} }
} }
void __guac_terminal_display_flush_copy(guac_terminal_display* display, void __guac_terminal_delta_flush_copy(guac_terminal_delta* delta,
guac_terminal* terminal) { guac_terminal* terminal) {
guac_terminal_display_char* current = display->characters; guac_terminal_operation* current = delta->operations;
int row, col; int row, col;
/* For each operation */ /* For each operation */
for (row=0; row<display->height; row++) { for (row=0; row<delta->height; row++) {
for (col=0; col<display->width; col++) { for (col=0; col<delta->width; col++) {
/* If operation is a copy operation */ /* If operation is a copy operation */
if (current->next.type == GUAC_CHAR_COPY) { if (current->type == GUAC_CHAR_COPY) {
/* The determined bounds of the rectangle of contiguous /* The determined bounds of the rectangle of contiguous
* operations */ * operations */
@ -693,23 +681,23 @@ void __guac_terminal_display_flush_copy(guac_terminal_display* display,
int expected_row, expected_col; int expected_row, expected_col;
/* Current row within a subrect */ /* Current row within a subrect */
guac_terminal_display_char* rect_current_row; guac_terminal_operation* rect_current_row;
/* Determine bounds of rectangle */ /* Determine bounds of rectangle */
rect_current_row = current; rect_current_row = current;
expected_row = current->next.row; expected_row = current->row;
for (rect_row=row; rect_row<display->height; rect_row++) { for (rect_row=row; rect_row<delta->height; rect_row++) {
guac_terminal_display_char* rect_current = rect_current_row; guac_terminal_operation* rect_current = rect_current_row;
expected_col = current->next.column; expected_col = current->column;
/* Find width */ /* Find width */
for (rect_col=col; rect_col<display->width; rect_col++) { for (rect_col=col; rect_col<delta->width; rect_col++) {
/* If not identical operation, stop */ /* If not identical operation, stop */
if (rect_current->next.type != GUAC_CHAR_COPY if (rect_current->type != GUAC_CHAR_COPY
|| rect_current->next.row != expected_row || rect_current->row != expected_row
|| rect_current->next.column != expected_col) || rect_current->column != expected_col)
break; break;
/* Next column */ /* Next column */
@ -730,7 +718,7 @@ void __guac_terminal_display_flush_copy(guac_terminal_display* display,
detected_right = rect_col - 1; detected_right = rect_col - 1;
/* Next row */ /* Next row */
rect_current_row += display->width; rect_current_row += delta->width;
expected_row++; expected_row++;
} }
@ -741,19 +729,19 @@ void __guac_terminal_display_flush_copy(guac_terminal_display* display,
/* Mark rect as NOP (as it has been handled) */ /* Mark rect as NOP (as it has been handled) */
rect_current_row = current; rect_current_row = current;
expected_row = current->next.row; expected_row = current->row;
for (rect_row=0; rect_row<rect_height; rect_row++) { for (rect_row=0; rect_row<rect_height; rect_row++) {
guac_terminal_display_char* rect_current = rect_current_row; guac_terminal_operation* rect_current = rect_current_row;
expected_col = current->next.column; expected_col = current->column;
for (rect_col=0; rect_col<rect_width; rect_col++) { for (rect_col=0; rect_col<rect_width; rect_col++) {
/* Mark copy operations as NOP */ /* Mark copy operations as NOP */
if (rect_current->next.type == GUAC_CHAR_COPY if (rect_current->type == GUAC_CHAR_COPY
&& rect_current->next.row == expected_row && rect_current->row == expected_row
&& rect_current->next.column == expected_col) && rect_current->column == expected_col)
rect_current->next.type = GUAC_CHAR_NOP; rect_current->type = GUAC_CHAR_NOP;
/* Next column */ /* Next column */
rect_current++; rect_current++;
@ -762,7 +750,7 @@ void __guac_terminal_display_flush_copy(guac_terminal_display* display,
} }
/* Next row */ /* Next row */
rect_current_row += display->width; rect_current_row += delta->width;
expected_row++; expected_row++;
} }
@ -771,8 +759,8 @@ void __guac_terminal_display_flush_copy(guac_terminal_display* display,
guac_protocol_send_copy(terminal->client->socket, guac_protocol_send_copy(terminal->client->socket,
GUAC_DEFAULT_LAYER, GUAC_DEFAULT_LAYER,
current->next.column * terminal->char_width, current->column * terminal->char_width,
current->next.row * terminal->char_height, current->row * terminal->char_height,
rect_width * terminal->char_width, rect_width * terminal->char_width,
rect_height * terminal->char_height, rect_height * terminal->char_height,
@ -792,19 +780,19 @@ void __guac_terminal_display_flush_copy(guac_terminal_display* display,
} }
void __guac_terminal_display_flush_clear(guac_terminal_display* display, void __guac_terminal_delta_flush_clear(guac_terminal_delta* delta,
guac_terminal* terminal) { guac_terminal* terminal) {
guac_terminal_display_char* current = display->characters; guac_terminal_operation* current = delta->operations;
int row, col; int row, col;
/* For each operation */ /* For each operation */
for (row=0; row<display->height; row++) { for (row=0; row<delta->height; row++) {
for (col=0; col<display->width; col++) { for (col=0; col<delta->width; col++) {
/* If operation is a cler operation (set to space) */ /* If operation is a cler operation (set to space) */
if (current->next.type == GUAC_CHAR_SET && if (current->type == GUAC_CHAR_SET &&
current->next.character.value == ' ') { current->character.value == ' ') {
/* The determined bounds of the rectangle of contiguous /* The determined bounds of the rectangle of contiguous
* operations */ * operations */
@ -819,37 +807,35 @@ void __guac_terminal_display_flush_clear(guac_terminal_display* display,
/* Color of the rectangle to draw */ /* Color of the rectangle to draw */
int color; int color;
if (current->next.character.attributes.reverse) if (current->character.attributes.reverse)
color = current->next.character.attributes.foreground; color = current->character.attributes.foreground;
else else
color = current->next.character.attributes.background; color = current->character.attributes.background;
const guac_terminal_color* guac_color = const guac_terminal_color* guac_color =
&guac_terminal_palette[color]; &guac_terminal_palette[color];
/* Current row within a subrect */ /* Current row within a subrect */
guac_terminal_display_char* rect_current_row; guac_terminal_operation* rect_current_row;
/* Determine bounds of rectangle */ /* Determine bounds of rectangle */
rect_current_row = current; rect_current_row = current;
for (rect_row=row; rect_row<display->height; rect_row++) { for (rect_row=row; rect_row<delta->height; rect_row++) {
guac_terminal_display_char* rect_current = rect_current_row; guac_terminal_operation* rect_current = rect_current_row;
/* Find width */ /* Find width */
for (rect_col=col; rect_col<display->width; rect_col++) { for (rect_col=col; rect_col<delta->width; rect_col++) {
int joining_color; int joining_color;
if (rect_current->next.character.attributes.reverse) if (rect_current->character.attributes.reverse)
joining_color = joining_color = current->character.attributes.foreground;
current->next.character.attributes.foreground;
else else
joining_color = joining_color = current->character.attributes.background;
current->next.character.attributes.background;
/* If not identical operation, stop */ /* If not identical operation, stop */
if (rect_current->next.type != GUAC_CHAR_SET if (rect_current->type != GUAC_CHAR_SET
|| rect_current->next.character.value != ' ' || rect_current->character.value != ' '
|| joining_color != color) || joining_color != color)
break; break;
@ -870,7 +856,7 @@ void __guac_terminal_display_flush_clear(guac_terminal_display* display,
detected_right = rect_col - 1; detected_right = rect_col - 1;
/* Next row */ /* Next row */
rect_current_row += display->width; rect_current_row += delta->width;
} }
@ -882,23 +868,21 @@ void __guac_terminal_display_flush_clear(guac_terminal_display* display,
rect_current_row = current; rect_current_row = current;
for (rect_row=0; rect_row<rect_height; rect_row++) { for (rect_row=0; rect_row<rect_height; rect_row++) {
guac_terminal_display_char* rect_current = rect_current_row; guac_terminal_operation* rect_current = rect_current_row;
for (rect_col=0; rect_col<rect_width; rect_col++) { for (rect_col=0; rect_col<rect_width; rect_col++) {
int joining_color; int joining_color;
if (rect_current->next.character.attributes.reverse) if (rect_current->character.attributes.reverse)
joining_color = joining_color = current->character.attributes.foreground;
current->next.character.attributes.foreground;
else else
joining_color = joining_color = current->character.attributes.background;
current->next.character.attributes.background;
/* Mark clear operations as NOP */ /* Mark clear operations as NOP */
if (rect_current->next.type == GUAC_CHAR_SET if (rect_current->type == GUAC_CHAR_SET
&& rect_current->next.character.value == ' ' && rect_current->character.value == ' '
&& joining_color == color) && joining_color == color)
rect_current->next.type = GUAC_CHAR_NOP; rect_current->type = GUAC_CHAR_NOP;
/* Next column */ /* Next column */
rect_current++; rect_current++;
@ -906,7 +890,7 @@ void __guac_terminal_display_flush_clear(guac_terminal_display* display,
} }
/* Next row */ /* Next row */
rect_current_row += display->width; rect_current_row += delta->width;
} }
@ -934,29 +918,29 @@ void __guac_terminal_display_flush_clear(guac_terminal_display* display,
} }
void __guac_terminal_display_flush_set(guac_terminal_display* display, void __guac_terminal_delta_flush_set(guac_terminal_delta* delta,
guac_terminal* terminal) { guac_terminal* terminal) {
guac_terminal_display_char* current = display->characters; guac_terminal_operation* current = delta->operations;
int row, col; int row, col;
/* For each operation */ /* For each operation */
for (row=0; row<display->height; row++) { for (row=0; row<delta->height; row++) {
for (col=0; col<display->width; col++) { for (col=0; col<delta->width; col++) {
/* Perform given operation */ /* Perform given operation */
if (current->next.type == GUAC_CHAR_SET) { if (current->type == GUAC_CHAR_SET) {
/* Set attributes */ /* Set attributes */
__guac_terminal_set_colors(terminal, __guac_terminal_set_colors(terminal,
&(current->next.character.attributes)); &(current->character.attributes));
/* Send character */ /* Send character */
__guac_terminal_set(terminal, row, col, __guac_terminal_set(terminal, row, col,
current->next.character.value); current->character.value);
/* Mark operation as handled */ /* Mark operation as handled */
current->next.type = GUAC_CHAR_NOP; current->type = GUAC_CHAR_NOP;
} }
@ -968,17 +952,17 @@ void __guac_terminal_display_flush_set(guac_terminal_display* display,
} }
void guac_terminal_display_flush(guac_terminal_display* display, void guac_terminal_delta_flush(guac_terminal_delta* delta,
guac_terminal* terminal) { guac_terminal* terminal) {
/* Flush copy operations first */ /* Flush copy operations first */
__guac_terminal_display_flush_copy(display, terminal); __guac_terminal_delta_flush_copy(delta, terminal);
/* Flush clear operations (as they're just rects) */ /* Flush clear operations (as they're just rects) */
__guac_terminal_display_flush_clear(display, terminal); __guac_terminal_delta_flush_clear(delta, terminal);
/* Flush set operations (the only operations remaining) */ /* Flush set operations (the only operations remaining) */
__guac_terminal_display_flush_set(display, terminal); __guac_terminal_delta_flush_set(delta, terminal);
} }