UTF-8 Clipboard copying (106_nxagent_utf8-copy-clipboard.full.patch).

  Enable UTF-8 clipboard copies.

  Originally contributed by FreeNX Team (dimbor).

1 files changed, 12 insertions, 4 deletions

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index 2742e147f..d17f154cd 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -166,6 +166,8 @@ Bool nxagentValidServerTargets(Atom target)
 
   if (target == XA_STRING) return True;
   if (target == serverTEXT) return True;
+  /* by dimbor */
+  if (target == serverUTF8_STRING) return True;
 
   return False;
 }
@@ -402,6 +404,11 @@ FIXME: Do we need this?
         lastServerProperty = X->xselectionrequest.property;
         lastServerRequestor = X->xselectionrequest.requestor;
         lastServerTarget = X->xselectionrequest.target;
+
+        /* by dimbor */
+        if (lastServerTarget != XA_STRING)
+            lastServerTarget = serverUTF8_STRING;
+
         lastServerTime = X->xselectionrequest.time;
 
         x.u.u.type = SelectionRequest;
@@ -424,11 +431,12 @@ FIXME: Do we need this?
 
         x.u.selectionRequest.selection = CurrentSelections[i].selection;
 
-        /*
-         * x.u.selectionRequest.target = X->xselectionrequest.target;
-         */
+        /* by dimbor (idea from zahvatov) */
+        if (X->xselectionrequest.target != XA_STRING)
+          x.u.selectionRequest.target = clientUTF8_STRING;
+        else
+          x.u.selectionRequest.target = XA_STRING;
 
-        x.u.selectionRequest.target = XA_STRING;
         x.u.selectionRequest.property = clientCutProperty;
 
         (void) TryClientEvents(lastSelectionOwner[i].client, &x, 1,