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/107_nxagent_clipboard-compound-text+small-bed-sheets.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/107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch')
| -rw-r--r-- | debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch | 47 |
1 files changed, 47 insertions, 0 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 new file mode 100644 index 000000000..129cb707e --- /dev/null +++ b/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch @@ -0,0 +1,47 @@ +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 && |