[X2Go-Commits] [nx-libs] 17/30: Remove unused X11R4 DDX compatibility function miClipNotify.

git-admin at x2go.org git-admin at x2go.org
Tue Feb 27 09:51:50 CET 2018


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 78724c4868312044698005325025221e11d7159a
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Feb 27 03:02:00 2018 +0100

    Remove unused X11R4 DDX compatibility function miClipNotify.
    
    Backported from X.org:
    
    commit 39ce5f1544029412f4060f3e89ce1d87222ef42b
    Author: Adam Jackson <ajax at nwnk.net>
    Date:   Fri Jan 6 17:05:26 2006 +0000
    
        Remove unused X11R4 DDX compatibility function miClipNotify.
    
    Backported-to-NX-by: Mihai Moldovan <ionic at ionic.de>
---
 nx-X11/programs/Xserver/mi/Imakefile |  2 -
 nx-X11/programs/Xserver/mi/miclipn.c | 82 ------------------------------------
 2 files changed, 84 deletions(-)

diff --git a/nx-X11/programs/Xserver/mi/Imakefile b/nx-X11/programs/Xserver/mi/Imakefile
index 15e897e..9124ace 100644
--- a/nx-X11/programs/Xserver/mi/Imakefile
+++ b/nx-X11/programs/Xserver/mi/Imakefile
@@ -80,7 +80,6 @@ SRCS =  $(CBRT_SRC)             \
         misprite.c              \
         midispcur.c             \
         miscrinit.c             \
-        miclipn.c               \
         migc.c                  \
         micmap.c                \
         mioverlay.c             \
@@ -119,7 +118,6 @@ OBJS =  $(CBRT_OBJ)             \
         misprite.o              \
         midispcur.o             \
         miscrinit.o             \
-        miclipn.o               \
         migc.o                  \
         micmap.o                \
         mioverlay.o             \
diff --git a/nx-X11/programs/Xserver/mi/miclipn.c b/nx-X11/programs/Xserver/mi/miclipn.c
deleted file mode 100644
index 8bc7c3f..0000000
--- a/nx-X11/programs/Xserver/mi/miclipn.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-
-Copyright 1990, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include <nx-X11/X.h>
-#include "windowstr.h"
-#include "scrnintstr.h"
-#include "mi.h"
-
-static void	(*clipNotify)(WindowPtr,int,int) = 0;
-static void	(*ClipNotifies[MAXSCREENS])(WindowPtr,int,int);
-
-static void
-miClipNotifyWrapper(
-    WindowPtr pWin,
-    int dx, 
-    int dy )
-{
-    if (clipNotify)
-	(*clipNotify)(pWin, dx, dy);
-    if (ClipNotifies[pWin->drawable.pScreen->myNum])
-	(*ClipNotifies[pWin->drawable.pScreen->myNum])(pWin, dx, dy);
-}
-
-/*
- * miClipNotify --
- *	Hook to let DDX request notification when the clipList of
- *	a window is recomputed on any screen.  For R4 compatibility;
- *	better if you wrap the ClipNotify screen proc yourself.
- */
-
-static unsigned long clipGeneration = 0;
-
-void
-miClipNotify (
-    void (*func)(
-        WindowPtr /* pWin */,
-        int /* dx */,
-        int /* dy */
-		) )
-{
-    int i;
-
-    clipNotify = func;
-    if (clipGeneration != serverGeneration)
-    {
-	clipGeneration = serverGeneration;
-	for (i = 0; i < screenInfo.numScreens; i++)
-	{
-	    ClipNotifies[i] = screenInfo.screens[i]->ClipNotify;
-	    screenInfo.screens[i]->ClipNotify = miClipNotifyWrapper;
-	}
-    }
-}

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


More information about the x2go-commits mailing list