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

Simplify scrolling logic.

Browse Source
This commit is contained in:
Michael Jumper 2013-04-05 11:31:46 -07:00
parent f7143be78b
commit 84d45097d0
2 changed files with 56 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -584,6 +584,14 @@ void guac_terminal_scrollback_buffer_append(
guac_terminal_scrollback_buffer* buffer, guac_terminal_scrollback_buffer* buffer,
guac_terminal* terminal, int rows); guac_terminal* terminal, int rows);
/**
* Returns the row within the scrollback at the given location. The index
* of the row given is a negative number, denoting the number of rows into
* the past to look.
*/
guac_terminal_scrollback_row* guac_terminal_scrollback_buffer_get_row(
guac_terminal_scrollback_buffer* buffer, int row);
/** /**
* Scroll down the display by one row, replacing the new space with data from * Scroll down the display by one row, replacing the new space with data from
* the scrollback. * the scrollback.

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

@ -1185,11 +1185,10 @@ void guac_terminal_scroll_display_down(guac_terminal* terminal) {
int scroll_amount = 3; int scroll_amount = 3;
int start_row, end_row;
int dest_row;
int row, column; int row, column;
int scrollback_row_index;
guac_terminal_scrollback_row* scrollback_row;
/* Limit scroll amount by size of scrollback buffer */ /* Limit scroll amount by size of scrollback buffer */
if (scroll_amount > terminal->scroll_offset) if (scroll_amount > terminal->scroll_offset)
scroll_amount = terminal->scroll_offset; scroll_amount = terminal->scroll_offset;
@ -1207,34 +1206,32 @@ void guac_terminal_scroll_display_down(guac_terminal* terminal) {
/* Advance by scroll amount */ /* Advance by scroll amount */
terminal->scroll_offset -= scroll_amount; terminal->scroll_offset -= scroll_amount;
guac_client_log_info(terminal->client, "scrolling to %i", terminal->scroll_offset);
/* Get corresponding scrollback row */ /* Get row range */
scrollback_row_index = terminal->scrollback->top - terminal->scroll_offset + terminal->term_height - 1; end_row = terminal->term_height - terminal->scroll_offset - 1;
scrollback_row = &(terminal->scrollback->scrollback[scrollback_row_index]); start_row = end_row - scroll_amount + 1;
dest_row = terminal->term_height - scroll_amount;
guac_client_log_info(terminal->client,
"Scrolling rows %i through %i into view (scroll down)",
start_row, end_row);
/* Draw new rows from scrollback */ /* Draw new rows from scrollback */
for (row=terminal->term_height - scroll_amount; row < terminal->term_height; row++) { for (row=start_row; row<=end_row; row++) {
/* FIXME: Clear row first */ /* Get row from scrollback */
guac_terminal_scrollback_row* scrollback_row =
guac_terminal_scrollback_buffer_get_row(terminal->scrollback, row);
/* Draw row */ /* Draw row */
/* FIXME: Clear row first */
guac_terminal_char* current = scrollback_row->characters; guac_terminal_char* current = scrollback_row->characters;
for (column=0; column<scrollback_row->length; column++) for (column=0; column<scrollback_row->length; column++)
guac_terminal_delta_set(terminal->delta, row, column, current++); guac_terminal_delta_set(terminal->delta, dest_row, column,
current++);
/* Next row */ /* Next row */
scrollback_row_index++; dest_row++;
/* Wrap if at end of scrollback */
if (scrollback_row_index == terminal->scrollback->rows) {
scrollback_row_index = 0;
scrollback_row = terminal->scrollback->scrollback;
}
/* Otherwise, just advance to next row */
else
scrollback_row++;
} }
@ -1248,10 +1245,10 @@ void guac_terminal_scroll_display_up(guac_terminal* terminal) {
int scroll_amount = 3; int scroll_amount = 3;
int start_row, end_row;
int dest_row;
int row, column; int row, column;
int scrollback_row_index;
guac_terminal_scrollback_row* scrollback_row;
/* Limit scroll amount by size of scrollback buffer */ /* Limit scroll amount by size of scrollback buffer */
if (terminal->scroll_offset + scroll_amount > terminal->scrollback->length) if (terminal->scroll_offset + scroll_amount > terminal->scrollback->length)
@ -1270,34 +1267,32 @@ void guac_terminal_scroll_display_up(guac_terminal* terminal) {
/* Advance by scroll amount */ /* Advance by scroll amount */
terminal->scroll_offset += scroll_amount; terminal->scroll_offset += scroll_amount;
guac_client_log_info(terminal->client, "scrolling to %i", terminal->scroll_offset);
/* Get corresponding scrollback row */ /* Get row range */
scrollback_row_index = terminal->scrollback->top - terminal->scroll_offset; start_row = -terminal->scroll_offset;
scrollback_row = &(terminal->scrollback->scrollback[scrollback_row_index]); end_row = start_row + scroll_amount - 1;
dest_row = 0;
guac_client_log_info(terminal->client,
"Scrolling rows %i through %i into view (scroll up)",
start_row, end_row);
/* Draw new rows from scrollback */ /* Draw new rows from scrollback */
for (row=0; row < scroll_amount; row++) { for (row=start_row; row<=end_row; row++) {
/* FIXME: Clear row first */ /* Get row from scrollback */
guac_terminal_scrollback_row* scrollback_row =
guac_terminal_scrollback_buffer_get_row(terminal->scrollback, row);
/* Draw row */ /* Draw row */
/* FIXME: Clear row first */
guac_terminal_char* current = scrollback_row->characters; guac_terminal_char* current = scrollback_row->characters;
for (column=0; column<scrollback_row->length; column++) for (column=0; column<scrollback_row->length; column++)
guac_terminal_delta_set(terminal->delta, row, column, current++); guac_terminal_delta_set(terminal->delta, dest_row, column,
current++);
/* Next row */ /* Next row */
scrollback_row_index++; dest_row++;
/* Wrap if at end of scrollback */
if (scrollback_row_index == terminal->scrollback->rows) {
scrollback_row_index = 0;
scrollback_row = terminal->scrollback->scrollback;
}
/* Otherwise, just advance to next row */
else
scrollback_row++;
} }
@ -1307,3 +1302,15 @@ void guac_terminal_scroll_display_up(guac_terminal* terminal) {
} }
guac_terminal_scrollback_row* guac_terminal_scrollback_buffer_get_row(
guac_terminal_scrollback_buffer* buffer, int row) {
/* Calculate scrollback row index */
int index = buffer->top + row;
if (index < 0) index += buffer->rows;
/* Return found row */
return &(buffer->scrollback[index]);
}