diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-02-26 08:14:28 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-02-26 08:14:28 +0100 |
commit | abd6cf1bdd661f126af2a721cb3f467f3a6db9f7 (patch) | |
tree | aa109d560c5c340aa537c1e59b866be5acd62205 /doc/nx-X11_vs_XOrg69_patches/NXmiexpose.c.NX.patch | |
parent | 2eb85d140fdd582e6bf7086f0bbba08fa58c836c (diff) | |
download | nx-libs-abd6cf1bdd661f126af2a721cb3f467f3a6db9f7.tar.gz nx-libs-abd6cf1bdd661f126af2a721cb3f467f3a6db9f7.tar.bz2 nx-libs-abd6cf1bdd661f126af2a721cb3f467f3a6db9f7.zip |
rename original NX patches, so that we can see the patched file's name in the patch file name.
Diffstat (limited to 'doc/nx-X11_vs_XOrg69_patches/NXmiexpose.c.NX.patch')
-rw-r--r-- | doc/nx-X11_vs_XOrg69_patches/NXmiexpose.c.NX.patch | 116 |
1 files changed, 0 insertions, 116 deletions
diff --git a/doc/nx-X11_vs_XOrg69_patches/NXmiexpose.c.NX.patch b/doc/nx-X11_vs_XOrg69_patches/NXmiexpose.c.NX.patch deleted file mode 100644 index 829a95df4..000000000 --- a/doc/nx-X11_vs_XOrg69_patches/NXmiexpose.c.NX.patch +++ /dev/null @@ -1,116 +0,0 @@ ---- ./nx-X11/programs/Xserver/hw/nxagent/X/NXmiexpose.c.X.original 2015-02-13 14:03:44.744441510 +0100 -+++ ./nx-X11/programs/Xserver/hw/nxagent/X/NXmiexpose.c 2015-02-10 19:13:13.768687235 +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. */ -+/* */ -+/**************************************************************************/ -+ - /* $XdotOrg: xc/programs/Xserver/mi/miexpose.c,v 1.6 2005/07/03 08:53:51 daniels Exp $ */ - /* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.9tsi Exp $ */ - /*********************************************************** -@@ -109,6 +126,12 @@ - the region package can call this. - */ - -+#ifdef NXAGENT_SERVER -+ -+#include "Windows.h" -+ -+#endif -+ - #ifndef RECTLIMIT - #define RECTLIMIT 25 /* pick a number, any number > 8 */ - #endif -@@ -158,6 +181,20 @@ - BoxRec expBox; - Bool extents; - -+#ifdef NXAGENT_SERVER -+ -+ /* -+ * Set the elements reported by the compiler -+ * as uninitialized. -+ */ -+ -+ expBox.x1 = 0; -+ expBox.y1 = 0; -+ expBox.x2 = 0; -+ expBox.y2 = 0; -+ -+#endif -+ - /* This prevents warning about pscr not being used. */ - pGC->pScreen = pscr = pGC->pScreen; - -@@ -498,6 +535,11 @@ - WindowPtr pWin; - register RegionPtr prgn, other_exposed; - { -+#ifdef NXAGENT_SERVER -+ -+ int total; -+ -+#endif - RegionPtr exposures = prgn; - if (pWin->backStorage && prgn) - /* -@@ -533,7 +575,20 @@ - } - exposures = other_exposed; - } -+#ifdef NXAGENT_SERVER -+ -+ /* -+ * If the number of rectangles is greater -+ * than 4, let the function decide. -+ */ -+ -+ total = REGION_NUM_RECTS(exposures); -+ -+ if (clientInterested && exposures && (total > RECTLIMIT || -+ (total > 4 && nxagentExtentsPredicate(total) == 1))) -+#else - if (clientInterested && exposures && (REGION_NUM_RECTS(exposures) > RECTLIMIT)) -+#endif - { - /* - * If we have LOTS of rectangles, we decide to take the extents -@@ -666,6 +721,25 @@ - register xRectangle *prect; - int numRects; - -+#ifdef NXAGENT_SERVER -+ -+ /* -+ * Set the elements reported by the compiler -+ * as uninitialized. -+ */ -+ -+ prgnWin.extents.x1 = 0; -+ prgnWin.extents.y1 = 0; -+ prgnWin.extents.x2 = 0; -+ prgnWin.extents.y2 = 0; -+ -+ prgnWin.data = NULL; -+ -+ oldCorner.x = 0; -+ oldCorner.y = 0; -+ -+#endif -+ - gcmask = 0; - - if (what == PW_BACKGROUND) |