You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2017/01/29 20:27:08 UTC
[2/4] incubator-guacamole-server git commit: GUACAMOLE-148: Move
cursor bounds checking to common location (where necessary).
GUACAMOLE-148: Move cursor bounds checking to common location (where necessary).
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/6c1eeb96
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/6c1eeb96
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/6c1eeb96
Branch: refs/heads/master
Commit: 6c1eeb96b0f3feba38ad74b30f933b91f915045a
Parents: 073fbe6
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Jan 28 22:48:45 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Jan 28 22:48:45 2017 -0800
----------------------------------------------------------------------
src/terminal/terminal_handlers.c | 120 +++++++++++++++++++---------------
1 file changed, 68 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/6c1eeb96/src/terminal/terminal_handlers.c
----------------------------------------------------------------------
diff --git a/src/terminal/terminal_handlers.c b/src/terminal/terminal_handlers.c
index 3e76e66..2bae0f2 100644
--- a/src/terminal/terminal_handlers.c
+++ b/src/terminal/terminal_handlers.c
@@ -89,6 +89,39 @@ static void guac_terminal_reverse_linefeed(guac_terminal* term) {
}
+/**
+ * Sets the position of the cursor without exceeding terminal bounds. Values
+ * which are out of bounds will be shifted to the nearest legal boundary.
+ *
+ * @param term
+ * The guac_terminal whose cursor position is being set.
+ *
+ * @param row
+ * The desired new row position.
+ *
+ * @param col
+ * The desired new column position.
+ */
+static void guac_terminal_move_cursor(guac_terminal* term, int row, int col) {
+
+ /* Ensure cursor row is within terminal bounds */
+ if (row >= term->term_height)
+ row = term->term_height - 1;
+ else if (row < 0)
+ row = 0;
+
+ /* Ensure cursor column is within terminal bounds */
+ if (col >= term->term_width)
+ col = term->term_width - 1;
+ else if (col < 0)
+ col = 0;
+
+ /* Update cursor position */
+ term->cursor_row = row;
+ term->cursor_col = col;
+
+}
+
int guac_terminal_echo(guac_terminal* term, unsigned char c) {
int width;
@@ -163,13 +196,14 @@ int guac_terminal_echo(guac_terminal* term, unsigned char c) {
/* Backspace */
case 0x08:
- if (term->cursor_col >= 1)
- term->cursor_col--;
+ guac_terminal_move_cursor(term, term->cursor_row,
+ term->cursor_col - 1);
break;
/* Tab */
case 0x09:
- term->cursor_col = guac_terminal_next_tab(term, term->cursor_col);
+ guac_terminal_move_cursor(term, term->cursor_row,
+ guac_terminal_next_tab(term, term->cursor_col));
break;
/* Line feed / VT / FF */
@@ -186,7 +220,7 @@ int guac_terminal_echo(guac_terminal* term, unsigned char c) {
/* Carriage return */
case '\r':
- term->cursor_col = 0;
+ guac_terminal_move_cursor(term, term->cursor_row, 0);
break;
/* SO (activates character set G1) */
@@ -288,14 +322,9 @@ int guac_terminal_escape(guac_terminal* term, unsigned char c) {
/* Restore Cursor (DECRC) */
case '8':
-
- term->cursor_row = term->saved_cursor_row;
- if (term->cursor_row >= term->term_height)
- term->cursor_row = term->term_height - 1;
-
- term->cursor_col = term->saved_cursor_col;
- if (term->cursor_col >= term->term_width)
- term->cursor_col = term->term_width - 1;
+ guac_terminal_move_cursor(term,
+ term->saved_cursor_row,
+ term->saved_cursor_col);
term->char_handler = guac_terminal_echo;
break;
@@ -308,7 +337,7 @@ int guac_terminal_escape(guac_terminal* term, unsigned char c) {
/* Next Line (NEL) */
case 'E':
- term->cursor_col = 0;
+ guac_terminal_move_cursor(term, term->cursor_row, 0);
guac_terminal_linefeed(term);
term->char_handler = guac_terminal_echo;
break;
@@ -474,9 +503,9 @@ int guac_terminal_csi(guac_terminal* term, unsigned char c) {
if (amount == 0) amount = 1;
/* Move cursor */
- term->cursor_row -= amount;
- if (term->cursor_row < 0)
- term->cursor_row = 0;
+ guac_terminal_move_cursor(term,
+ term->cursor_row - amount,
+ term->cursor_col);
break;
@@ -489,9 +518,9 @@ int guac_terminal_csi(guac_terminal* term, unsigned char c) {
if (amount == 0) amount = 1;
/* Move cursor */
- term->cursor_row += amount;
- if (term->cursor_row >= term->term_height)
- term->cursor_row = term->term_height - 1;
+ guac_terminal_move_cursor(term,
+ term->cursor_row + amount,
+ term->cursor_col);
break;
@@ -504,9 +533,9 @@ int guac_terminal_csi(guac_terminal* term, unsigned char c) {
if (amount == 0) amount = 1;
/* Move cursor */
- term->cursor_col += amount;
- if (term->cursor_col >= term->term_width)
- term->cursor_col = term->term_width - 1;
+ guac_terminal_move_cursor(term,
+ term->cursor_row,
+ term->cursor_col + amount);
break;
@@ -518,9 +547,9 @@ int guac_terminal_csi(guac_terminal* term, unsigned char c) {
if (amount == 0) amount = 1;
/* Move cursor */
- term->cursor_col -= amount;
- if (term->cursor_col < 0)
- term->cursor_col = 0;
+ guac_terminal_move_cursor(term,
+ term->cursor_row,
+ term->cursor_col - amount);
break;
@@ -531,13 +560,10 @@ int guac_terminal_csi(guac_terminal* term, unsigned char c) {
amount = argv[0];
if (amount == 0) amount = 1;
- /* Move cursor */
- term->cursor_row += amount;
- if (term->cursor_row >= term->term_height)
- term->cursor_row = term->term_height - 1;
-
- /* Reset to column 1 */
- term->cursor_col = 0;
+ /* Move cursor down, reset to column 1 */
+ guac_terminal_move_cursor(term,
+ term->cursor_row + amount,
+ 0);
break;
@@ -548,13 +574,10 @@ int guac_terminal_csi(guac_terminal* term, unsigned char c) {
amount = argv[0];
if (amount == 0) amount = 1;
- /* Move cursor */
- term->cursor_row -= amount;
- if (term->cursor_row < 0)
- term->cursor_row = 0;
-
- /* Reset to column 1 */
- term->cursor_col = 0;
+ /* Move cursor up , reset to column 1 */
+ guac_terminal_move_cursor(term,
+ term->cursor_row - amount,
+ 0);
break;
@@ -562,7 +585,7 @@ int guac_terminal_csi(guac_terminal* term, unsigned char c) {
case '`':
case 'G':
col = argv[0]; if (col != 0) col--;
- term->cursor_col = col;
+ guac_terminal_move_cursor(term, term->cursor_row, col);
break;
/* H: Move cursor */
@@ -572,8 +595,7 @@ int guac_terminal_csi(guac_terminal* term, unsigned char c) {
row = argv[0]; if (row != 0) row--;
col = argv[1]; if (col != 0) col--;
- term->cursor_row = row;
- term->cursor_col = col;
+ guac_terminal_move_cursor(term, row, col);
break;
/* J: Erase display */
@@ -684,7 +706,7 @@ int guac_terminal_csi(guac_terminal* term, unsigned char c) {
/* d: Move cursor, current col */
case 'd':
row = argv[0]; if (row != 0) row--;
- term->cursor_row = row;
+ guac_terminal_move_cursor(term, row, term->cursor_col);
break;
/* g: Clear tab */
@@ -829,15 +851,9 @@ int guac_terminal_csi(guac_terminal* term, unsigned char c) {
/* Restore Cursor */
case 'u':
-
- term->cursor_row = term->saved_cursor_row;
- if (term->cursor_row >= term->term_height)
- term->cursor_row = term->term_height - 1;
-
- term->cursor_col = term->saved_cursor_col;
- if (term->cursor_col >= term->term_width)
- term->cursor_col = term->term_width - 1;
-
+ guac_terminal_move_cursor(term,
+ term->saved_cursor_row,
+ term->saved_cursor_col);
break;
/* Warn of unhandled codes */