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

GUAC-1452: Add stub handlers for new pipe OSC codes.

Browse Source
This commit is contained in:
Michael Jumper 2016-01-12 16:28:25 -08:00
parent 97bfcef20d
commit b869edb0a2
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/terminal/terminal_handlers.c
View File

@ -936,6 +936,41 @@ int guac_terminal_download(guac_terminal* term, unsigned char c) {
} }
int guac_terminal_open_pipe_stream(guac_terminal* term, unsigned char c) {
static char stream_name[2048];
static int length = 0;
/* Open pipe on ECMA-48 ST (String Terminator) */
if (c == 0x9C || c == 0x5C || c == 0x07) {
stream_name[length++] = '\0';
term->char_handler = guac_terminal_echo;
guac_client_log(term->client, GUAC_LOG_DEBUG,
"STUB: Opening pipe: '%s'", stream_name);
length = 0;
}
/* Otherwise, store character within stream name */
else if (length < sizeof(stream_name)-1)
stream_name[length++] = c;
return 0;
}
int guac_terminal_close_pipe_stream(guac_terminal* term, unsigned char c) {
/* Handle closure on ECMA-48 ST (String Terminator) */
if (c == 0x9C || c == 0x5C || c == 0x07) {
term->char_handler = guac_terminal_echo;
guac_client_log(term->client, GUAC_LOG_DEBUG, "STUB: Closing pipe");
}
/* Ignore all other characters */
return 0;
}
int guac_terminal_osc(guac_terminal* term, unsigned char c) { int guac_terminal_osc(guac_terminal* term, unsigned char c) {
static int operation = 0; static int operation = 0;
@ -955,6 +990,14 @@ int guac_terminal_osc(guac_terminal* term, unsigned char c) {
else if (operation == 482201) else if (operation == 482201)
term->char_handler = guac_terminal_set_directory; term->char_handler = guac_terminal_set_directory;
/* Open and redirect output to pipe stream OSC */
else if (operation == 482202)
term->char_handler = guac_terminal_open_pipe_stream;
/* Close pipe stream OSC */
else if (operation == 482203)
term->char_handler = guac_terminal_close_pipe_stream;
/* Reset parameter for next OSC */ /* Reset parameter for next OSC */
operation = 0; operation = 0;

2
src/terminal/terminal_handlers.h
View File

@ -35,6 +35,8 @@ int guac_terminal_g1_charset(guac_terminal* term, unsigned char c);
int guac_terminal_csi(guac_terminal* term, unsigned char c); int guac_terminal_csi(guac_terminal* term, unsigned char c);
int guac_terminal_download(guac_terminal* term, unsigned char c); int guac_terminal_download(guac_terminal* term, unsigned char c);
int guac_terminal_set_directory(guac_terminal* term, unsigned char c); int guac_terminal_set_directory(guac_terminal* term, unsigned char c);
int guac_terminal_open_pipe_stream(guac_terminal* term, unsigned char c);
int guac_terminal_close_pipe_stream(guac_terminal* term, unsigned char c);
int guac_terminal_osc(guac_terminal* term, unsigned char c); 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);