[X2Go-Commits] [nx-libs] 293/429: nxagent: drop NXAGENT_SHAPE define

[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 666c4d16aea1f35a50595ef81ab8bb94b23b1097
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Tue Feb 9 19:38:08 2021 +0100

    nxagent: drop NXAGENT_SHAPE define
    
    was never used in the past years, we were always compiling with
    -DNXAGENT_SHAPE2
---
 nx-X11/programs/Xserver/hw/nxagent/Imakefile |  1 -
 nx-X11/programs/Xserver/hw/nxagent/Window.c  | 20 +++++---------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
index 94ae5b2ff..f62ff9185 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile
+++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
@@ -192,7 +192,6 @@ INCLUDES = \
 
 ### list of existing NXAGENT macros:
 #
-# NXAGENT_SHAPE                    Old shape code
 # NXAGENT_SHAPE2                   New shape code
 # NXAGENT_FIXKEYS                  Force the release of pressed key when losing focus
 # NXAGENT_CLIPBOARD                Enables clipboard cut and paste function between X servers.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index 00439d2e0..0e26a322c 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -2079,13 +2079,11 @@ void nxagentClipNotify(WindowPtr pWin, int dx, int dy)
   nxagentAddConfiguredWindow(pWin, CWStackMode);
   nxagentAddConfiguredWindow(pWin, CW_Shape);
 
-  #ifndef NXAGENT_SHAPE
-    #ifdef SHAPE
-    /*
-     * nxagentShapeWindow(pWin);
-     */
-    #endif /* SHAPE */
-  #endif /* NXAGENT_SHAPE */
+  #ifdef SHAPE
+  /*
+   * nxagentShapeWindow(pWin);
+   */
+  #endif /* SHAPE */
 }
 
 /*
@@ -2378,10 +2376,8 @@ void nxagentShapeWindow(WindowPtr pWin)
         XUnionRectWithRegion(&rect, reg, reg);
       }
 
-      #ifndef NXAGENT_SHAPE
       XShapeCombineRegion(nxagentDisplay, nxagentWindow(pWin),
                               ShapeBounding, 0, 0, reg, ShapeSet);
-      #endif
 
       XDestroyRegion(reg);
     }
@@ -2393,10 +2389,8 @@ void nxagentShapeWindow(WindowPtr pWin)
 
       RegionEmpty(nxagentWindowPriv(pWin)->boundingShape);
 
-      #ifndef NXAGENT_SHAPE
       XShapeCombineMask(nxagentDisplay, nxagentWindow(pWin),
                             ShapeBounding, 0, 0, None, ShapeSet);
-      #endif
     }
   }
 
@@ -2437,10 +2431,8 @@ void nxagentShapeWindow(WindowPtr pWin)
         XUnionRectWithRegion(&rect, reg, reg);
       }
 
-      #ifndef NXAGENT_SHAPE
       XShapeCombineRegion(nxagentDisplay, nxagentWindow(pWin),
                               ShapeClip, 0, 0, reg, ShapeSet);
-      #endif
 
       XDestroyRegion(reg);
     }
@@ -2452,10 +2444,8 @@ void nxagentShapeWindow(WindowPtr pWin)
 
       RegionEmpty(nxagentWindowPriv(pWin)->clipShape);
 
-      #ifndef NXAGENT_SHAPE
       XShapeCombineMask(nxagentDisplay, nxagentWindow(pWin),
                             ShapeClip, 0, 0, None, ShapeSet);
-      #endif
     }
   }
 }

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