From e4b09fb58e888085899692c50a267166b4f84e80 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Mon, 27 Jul 2015 18:52:39 -0700
Subject: [PATCH] GUAC-298: Add VNC parameter for clipboard encoding.

---
 .../org/glyptodon/guacamole/protocols/vnc.json        | 11 +++++++++++
 guacamole/src/main/webapp/translations/en.json        |  8 ++++++++
 2 files changed, 19 insertions(+)

diff --git a/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/vnc.json b/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/vnc.json
index 31dc803c6..a07792487 100644
--- a/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/vnc.json
+++ b/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/vnc.json
@@ -52,6 +52,17 @@
             ]
         },
 
+        {
+            "name"  : "clipboard",
+            "fields" : [
+                {
+                    "name"    : "clipboard-encoding",
+                    "type"    : "ENUM",
+                    "options" : [ "", "ISO8859-1", "UTF-8", "UTF-16", "CP1252" ]
+                }
+            ]
+        },
+
         {
             "name"  : "repeater",
             "fields" : [
diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json
index 553e80427..96e596f90 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -394,6 +394,7 @@
     "PROTOCOL_VNC" : {
 
         "FIELD_HEADER_AUDIO_SERVERNAME" : "Audio server name:",
+        "FIELD_HEADER_CLIPBOARD_ENCODING" : "Encoding:",
         "FIELD_HEADER_COLOR_DEPTH"      : "Color depth:",
         "FIELD_HEADER_CURSOR"           : "Cursor:",
         "FIELD_HEADER_DEST_HOST"        : "Destination host:",
@@ -422,10 +423,17 @@
         "FIELD_OPTION_CURSOR_LOCAL"  : "Local",
         "FIELD_OPTION_CURSOR_REMOTE" : "Remote",
 
+        "FIELD_OPTION_CLIPBOARD_ENCODING_CP1252"    : "CP1252",
+        "FIELD_OPTION_CLIPBOARD_ENCODING_EMPTY"     : "",
+        "FIELD_OPTION_CLIPBOARD_ENCODING_ISO8859_1" : "ISO 8859-1",
+        "FIELD_OPTION_CLIPBOARD_ENCODING_UTF_8"     : "UTF-8",
+        "FIELD_OPTION_CLIPBOARD_ENCODING_UTF_16"    : "UTF-16",
+
         "NAME" : "VNC",
 
         "SECTION_HEADER_AUDIO"          : "Audio",
         "SECTION_HEADER_AUTHENTICATION" : "Authentication",
+        "SECTION_HEADER_CLIPBOARD"      : "Clipboard",
         "SECTION_HEADER_DISPLAY"        : "Display",
         "SECTION_HEADER_NETWORK"        : "Network",
         "SECTION_HEADER_REPEATER"       : "VNC Repeater",