hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-08 23:12:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mpx

Browse source 
Conflicts:

	Xi/extinit.c
	Xi/grabdev.c
	Xi/setmode.c
	Xi/ungrdev.c
	dix/devices.c
	dix/events.c
	dix/getevents.c
	include/dix.h
	mi/midispcur.c
	mi/misprite.c
	xkb/xkbActions.c
	xkb/xkbEvents.c
	xkb/xkbPrKeyEv.c
This commit is contained in:
Peter Hutterer 2007-11-07 15:37:23 +10:30
commit 0b729051c0
626 changed files with 18270 additions and 195262 deletions
Download patch file Download diff file Expand all files Collapse all files

59
mi/misprite.c
View file

@ -106,9 +106,6 @@ static void miSpriteInstallColormap(ColormapPtr pMap);
static void miSpriteStoreColors(ColormapPtr pMap, int ndef,
xColorItem *pdef);
static void miSpriteSaveDoomedAreas(WindowPtr pWin,
RegionPtr pObscured, int dx,
int dy);
static void miSpriteComputeSaved(DeviceIntPtr pDev,
ScreenPtr pScreen);
@ -241,8 +238,6 @@ miSpriteInitialize (pScreen, cursorFuncs, screenFuncs)
pScreenPriv->CopyWindow = pScreen->CopyWindow;
pScreenPriv->SaveDoomedAreas = pScreen->SaveDoomedAreas;
pScreenPriv->InstallColormap = pScreen->InstallColormap;
pScreenPriv->StoreColors = pScreen->StoreColors;
@ -268,9 +263,6 @@ miSpriteInitialize (pScreen, cursorFuncs, screenFuncs)
pScreen->SourceValidate = miSpriteSourceValidate;
pScreen->CopyWindow = miSpriteCopyWindow;
pScreen->SaveDoomedAreas = miSpriteSaveDoomedAreas;
pScreen->InstallColormap = miSpriteInstallColormap;
pScreen->StoreColors = miSpriteStoreColors;
@ -309,7 +301,6 @@ miSpriteCloseScreen (i, pScreen)
pScreen->InstallColormap = pScreenPriv->InstallColormap;
pScreen->StoreColors = pScreenPriv->StoreColors;
pScreen->SaveDoomedAreas = pScreenPriv->SaveDoomedAreas;
DamageDestroy (pScreenPriv->pDamage);
xfree ((pointer) pScreenPriv);
@ -693,56 +684,6 @@ miSpriteFindColors (miCursorInfoPtr pDevCursor, ScreenPtr pScreen)
}
/*
* BackingStore wrappers
*/
static void
miSpriteSaveDoomedAreas (pWin, pObscured, dx, dy)
WindowPtr pWin;
RegionPtr pObscured;
int dx, dy;
{
ScreenPtr pScreen;
miSpriteScreenPtr pScreenPriv;
BoxRec cursorBox;
DeviceIntPtr pDev = inputInfo.pointer;
miCursorInfoPtr pCursorInfo;
pScreen = pWin->drawable.pScreen;
SCREEN_PROLOGUE (pScreen, SaveDoomedAreas);
pScreenPriv = (miSpriteScreenPtr) pScreen->devPrivates[miSpriteScreenIndex].ptr;
for (pDev = inputInfo.devices; pDev; pDev = pDev->next)
{
if(DevHasCursor(pDev))
{
pCursorInfo = MISPRITE(pDev);
if (pCursorInfo->isUp && pCursorInfo->pScreen == pScreen)
{
cursorBox = pCursorInfo->saved;
if (dx || dy)
{
cursorBox.x1 += dx;
cursorBox.y1 += dy;
cursorBox.x2 += dx;
cursorBox.y2 += dy;
}
if (RECT_IN_REGION( pScreen, pObscured, &cursorBox) != rgnOUT)
miSpriteRemoveCursor (pDev, pScreen);
}
}
}
(*pScreen->SaveDoomedAreas) (pWin, pObscured, dx, dy);
SCREEN_EPILOGUE (pScreen, SaveDoomedAreas);
}
/*
* miPointer interface routines
*/