commit 5fbbe10b6c180ae8c0545695db6ad308cb5caea7
author Pierre Ossman <ossman@cendio.se> Fri May 10 11:44:19 2019 +0200
committer Pierre Ossman <ossman@cendio.se> Mon Jul 01 11:18:27 2019 +0200
tree db83c70816ef00328e0da860a5b40522ce6435ae
parent 615d16bd5ba11e89262cc5cfe94a35b6d6e7a628

Use UTF-8 in clipboard API

In prepartion for better clipboard extensions that can send Unicode
data between the client and server.

vncviewer/Viewport.cxx

diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx
index 713d364..cd61327 100644
--- a/vncviewer/Viewport.cxx
+++ b/vncviewer/Viewport.cxx
@@ -310,14 +310,12 @@
 
 void Viewport::handleClipboardData(const char* data)
 {
-  char* buffer;
   size_t len;
 
   if (!hasFocus())
     return;
 
-  buffer = latin1ToUTF8(data);
-  len = strlen(buffer);
+  len = strlen(data);
 
   vlog.debug("Got clipboard data (%d bytes)", (int)len);
 
@@ -325,11 +323,9 @@
   // dump the data into both variants.
 #if !defined(WIN32) && !defined(__APPLE__)
   if (setPrimary)
-    Fl::copy(buffer, len, 0);
+    Fl::copy(data, len, 0);
 #endif
-  Fl::copy(buffer, len, 1);
-
-  strFree(buffer);
+  Fl::copy(data, len, 1);
 }
 
 void Viewport::setLEDState(unsigned int state)
@@ -561,15 +557,13 @@
 
 int Viewport::handle(int event)
 {
-  char *buffer, *filtered;
+  char *filtered;
   int buttonMask, wheelMask;
   DownMap::const_iterator iter;
 
   switch (event) {
   case FL_PASTE:
-    buffer = utf8ToLatin1(Fl::event_text(), Fl::event_length());
-    filtered = convertLF(buffer);
-    strFree(buffer);
+    filtered = convertLF(Fl::event_text(), Fl::event_length());
 
     vlog.debug("Sending clipboard data (%d bytes)", (int)strlen(filtered));