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

GUACAMOLE-564: Merge changes ignoring APC sequences within Guacamole's terminal emulator.

Browse Source
This commit is contained in:
Michael Jumper 2018-05-27 09:31:35 -07:00
commit 526152b9c6
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/terminal/terminal/terminal_handlers.h
View File

@ -186,5 +186,16 @@ int guac_terminal_osc(guac_terminal* term, unsigned char c);
*/ */
int guac_terminal_ctrl_func(guac_terminal* term, unsigned char c); int guac_terminal_ctrl_func(guac_terminal* term, unsigned char c);
/**
* Handles terminal control function sequences initiated with "ESC _".
*
* @param term
* The terminal that received the given character of data.
*
* @param c
* The character that was received by the given terminal.
*/
int guac_terminal_apc(guac_terminal* term, unsigned char c);
#endif #endif

20
src/terminal/terminal_handlers.c
View File

@ -367,6 +367,10 @@ int guac_terminal_escape(guac_terminal* term, unsigned char c) {
guac_terminal_reset(term); guac_terminal_reset(term);
break; break;
case '_':
term->char_handler = guac_terminal_apc;
break;
default: default:
guac_client_log(term->client, GUAC_LOG_DEBUG, guac_client_log(term->client, GUAC_LOG_DEBUG,
"Unhandled ESC sequence: %c", c); "Unhandled ESC sequence: %c", c);
@ -1373,3 +1377,19 @@ int guac_terminal_ctrl_func(guac_terminal* term, unsigned char c) {
} }
int guac_terminal_apc(guac_terminal* term, unsigned char c) {
/* xterm does not implement APC functions and neither do we. Look for the
* "ESC \" (string terminator) sequence, while ignoring other chars. */
static bool escaping = false;
if (escaping) {
if (c == '\\')
term->char_handler = guac_terminal_echo;
escaping = false;
}
if (c == 0x1B)
escaping = true;
return 0;
}