From abd6cf1bdd661f126af2a721cb3f467f3a6db9f7 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 26 Feb 2016 08:14:28 +0100 Subject: rename original NX patches, so that we can see the patched file's name in the patch file name. --- doc/nx-X11_vs_XOrg69_patches/NXmitrap.c.NX.patch | 65 ------------------------ 1 file changed, 65 deletions(-) delete mode 100644 doc/nx-X11_vs_XOrg69_patches/NXmitrap.c.NX.patch (limited to 'doc/nx-X11_vs_XOrg69_patches/NXmitrap.c.NX.patch') diff --git a/doc/nx-X11_vs_XOrg69_patches/NXmitrap.c.NX.patch b/doc/nx-X11_vs_XOrg69_patches/NXmitrap.c.NX.patch deleted file mode 100644 index 220b26a49..000000000 --- a/doc/nx-X11_vs_XOrg69_patches/NXmitrap.c.NX.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- ./nx-X11/programs/Xserver/hw/nxagent/X/NXmitrap.c.X.original 2015-02-13 14:03:44.744441510 +0100 -+++ ./nx-X11/programs/Xserver/hw/nxagent/X/NXmitrap.c 2015-02-10 19:13:13.820685287 +0100 -@@ -1,3 +1,20 @@ -+/**************************************************************************/ -+/* */ -+/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ -+/* */ -+/* NXAGENT, NX protocol compression and NX extensions to this software */ -+/* are copyright of NoMachine. Redistribution and use of the present */ -+/* software is allowed according to terms specified in the file LICENSE */ -+/* which comes in the source distribution. */ -+/* */ -+/* Check http://www.nomachine.com/licensing.html for applicability. */ -+/* */ -+/* NX and NoMachine are trademarks of Medialogic S.p.A. */ -+/* */ -+/* All rights reserved. */ -+/* */ -+/**************************************************************************/ -+ - /* - * $XFree86: xc/programs/Xserver/render/mitrap.c,v 1.8 2002/09/03 19:28:28 keithp Exp $ - * -@@ -35,6 +52,12 @@ - #include "picturestr.h" - #include "mipict.h" - -+#ifdef NXAGENT_SERVER -+ -+#include "Render.h" -+ -+#endif -+ - PicturePtr - miCreateAlphaPicture (ScreenPtr pScreen, - PicturePtr pDst, -@@ -159,7 +182,27 @@ - xDst = traps[0].left.p1.x >> 16; - yDst = traps[0].left.p1.y >> 16; - -- miTrapezoidBounds (ntrap, traps, &bounds); -+ #ifdef NXAGENT_SERVER -+ -+ if (nxagentTrapezoidExtents != NullBox) -+ { -+ memcpy(&bounds, nxagentTrapezoidExtents, sizeof(BoxRec)); -+ } -+ else -+ { -+ nxagentTrapezoidExtents = (BoxPtr) xalloc(sizeof(BoxRec)); -+ -+ miTrapezoidBounds (ntrap, traps, &bounds); -+ -+ memcpy(nxagentTrapezoidExtents, &bounds, sizeof(BoxRec)); -+ } -+ -+ #else -+ -+ miTrapezoidBounds (ntrap, traps, &bounds); -+ -+ #endif -+ - if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2) - return; - pPicture = miCreateAlphaPicture (pScreen, pDst, maskFormat, -- cgit v1.2.3