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

Fix handling of CSI sequences.

Browse Source
This commit is contained in:
Michael Jumper 2013-05-22 11:38:39 -07:00
parent b1622413a9
commit c2f507a00a
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
protocols/ssh/src/terminal_handlers.c
View File

@ -284,17 +284,13 @@ int guac_terminal_csi(guac_terminal* term, char c) {
static int argc = 0; static int argc = 0;
static int argv[16] = {0}; static int argv[16] = {0};
/* Whether the sequence started with a question mark */ /* Sequence prefix, if any */
static bool initial_question_mark = false; static char private_mode_character = 0;
/* Argument building counter and buffer */ /* Argument building counter and buffer */
static int argv_length = 0; static int argv_length = 0;
static char argv_buffer[256]; static char argv_buffer[256];
/* "The sequence of parameters may be preceded by a single question mark." */
if (c == '?')
return 0;
/* Digits get concatenated into argv */ /* Digits get concatenated into argv */
if (c >= '0' && c <= '9') { if (c >= '0' && c <= '9') {
@ -304,8 +300,8 @@ int guac_terminal_csi(guac_terminal* term, char c) {
} }
/* Any non-digit stops the parameter, and possibly the sequence */ /* Specific non-digits stop the parameter, and possibly the sequence */
else { else if ((c >= 0x40 && c <= 0x7E) || c == ';') {
int i, row, col, amount; int i, row, col, amount;
@ -560,13 +556,13 @@ int guac_terminal_csi(guac_terminal* term, char c) {
case 'h': case 'h':
/* DECCKM */ /* DECCKM */
if (argv[0] == 1) if (argv[0] == 1 && private_mode_character == '?')
term->application_cursor_keys = true; term->application_cursor_keys = true;
else else
guac_client_log_info(term->client, guac_client_log_info(term->client,
"Unhandled mode set: mode=%i, initial_question_mark=%i", "Unhandled mode set: mode=%i, private_mode_character=0x%0x",
argv[0], initial_question_mark); argv[0], private_mode_character);
break; break;
@ -574,13 +570,13 @@ int guac_terminal_csi(guac_terminal* term, char c) {
case 'l': case 'l':
/* DECCKM */ /* DECCKM */
if (argv[0] == 1) if (argv[0] == 1 && private_mode_character == '?')
term->application_cursor_keys = false; term->application_cursor_keys = false;
else else
guac_client_log_info(term->client, guac_client_log_info(term->client,
"Unhandled mode reset: mode=%i, initial_question_mark=%i", "Unhandled mode reset: mode=%i, private_mode_character=0x%0x",
argv[0], initial_question_mark); argv[0], private_mode_character);
break; break;
@ -690,8 +686,8 @@ int guac_terminal_csi(guac_terminal* term, char c) {
for (i=0; i<argc; i++) for (i=0; i<argc; i++)
argv[i] = 0; argv[i] = 0;
/* Reset mark flag */ /* Reset private mode character */
initial_question_mark = false; private_mode_character = 0;
/* Reset argument counters */ /* Reset argument counters */
argc = 0; argc = 0;
@ -700,6 +696,10 @@ int guac_terminal_csi(guac_terminal* term, char c) {
} }
/* Set private mode character if given and unset */
else if (c >= 0x3A && c <= 0x3F && private_mode_character == 0)
private_mode_character = c;
return 0; return 0;
} }