diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-01-16 22:29:05 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-01-16 22:29:05 +0100 |
| commit | e9241fe8c730aa7f0b95b15b34ed5c2bda18b5ad (patch) | |
| tree | 2dabac3d6b000def9e33cf30137da4507c19951d /debian/patches/106_nxagent_utf8-copy-clipboard.full.patch | |
| parent | d7ecf7214f0df5cd7957264be5249f4cd39f4e6e (diff) | |
| download | nx-libs-e9241fe8c730aa7f0b95b15b34ed5c2bda18b5ad.tar.gz nx-libs-e9241fe8c730aa7f0b95b15b34ed5c2bda18b5ad.tar.bz2 nx-libs-e9241fe8c730aa7f0b95b15b34ed5c2bda18b5ad.zip | |
Reorganize patch names, to reflect patch inclusion into lite+full or full-only ,,NX (redistributed)'' tarball.
Diffstat (limited to 'debian/patches/106_nxagent_utf8-copy-clipboard.full.patch')
| -rw-r--r-- | debian/patches/106_nxagent_utf8-copy-clipboard.full.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/debian/patches/106_nxagent_utf8-copy-clipboard.full.patch b/debian/patches/106_nxagent_utf8-copy-clipboard.full.patch new file mode 100644 index 000000000..9c0a047d6 --- /dev/null +++ b/debian/patches/106_nxagent_utf8-copy-clipboard.full.patch @@ -0,0 +1,52 @@ +Description: UTF-8 Clipboard copying + Enable UTF-8 clipboard copies. + . + Originally contributed by FreeNX Team (dimbor). +Forwarded: not-yet +Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Last-Update: 2011-12-31 +--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +@@ -166,7 +166,9 @@ + + if (target == XA_STRING) return True; + if (target == serverTEXT) return True; +- ++ /* by dimbor */ ++ if (target == serverUTF8_STRING) return True; ++ + return False; + } + +@@ -402,7 +404,12 @@ + lastServerProperty = X->xselectionrequest.property; + lastServerRequestor = X->xselectionrequest.requestor; + lastServerTarget = X->xselectionrequest.target; +- lastServerTime = X->xselectionrequest.time; ++ ++ /* by dimbor */ ++ if (lastServerTarget != XA_STRING) ++ lastServerTarget = serverUTF8_STRING; ++ ++ lastServerTime = X->xselectionrequest.time; + + x.u.u.type = SelectionRequest; + x.u.selectionRequest.time = GetTimeInMillis(); +@@ -424,11 +431,12 @@ + + x.u.selectionRequest.selection = CurrentSelections[i].selection; + +- /* +- * x.u.selectionRequest.target = X->xselectionrequest.target; +- */ +- +- x.u.selectionRequest.target = XA_STRING; ++ /* 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.property = clientCutProperty; + + (void) TryClientEvents(lastSelectionOwner[i].client, &x, 1, |