Remove unused X11R4 DDX compatibility function miClipNotify.
This commit is contained in:
Adam Jackson
parent
07ecb969d7
commit
39ce5f1544
|
|
@ -1,3 +1,11 @@
|
||||||
|
2006-01-06 Adam Jackson <ajax@freedesktop.org>
|
||||||
|
|
||||||
|
* hw/xfree86/loader/misym.c:
|
||||||
|
* mi/Makefile.am:
|
||||||
|
* mi/mi.h:
|
||||||
|
* mi/miclipn.c:
|
||||||
|
Remove unused X11R4 DDX compatibility function miClipNotify.
|
||||||
|
|
||||||
2006-01-03 Eric Anholt <anholt@FreeBSD.org>
|
2006-01-03 Eric Anholt <anholt@FreeBSD.org>
|
||||||
|
|
||||||
* render/picture.c: (premultiply):
|
* render/picture.c: (premultiply):
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/misym.c,v 1.3 2005/06/26 02:48:36 ajax Exp $ */
|
/* $XdotOrg: xserver/xorg/hw/xfree86/loader/misym.c,v 1.9 2005/10/18 04:02:31 aplattner Exp $ */
|
||||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/misym.c,v 1.38 2003/10/15 16:29:04 dawes Exp $ */
|
/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/misym.c,v 1.38 2003/10/15 16:29:04 dawes Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -193,7 +193,6 @@ LOOKUP miLookupTab[] = {
|
||||||
SYMFUNC(miInitVisuals)
|
SYMFUNC(miInitVisuals)
|
||||||
SYMFUNC(miWindowExposures)
|
SYMFUNC(miWindowExposures)
|
||||||
SYMFUNC(miSegregateChildren)
|
SYMFUNC(miSegregateChildren)
|
||||||
SYMFUNC(miClipNotify)
|
|
||||||
SYMFUNC(miHookInitVisuals)
|
SYMFUNC(miHookInitVisuals)
|
||||||
SYMFUNC(miPointerAbsoluteCursor)
|
SYMFUNC(miPointerAbsoluteCursor)
|
||||||
SYMFUNC(miPointerGetMotionEvents)
|
SYMFUNC(miPointerGetMotionEvents)
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,6 @@ libminimi_la_SOURCES = \
|
||||||
mibstore.c \
|
mibstore.c \
|
||||||
mibstore.h \
|
mibstore.h \
|
||||||
mibstorest.h \
|
mibstorest.h \
|
||||||
miclipn.c \
|
|
||||||
micmap.c \
|
micmap.c \
|
||||||
micmap.h \
|
micmap.h \
|
||||||
micoord.h \
|
micoord.h \
|
||||||
|
|
|
||||||
10
mi/mi.h
10
mi/mi.h
|
|
@ -136,16 +136,6 @@ extern void miPutImage(
|
||||||
char * /*pImage*/
|
char * /*pImage*/
|
||||||
);
|
);
|
||||||
|
|
||||||
/* miclipn.c */
|
|
||||||
|
|
||||||
extern void miClipNotify(
|
|
||||||
void (* /*func*/)(
|
|
||||||
WindowPtr /* pWin */,
|
|
||||||
int /* dx */,
|
|
||||||
int /* dy */
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
/* micursor.c */
|
/* micursor.c */
|
||||||
|
|
||||||
extern void miRecolorCursor(
|
extern void miRecolorCursor(
|
||||||
|
|
|
||||||
84
mi/miclipn.c
84
mi/miclipn.c
|
|
@ -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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue