mi: Fold micursor.c into mipointer.c
Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
parent
3b63900e90
commit
86ce626297
|
@ -16,7 +16,6 @@ libmi_la_SOURCES = \
|
||||||
micmap.h \
|
micmap.h \
|
||||||
micoord.h \
|
micoord.h \
|
||||||
micopy.c \
|
micopy.c \
|
||||||
micursor.c \
|
|
||||||
midash.c \
|
midash.c \
|
||||||
midispcur.c \
|
midispcur.c \
|
||||||
mieq.c \
|
mieq.c \
|
||||||
|
|
|
@ -1,68 +0,0 @@
|
||||||
/***********************************************************
|
|
||||||
|
|
||||||
Copyright 1987, 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.
|
|
||||||
|
|
||||||
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
|
|
||||||
|
|
||||||
All Rights Reserved
|
|
||||||
|
|
||||||
Permission to use, copy, modify, and distribute this software and its
|
|
||||||
documentation for any purpose and without fee is hereby granted,
|
|
||||||
provided that the above copyright notice appear in all copies and that
|
|
||||||
both that copyright notice and this permission notice appear in
|
|
||||||
supporting documentation, and that the name of Digital not be
|
|
||||||
used in advertising or publicity pertaining to distribution of the
|
|
||||||
software without specific, written prior permission.
|
|
||||||
|
|
||||||
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
|
|
||||||
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
|
|
||||||
DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
|
|
||||||
ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
|
|
||||||
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
|
|
||||||
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|
||||||
SOFTWARE.
|
|
||||||
|
|
||||||
******************************************************************/
|
|
||||||
#ifdef HAVE_DIX_CONFIG_H
|
|
||||||
#include <dix-config.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "scrnintstr.h"
|
|
||||||
#include "cursor.h"
|
|
||||||
#include "misc.h"
|
|
||||||
#include "mi.h"
|
|
||||||
#include "inputstr.h"
|
|
||||||
|
|
||||||
void
|
|
||||||
miRecolorCursor(DeviceIntPtr pDev, ScreenPtr pScr,
|
|
||||||
CursorPtr pCurs, Bool displayed)
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* This is guaranteed to correct any color-dependent state which may have
|
|
||||||
* been bound up in private state created by RealizeCursor
|
|
||||||
*/
|
|
||||||
pScr->UnrealizeCursor(pDev, pScr, pCurs);
|
|
||||||
pScr->RealizeCursor(pDev, pScr, pCurs);
|
|
||||||
if (displayed)
|
|
||||||
pScr->DisplayCursor(pDev, pScr, pCurs);
|
|
||||||
}
|
|
|
@ -273,6 +273,20 @@ miPointerSetCursorPosition(DeviceIntPtr pDev, ScreenPtr pScreen,
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
miRecolorCursor(DeviceIntPtr pDev, ScreenPtr pScr,
|
||||||
|
CursorPtr pCurs, Bool displayed)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* This is guaranteed to correct any color-dependent state which may have
|
||||||
|
* been bound up in private state created by RealizeCursor
|
||||||
|
*/
|
||||||
|
pScr->UnrealizeCursor(pDev, pScr, pCurs);
|
||||||
|
pScr->RealizeCursor(pDev, pScr, pCurs);
|
||||||
|
if (displayed)
|
||||||
|
pScr->DisplayCursor(pDev, pScr, pCurs);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set up sprite information for the device.
|
* Set up sprite information for the device.
|
||||||
* This function will be called once for each device after it is initialized
|
* This function will be called once for each device after it is initialized
|
||||||
|
|
Loading…
Reference in New Issue
Block a user