Skip to content

Commit 253dad3

Browse files
authored
GUACAMOLE-2120: Merge support for requesting VT100-style codes for function/keypad keys.
2 parents 0336e2c + 8e21063 commit 253dad3

File tree

4 files changed

+30
-0
lines changed

4 files changed

+30
-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" : "func-keys-and-keypad",
136+
"type" : "ENUM",
137+
"options" : [ "", "esc", "vt100" ]
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" : "func-keys-and-keypad",
135+
"type" : "ENUM",
136+
"options" : [ "", "esc", "vt100" ]
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" : "func-keys-and-keypad",
113+
"type" : "ENUM",
114+
"options" : [ "", "esc", "vt100" ]
115+
},
111116
{
112117
"name" : "terminal-type",
113118
"type" : "ENUM",

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,7 @@
518518
"FIELD_HEADER_EXEC_COMMAND" : "Command (exec):",
519519
"FIELD_HEADER_FONT_NAME" : "Font name:",
520520
"FIELD_HEADER_FONT_SIZE" : "Font size:",
521+
"FIELD_HEADER_FUNC_KEYS_AND_KEYPAD" : "Function keys and keypad behavior:",
521522
"FIELD_HEADER_HOSTNAME" : "Hostname:",
522523
"FIELD_HEADER_IGNORE_CERT" : "Ignore server certificate:",
523524
"FIELD_HEADER_NAMESPACE" : "Namespace:",
@@ -567,6 +568,10 @@
567568
"FIELD_OPTION_FONT_SIZE_96" : "96",
568569
"FIELD_OPTION_FONT_SIZE_EMPTY" : "",
569570

571+
"FIELD_OPTION_FUNC_KEYS_AND_KEYPAD_EMPTY" : "",
572+
"FIELD_OPTION_FUNC_KEYS_AND_KEYPAD_ESC" : "ESC[n~",
573+
"FIELD_OPTION_FUNC_KEYS_AND_KEYPAD_VT100" : "VT100",
574+
570575
"NAME" : "Kubernetes",
571576

572577
"SECTION_HEADER_AUTHENTICATION" : "Authentication",
@@ -756,6 +761,7 @@
756761
"FIELD_HEADER_DISABLE_PASTE" : "Disable pasting from client:",
757762
"FIELD_HEADER_FONT_NAME" : "Font name:",
758763
"FIELD_HEADER_FONT_SIZE" : "Font size:",
764+
"FIELD_HEADER_FUNC_KEYS_AND_KEYPAD" : "Function keys and keypad behavior:",
759765
"FIELD_HEADER_ENABLE_SFTP" : "Enable SFTP:",
760766
"FIELD_HEADER_HOST_KEY" : "Public host key (Base64):",
761767
"FIELD_HEADER_HOSTNAME" : "Hostname:",
@@ -821,6 +827,10 @@
821827
"FIELD_OPTION_FONT_SIZE_96" : "96",
822828
"FIELD_OPTION_FONT_SIZE_EMPTY" : "",
823829

830+
"FIELD_OPTION_FUNC_KEYS_AND_KEYPAD_EMPTY" : "",
831+
"FIELD_OPTION_FUNC_KEYS_AND_KEYPAD_ESC" : "ESC[n~",
832+
"FIELD_OPTION_FUNC_KEYS_AND_KEYPAD_VT100" : "VT100",
833+
824834
"FIELD_OPTION_TERMINAL_TYPE_ANSI" : "ansi",
825835
"FIELD_OPTION_TERMINAL_TYPE_EMPTY" : "",
826836
"FIELD_OPTION_TERMINAL_TYPE_LINUX" : "linux",
@@ -855,6 +865,7 @@
855865
"FIELD_HEADER_DISABLE_PASTE" : "Disable pasting from client:",
856866
"FIELD_HEADER_FONT_NAME" : "Font name:",
857867
"FIELD_HEADER_FONT_SIZE" : "Font size:",
868+
"FIELD_HEADER_FUNC_KEYS_AND_KEYPAD" : "Function keys and keypad behavior:",
858869
"FIELD_HEADER_HOSTNAME" : "Hostname:",
859870
"FIELD_HEADER_LOGIN_FAILURE_REGEX" : "Login failure regular expression:",
860871
"FIELD_HEADER_LOGIN_SUCCESS_REGEX" : "Login success regular expression:",
@@ -913,6 +924,10 @@
913924
"FIELD_OPTION_FONT_SIZE_96" : "96",
914925
"FIELD_OPTION_FONT_SIZE_EMPTY" : "",
915926

927+
"FIELD_OPTION_FUNC_KEYS_AND_KEYPAD_EMPTY" : "",
928+
"FIELD_OPTION_FUNC_KEYS_AND_KEYPAD_ESC" : "ESC[n~",
929+
"FIELD_OPTION_FUNC_KEYS_AND_KEYPAD_VT100" : "VT100",
930+
916931
"FIELD_OPTION_TERMINAL_TYPE_ANSI" : "ansi",
917932
"FIELD_OPTION_TERMINAL_TYPE_EMPTY" : "",
918933
"FIELD_OPTION_TERMINAL_TYPE_LINUX" : "linux",

0 commit comments

Comments
 (0)