Skip to content

Commit 10f3ab8

Browse files
committed
GUACAMOLE-2120: Support VT100 escape codes sent for function keys and keypad.
1 parent db37ac3 commit 10f3ab8

File tree

4 files changed

+27
-0
lines changed

4 files changed

+27
-0
lines changed

guacamole-ext/src/main/resources/org/apache/guacamole/protocols/kubernetes.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@
130130
"name" : "backspace",
131131
"type" : "ENUM",
132132
"options" : [ "", "127", "8" ]
133+
},
134+
{
135+
"name" : "function-keys",
136+
"type" : "ENUM",
137+
"options" : [ "", "vt100plus" ]
133138
}
134139
]
135140
},

guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@
130130
"type" : "ENUM",
131131
"options" : [ "", "127", "8" ]
132132
},
133+
{
134+
"name" : "function-keys",
135+
"type" : "ENUM",
136+
"options" : [ "", "vt100plus" ]
137+
},
133138
{
134139
"name" : "terminal-type",
135140
"type" : "ENUM",

guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,11 @@
108108
"type" : "ENUM",
109109
"options" : [ "", "127", "8" ]
110110
},
111+
{
112+
"name" : "function-keys",
113+
"type" : "ENUM",
114+
"options" : [ "", "vt100plus" ]
115+
},
111116
{
112117
"name" : "terminal-type",
113118
"type" : "ENUM",

guacamole/src/main/frontend/src/translations/en.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,7 @@
517517
"FIELD_HEADER_EXEC_COMMAND" : "Command (exec):",
518518
"FIELD_HEADER_FONT_NAME" : "Font name:",
519519
"FIELD_HEADER_FONT_SIZE" : "Font size:",
520+
"FIELD_HEADER_FUNCTION_KEYS" : "Function keys and keypad behavior:",
520521
"FIELD_HEADER_HOSTNAME" : "Hostname:",
521522
"FIELD_HEADER_IGNORE_CERT" : "Ignore server certificate:",
522523
"FIELD_HEADER_NAMESPACE" : "Namespace:",
@@ -566,6 +567,9 @@
566567
"FIELD_OPTION_FONT_SIZE_96" : "96",
567568
"FIELD_OPTION_FONT_SIZE_EMPTY" : "",
568569

570+
"FIELD_OPTION_FUNCTION_KEYS_EMPTY" : "",
571+
"FIELD_OPTION_FUNCTION_KEYS_VT100PLUS" : "VT100+",
572+
569573
"NAME" : "Kubernetes",
570574

571575
"SECTION_HEADER_AUTHENTICATION" : "Authentication",
@@ -755,6 +759,7 @@
755759
"FIELD_HEADER_DISABLE_PASTE" : "Disable pasting from client:",
756760
"FIELD_HEADER_FONT_NAME" : "Font name:",
757761
"FIELD_HEADER_FONT_SIZE" : "Font size:",
762+
"FIELD_HEADER_FUNCTION_KEYS" : "Function keys and keypad behavior:",
758763
"FIELD_HEADER_ENABLE_SFTP" : "Enable SFTP:",
759764
"FIELD_HEADER_HOST_KEY" : "Public host key (Base64):",
760765
"FIELD_HEADER_HOSTNAME" : "Hostname:",
@@ -820,6 +825,9 @@
820825
"FIELD_OPTION_FONT_SIZE_96" : "96",
821826
"FIELD_OPTION_FONT_SIZE_EMPTY" : "",
822827

828+
"FIELD_OPTION_FUNCTION_KEYS_EMPTY" : "",
829+
"FIELD_OPTION_FUNCTION_KEYS_VT100PLUS" : "VT100+",
830+
823831
"FIELD_OPTION_TERMINAL_TYPE_ANSI" : "ansi",
824832
"FIELD_OPTION_TERMINAL_TYPE_EMPTY" : "",
825833
"FIELD_OPTION_TERMINAL_TYPE_LINUX" : "linux",
@@ -854,6 +862,7 @@
854862
"FIELD_HEADER_DISABLE_PASTE" : "Disable pasting from client:",
855863
"FIELD_HEADER_FONT_NAME" : "Font name:",
856864
"FIELD_HEADER_FONT_SIZE" : "Font size:",
865+
"FIELD_HEADER_FUNCTION_KEYS" : "Function keys and keypad behavior:",
857866
"FIELD_HEADER_HOSTNAME" : "Hostname:",
858867
"FIELD_HEADER_LOGIN_FAILURE_REGEX" : "Login failure regular expression:",
859868
"FIELD_HEADER_LOGIN_SUCCESS_REGEX" : "Login success regular expression:",
@@ -912,6 +921,9 @@
912921
"FIELD_OPTION_FONT_SIZE_96" : "96",
913922
"FIELD_OPTION_FONT_SIZE_EMPTY" : "",
914923

924+
"FIELD_OPTION_FUNCTION_KEYS_EMPTY" : "",
925+
"FIELD_OPTION_FUNCTION_KEYS_VT100PLUS" : "VT100+",
926+
915927
"FIELD_OPTION_TERMINAL_TYPE_ANSI" : "ansi",
916928
"FIELD_OPTION_TERMINAL_TYPE_EMPTY" : "",
917929
"FIELD_OPTION_TERMINAL_TYPE_LINUX" : "linux",

0 commit comments

Comments
 (0)