aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch47
-rw-r--r--debian/patches/series1
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Clipboard.c7
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Image.c7
4 files changed, 11 insertions, 51 deletions
diff --git a/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch b/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch
deleted file mode 100644
index 129cb707e..000000000
--- a/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Description: Prevent sending COMPOUND_TEXT
- Do not send COMPOUND_TEXT to client.
- .
- 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
-@@ -1226,10 +1226,11 @@
- Atom xa_STRING[4];
- xEvent x;
-
-+ /* --- Order changed by dimbor (prevent sending COMPOUND_TEXT to client --- */
- xa_STRING[0] = XA_STRING;
-- xa_STRING[1] = clientTEXT;
-- xa_STRING[2] = clientCOMPOUND_TEXT;
-- xa_STRING[3] = clientUTF8_STRING;
-+ xa_STRING[1] = clientUTF8_STRING;
-+ xa_STRING[2] = clientTEXT;
-+ xa_STRING[3] = clientCOMPOUND_TEXT;
-
- ChangeWindowProperty(pWin,
- property,
---- a/nx-X11/programs/Xserver/hw/nxagent/Image.c
-+++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c
-@@ -644,6 +644,10 @@
- pDrawable -> depth != 1 &&
- nxagentOption(DeferLevel) >= 1)
- {
-+ /* -- changed by dimbor (small "bed-sheets" never need be prevented - always put) --*/
-+ if (dstHeight > 16)
-+ {
-+ /* -------------------------------------------------------------------------------- */
- #ifdef TEST
- fprintf(stderr, "nxagentPutImage: WARNING! Prevented operation on region [%d,%d,%d,%d] "
- "for drawable at [%p] with drawable pixmap.\n", pRegion -> extents.x1,
-@@ -654,6 +658,9 @@
- nxagentMarkCorruptedRegion(pDrawable, pRegion);
-
- goto nxagentPutImageEnd;
-+ /* --- changed by dimbor ---*/
-+ }
-+ /* ------------------------- */
- }
-
- if (pDrawable -> type == DRAWABLE_WINDOW &&
diff --git a/debian/patches/series b/debian/patches/series
index c0c34264a..7f8abfcba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch
108_nxagent_wine-close-delay.full.patch
110_nxagent_createpixmap-bounds-check.full.patch
200_nxagent_check-binary-x2go-flavour.full.patch
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index d17f154cd..2e409e41c 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -1226,10 +1226,11 @@ int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection,
Atom xa_STRING[4];
xEvent x;
+ /* --- Order changed by dimbor (prevent sending COMPOUND_TEXT to client --- */
xa_STRING[0] = XA_STRING;
- xa_STRING[1] = clientTEXT;
- xa_STRING[2] = clientCOMPOUND_TEXT;
- xa_STRING[3] = clientUTF8_STRING;
+ xa_STRING[1] = clientUTF8_STRING;
+ xa_STRING[2] = clientTEXT;
+ xa_STRING[3] = clientCOMPOUND_TEXT;
ChangeWindowProperty(pWin,
property,
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c
index e499b7a11..1f0b735b0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Image.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c
@@ -644,6 +644,10 @@ FIXME: Should use these.
pDrawable -> depth != 1 &&
nxagentOption(DeferLevel) >= 1)
{
+ /* -- changed by dimbor (small "bed-sheets" never need be prevented - always put) --*/
+ if (dstHeight > 16)
+ {
+ /* -------------------------------------------------------------------------------- */
#ifdef TEST
fprintf(stderr, "nxagentPutImage: WARNING! Prevented operation on region [%d,%d,%d,%d] "
"for drawable at [%p] with drawable pixmap.\n", pRegion -> extents.x1,
@@ -654,6 +658,9 @@ FIXME: Should use these.
nxagentMarkCorruptedRegion(pDrawable, pRegion);
goto nxagentPutImageEnd;
+ /* --- changed by dimbor ---*/
+ }
+ /* ------------------------- */
}
if (pDrawable -> type == DRAWABLE_WINDOW &&