diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2011-12-29 09:57:30 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2011-12-29 09:57:30 +0100 |
| commit | 89fea92798d1823bea3991889be4c938043a72ef (patch) | |
| tree | 201d0b7a5eb63555657914437219d68c356d62c6 /debian/patches/106_nxagent_utf8-copy-clipboard.patch | |
| parent | dd287a5c8e01cbdab17c94016cf74f9c92205e13 (diff) | |
| download | nx-libs-89fea92798d1823bea3991889be4c938043a72ef.tar.gz nx-libs-89fea92798d1823bea3991889be4c938043a72ef.tar.bz2 nx-libs-89fea92798d1823bea3991889be4c938043a72ef.zip | |
Add FreeNX patches for nxagent (some with other names compared to FreeNX):
- 101_nxagent_set-rgb-path.patch
- 102_xserver-xext_set-securitypolicy-path.patch
- 103_nxagent_set-X0-config-path.patch
- 104_nxagent_enable_debug.patch
- 105_nxagent_export-remote-keyboard-config.patch
- 106_nxagent_utf8-copy-clipboard.patch
- 107_nxagent_clipboard-compound-text+small-bed-sheets.patch
- 108_nxagent_wine-close-delay.patch
- 109_nxagent_locale-utf8-compound-text.patch
- 200_nxagent_unbrand-agent.patch
Diffstat (limited to 'debian/patches/106_nxagent_utf8-copy-clipboard.patch')
| -rw-r--r-- | debian/patches/106_nxagent_utf8-copy-clipboard.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/debian/patches/106_nxagent_utf8-copy-clipboard.patch b/debian/patches/106_nxagent_utf8-copy-clipboard.patch new file mode 100644 index 000000000..08b0c1039 --- /dev/null +++ b/debian/patches/106_nxagent_utf8-copy-clipboard.patch @@ -0,0 +1,45 @@ +--- a/nxagent/programs/Xserver/hw/nxagent/Clipboard.c ++++ b/nxagent/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, |