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

Fix handling of length in buffer.

Browse Source
This commit is contained in:
Michael Jumper 2013-04-28 01:28:49 -07:00
parent 3a50c9572d
commit 0c99978160
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,5 +151,9 @@ void guac_terminal_buffer_set_columns(guac_terminal_buffer* buffer, int row,
for (i=start_column; i<=end_column; i++) for (i=start_column; i<=end_column; i++)
*(current++) = *character; *(current++) = *character;
/* Update length depending on row written */
if (row >= buffer->length)
buffer->length = row+1;
} }

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

@ -170,7 +170,12 @@ int guac_terminal_scroll_up(guac_terminal* term,
/* Advance by scroll amount */ /* Advance by scroll amount */
term->buffer->top += amount; term->buffer->top += amount;
if (term->buffer->top >= term->buffer->available)
term->buffer->top -= term->buffer->available;
term->buffer->length += amount; term->buffer->length += amount;
if (term->buffer->length > term->buffer->available)
term->buffer->length = term->buffer->available;
} }
@ -263,7 +268,7 @@ void guac_terminal_scroll_display_down(guac_terminal* terminal,
scroll_amount = terminal->scroll_offset; scroll_amount = terminal->scroll_offset;
/* If not scrolling at all, don't bother trying */ /* If not scrolling at all, don't bother trying */
if (scroll_amount == 0) if (scroll_amount <= 0)
return; return;
/* Shift screen up */ /* Shift screen up */
@ -317,11 +322,11 @@ void guac_terminal_scroll_display_up(guac_terminal* terminal,
/* Limit scroll amount by size of scrollback buffer */ /* Limit scroll amount by size of scrollback buffer */
if (terminal->scroll_offset + scroll_amount > terminal->buffer->length) if (terminal->scroll_offset + scroll_amount > terminal->buffer->length - terminal->term_height)
scroll_amount = terminal->buffer->length - terminal->scroll_offset; scroll_amount = terminal->buffer->length - terminal->scroll_offset - terminal->term_height;
/* If not scrolling at all, don't bother trying */ /* If not scrolling at all, don't bother trying */
if (scroll_amount == 0) if (scroll_amount <= 0)
return; return;
/* Shift screen down */ /* Shift screen down */