a1308417c0
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2335 6952d904-891a-0410-993b-d76249ca496b
45 lines
1.9 KiB
Diff
45 lines
1.9 KiB
Diff
Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Clipboard.c
|
|
===================================================================
|
|
--- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Clipboard.c 2010-03-18 17:51:26.552437837 -0300
|
|
+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Clipboard.c 2010-03-18 17:51:28.412436733 -0300
|
|
@@ -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,
|
|
Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Image.c
|
|
===================================================================
|
|
--- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Image.c 2008-06-09 08:08:16.000000000 -0300
|
|
+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Image.c 2010-03-18 17:51:28.412436733 -0300
|
|
@@ -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 &&
|