From 0385f61201e488d3122ffc3fcadadac00506e5b0 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Wed, 10 Feb 2021 13:11:30 -0800
Subject: [PATCH] GUACAMOLE-1204: Add definitions and translations for RDP
 multi-touch parameters.

---
 .../resources/org/apache/guacamole/protocols/rdp.json  | 10 ++++++++++
 guacamole/src/main/webapp/translations/en.json         |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
index 048122741..915b9c8c1 100644
--- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
+++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
@@ -114,6 +114,11 @@
                     "name"  : "timezone",
                     "type"  : "TIMEZONE"
                 },
+                {
+                    "name"    : "enable-touch",
+                    "type"    : "BOOLEAN",
+                    "options" : [ "true" ]
+                },
                 {
                     "name"    : "console",
                     "type"    : "BOOLEAN",
@@ -347,6 +352,11 @@
                     "type"  : "BOOLEAN",
                     "options" : [ "true" ]
                 },
+                {
+                    "name"  : "recording-exclude-touch",
+                    "type"  : "BOOLEAN",
+                    "options" : [ "true" ]
+                },
                 {
                     "name"  : "recording-include-keys",
                     "type"  : "BOOLEAN",
diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json
index caf1b0a2b..f5c4a8f03 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -480,6 +480,7 @@
         "FIELD_HEADER_ENABLE_PRINTING"            : "Enable printing:",
         "FIELD_HEADER_ENABLE_SFTP"     : "Enable SFTP:",
         "FIELD_HEADER_ENABLE_THEMING"             : "Enable theming:",
+        "FIELD_HEADER_ENABLE_TOUCH"               : "Enable multi-touch:",
         "FIELD_HEADER_ENABLE_WALLPAPER"           : "Enable wallpaper:",
         "FIELD_HEADER_GATEWAY_DOMAIN"   : "Domain:",
         "FIELD_HEADER_GATEWAY_HOSTNAME" : "Hostname:",
@@ -499,6 +500,7 @@
         "FIELD_HEADER_READ_ONLY"      : "Read-only:",
         "FIELD_HEADER_RECORDING_EXCLUDE_MOUSE"  : "Exclude mouse:",
         "FIELD_HEADER_RECORDING_EXCLUDE_OUTPUT" : "Exclude graphics/streams:",
+        "FIELD_HEADER_RECORDING_EXCLUDE_TOUCH"  : "Exclude touch events:",
         "FIELD_HEADER_RECORDING_INCLUDE_KEYS"   : "Include key events:",
         "FIELD_HEADER_RECORDING_NAME" : "Recording name:",
         "FIELD_HEADER_RECORDING_PATH" : "Recording path:",