From d455f8ab933a0585595666630ae466c1d98c0493 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Tue, 3 Jul 2018 14:18:53 +0200
Subject: [PATCH] X11 paste : proper charset conversion

Signed-off-by: Thomas Bernard <miniupnp@free.fr>
---
 src/readline.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 56 insertions(+), 3 deletions(-)

diff --git a/src/readline.c b/src/readline.c
index 719c1e1f..2d034357 100644
--- a/src/readline.c
+++ b/src/readline.c
@@ -428,10 +428,63 @@ bye:
     }
     if (X11_clipboard != NULL)
     {
-      char * tmp = X11_clipboard;
+      char * utf8_str = X11_clipboard;
       X11_clipboard = NULL;
-      // TODO : UTF8 -> UTF16 conversion
-      return tmp;
+      // UTF8 -> UTF16 and UTF8 -> ANSI conversions
+#if defined(ENABLE_FILENAMES_ICONV)
+      if (unicode != NULL)
+      {
+        char * input = utf8_str;
+        size_t inbytesleft = strlen(utf8_str);
+        char * output;
+        size_t outbytesleft;
+        size_t r;
+        *unicode = (word *)malloc(2 * inbytesleft + 2);
+        if (*unicode != NULL)
+        {
+          output = (char *)*unicode;
+          outbytesleft = 2 * inbytesleft;
+          r = iconv(cd_utf16, &input, &inbytesleft, &output, &outbytesleft);
+          if (r != (size_t)-1)
+          {
+            output[1] = output[0] = '\0';
+          }
+          else
+          {
+            Warning("Unicode conversion of clipboard text failed");
+            free(*unicode);
+            *unicode = NULL;
+          }
+        }
+      }
+      {
+        char * ansi_str;
+        char * input = utf8_str;
+        size_t inbytesleft = strlen(utf8_str);
+        char * output;
+        size_t outbytesleft;
+        size_t r;
+        ansi_str = (char *)malloc(inbytesleft + 1);
+        if (ansi_str != NULL)
+        {
+          output = ansi_str;
+          outbytesleft = inbytesleft;
+          r = iconv(cd, &input, &inbytesleft, &output, &outbytesleft);
+          if (r != (size_t)-1)
+          {
+            *output = '\0';
+            free(utf8_str);
+            return ansi_str;
+          }
+          else
+          {
+            Warning("ANSI conversion of clipboard text failed");
+            free(ansi_str);
+          }
+        }
+      }
+#endif
+      return utf8_str;
     }
   }
   return NULL;