[X2Go-Commits] [nx-libs] 55/219: NXmiexpose.c: mark NX changes

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit af1c4b9b7b83426f1fde1cfb906b2ee26e947576
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Sat May 25 17:29:17 2019 +0200

    NXmiexpose.c: mark NX changes
---
 nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c b/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c
index 085684fc1..146ecad75 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c
@@ -107,9 +107,6 @@ miWindowExposures(pWin, prgn, other_exposed)
     WindowPtr pWin;
     register RegionPtr prgn, other_exposed;
 {
-
-    int total;
-
     RegionPtr   exposures = prgn;
     if (pWin->backStorage && prgn)
 	/*
@@ -146,15 +143,19 @@ miWindowExposures(pWin, prgn, other_exposed)
 	    exposures = other_exposed;
 	}
 
+#ifdef NXAGENT_SERVER
         /*
          * If the number of rectangles is greater
          * than 4, let the function decide.
          */
 
-        total = RegionNumRects(exposures);
+        int total = RegionNumRects(exposures);
 
         if (clientInterested && exposures && (total > RECTLIMIT ||
                 (total > 4 && nxagentExtentsPredicate(total) == 1)))
+ #else
+        if (clientInterested && exposures && (RegionNumRects(exposures) > RECTLIMIT))
+ #endif
 	{
 	    /*
 	     * If we have LOTS of rectangles, we decide to take the extents

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git