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

Fix buffer copy_rows logic.

Browse Source
This commit is contained in:
Michael Jumper 2013-05-03 11:49:08 -07:00
parent 3a32e7084c
commit 857498fc19
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,38 +159,34 @@ void guac_terminal_buffer_copy_columns(guac_terminal_buffer* buffer, int row,
void guac_terminal_buffer_copy_rows(guac_terminal_buffer* buffer, void guac_terminal_buffer_copy_rows(guac_terminal_buffer* buffer,
int start_row, int end_row, int offset) { int start_row, int end_row, int offset) {
int row; int i, current_row;
int step; int step;
/* If shifting down, copy in reverse */ /* If shifting down, copy in reverse */
if (offset > 0) { if (offset > 0) {
current_row = end_row;
/* Swap start/end */
int temp = end_row;
end_row = start_row;
start_row = temp;
/* Iterate backwards */
step = -1; step = -1;
} }
/* Otherwise, copy forwards */ /* Otherwise, copy forwards */
else else {
current_row = start_row;
step = 1; step = 1;
}
/* Copy each row individually */ /* Copy each current_row individually */
for (row = start_row; row <= end_row; row += step) { for (i = start_row; i <= end_row; i++) {
guac_terminal_buffer_row* src_row;
guac_terminal_buffer_row* dst_row;
/* Get source and destination rows */ /* Get source and destination rows */
src_row = guac_terminal_buffer_get_row(buffer, row, 0); guac_terminal_buffer_row* src_row = guac_terminal_buffer_get_row(buffer, current_row, 0);
dst_row = guac_terminal_buffer_get_row(buffer, row + offset, src_row->length); guac_terminal_buffer_row* dst_row = guac_terminal_buffer_get_row(buffer, current_row + offset, src_row->length);
/* Copy data */ /* Copy data */
memcpy(dst_row->characters, src_row->characters, sizeof(guac_terminal_char) * src_row->length); memcpy(dst_row->characters, src_row->characters, sizeof(guac_terminal_char) * src_row->length);
dst_row->length = src_row->length;
/* Next current_row */
current_row += step;
} }