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 6ce9fb5f2875754f97035d3338b3d0e1d20169ae Author: Ulrich Sibiller <uli42@gmx.de> Date: Thu May 30 16:02:53 2019 +0200 Window.c/NXmiexpose.c: remove hack for certain WM theme We do not even know what theme this is and it is probably not relevant nowadays. --- nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c | 15 +-------------- nx-X11/programs/Xserver/hw/nxagent/Window.c | 19 ------------------- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c b/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c index 146ecad75..c4ff88c5d 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c @@ -142,20 +142,7 @@ miWindowExposures(pWin, prgn, other_exposed) } exposures = other_exposed; } - -#ifdef NXAGENT_SERVER - /* - * If the number of rectangles is greater - * than 4, let the function decide. - */ - - int total = RegionNumRects(exposures); - - if (clientInterested && exposures && (total > RECTLIMIT || - (total > 4 && nxagentExtentsPredicate(total) == 1))) - #else - if (clientInterested && exposures && (RegionNumRects(exposures) > RECTLIMIT)) - #endif + if (clientInterested && exposures && (RegionNumRects(exposures) > RECTLIMIT)) { /* * If we have LOTS of rectangles, we decide to take the extents diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c index c5c533934..8307c3de4 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -3484,26 +3484,7 @@ void nxagentSetTopLevelEventMask(WindowPtr pWin) } /* - * This function must return 1 if we want the - * exposures to be sent as the window's extents. - * This is actually a harmless, but useful hack, - * as it speeds up the window redraws considera- - * bly, when using a very popular WM theme. */ - -int nxagentExtentsPredicate(int total) -{ - #ifdef TEST - if (total == 6 || total == 11 || total == 10) - { - fprintf(stderr, "nxagentExtentsPredicate: WARNING! Returning [%d] with [%d] rectangles.\n", - (total == 6 || total == 11 || total == 10), total); - } - #endif - - return (total == 6 || total == 11 || total == 10); -} - void nxagentFlushConfigureWindow(void) { ConfiguredWindowStruct *index; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git