summaryrefslogtreecommitdiff
path: root/mi
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-01-06 17:05:26 +0000
committerAdam Jackson <ajax@nwnk.net>2006-01-06 17:05:26 +0000
commit39ce5f1544029412f4060f3e89ce1d87222ef42b (patch)
treea905dcfe79bed04ff9a92e84ab0d9c180f90447d /mi
parent07ecb969d7eb8d4ab0bb0b8a55a5f40f3c8ec5e3 (diff)
Remove unused X11R4 DDX compatibility function miClipNotify.
Diffstat (limited to 'mi')
-rw-r--r--mi/Makefile.am1
-rw-r--r--mi/mi.h10
-rw-r--r--mi/miclipn.c84
3 files changed, 0 insertions, 95 deletions
diff --git a/mi/Makefile.am b/mi/Makefile.am
index 5d614bf7d..9e2474627 100644
--- a/mi/Makefile.am
+++ b/mi/Makefile.am
@@ -17,7 +17,6 @@ libminimi_la_SOURCES = \
mibstore.c \
mibstore.h \
mibstorest.h \
- miclipn.c \
micmap.c \
micmap.h \
micoord.h \
diff --git a/mi/mi.h b/mi/mi.h
index 3c85693dc..1f3c5f6ee 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -136,16 +136,6 @@ extern void miPutImage(
char * /*pImage*/
);
-/* miclipn.c */
-
-extern void miClipNotify(
- void (* /*func*/)(
- WindowPtr /* pWin */,
- int /* dx */,
- int /* dy */
- )
-);
-
/* micursor.c */
extern void miRecolorCursor(
diff --git a/mi/miclipn.c b/mi/miclipn.c
deleted file mode 100644
index 14ff0d69a..000000000
--- a/mi/miclipn.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* $Xorg: miclipn.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */
-/*
-
-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.
-
-*/
-/* $XFree86: xc/programs/Xserver/mi/miclipn.c,v 1.3 2001/08/06 21:46:04 dawes Exp $ */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include <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;
- }
- }
-}