frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mi: remove trailing whitespaces from misprite.c

This commit is contained in:
Peter Hutterer 2008-06-17 10:43:36 +09:30
parent 79dd600942
commit 4f3ed54dc9
1 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
mi/misprite.c
View File

@ -50,7 +50,7 @@ in this Software without prior written authorization from The Open Group.
# include "mispritest.h" # include "mispritest.h"
# include "dixfontstr.h" # include "dixfontstr.h"
# include <X11/fonts/fontstruct.h> # include <X11/fonts/fontstruct.h>
# include "inputstr.h" # include "inputstr.h"
#ifdef RENDER #ifdef RENDER
# include "mipict.h" # include "mipict.h"
@ -99,12 +99,12 @@ static void miSpriteInstallColormap(ColormapPtr pMap);
static void miSpriteStoreColors(ColormapPtr pMap, int ndef, static void miSpriteStoreColors(ColormapPtr pMap, int ndef,
xColorItem *pdef); xColorItem *pdef);
static void miSpriteComputeSaved(DeviceIntPtr pDev, static void miSpriteComputeSaved(DeviceIntPtr pDev,
ScreenPtr pScreen); ScreenPtr pScreen);
static Bool miSpriteDeviceCursorInitialize(DeviceIntPtr pDev, static Bool miSpriteDeviceCursorInitialize(DeviceIntPtr pDev,
ScreenPtr pScreen); ScreenPtr pScreen);
static void miSpriteDeviceCursorCleanup(DeviceIntPtr pDev, static void miSpriteDeviceCursorCleanup(DeviceIntPtr pDev,
ScreenPtr pScreen); ScreenPtr pScreen);
#define SCREEN_PROLOGUE(pScreen, field) ((pScreen)->field = \ #define SCREEN_PROLOGUE(pScreen, field) ((pScreen)->field = \
@ -118,12 +118,12 @@ static void miSpriteDeviceCursorCleanup(DeviceIntPtr pDev,
*/ */
static Bool miSpriteRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, static Bool miSpriteRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
CursorPtr pCursor); CursorPtr pCursor);
static Bool miSpriteUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, static Bool miSpriteUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
CursorPtr pCursor); CursorPtr pCursor);
static void miSpriteSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, static void miSpriteSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
CursorPtr pCursor, int x, int y); CursorPtr pCursor, int x, int y);
static void miSpriteMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, static void miSpriteMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
int x, int y); int x, int y);
_X_EXPORT miPointerSpriteFuncRec miSpritePointerFuncs = { _X_EXPORT miPointerSpriteFuncRec miSpritePointerFuncs = {
@ -139,8 +139,8 @@ _X_EXPORT miPointerSpriteFuncRec miSpritePointerFuncs = {
* other misc functions * other misc functions
*/ */
static void miSpriteRemoveCursor(DeviceIntPtr pDev, static void miSpriteRemoveCursor(DeviceIntPtr pDev,
ScreenPtr pScreen); ScreenPtr pScreen);
static void miSpriteSaveUnderCursor(DeviceIntPtr pDev, static void miSpriteSaveUnderCursor(DeviceIntPtr pDev,
ScreenPtr pScreen); ScreenPtr pScreen);
static void miSpriteRestoreCursor(DeviceIntPtr pDev, static void miSpriteRestoreCursor(DeviceIntPtr pDev,
@ -153,7 +153,7 @@ miSpriteReportDamage (DamagePtr pDamage, RegionPtr pRegion, void *closure)
miSpriteScreenPtr pScreenPriv; miSpriteScreenPtr pScreenPriv;
miCursorInfoPtr pCursorInfo; miCursorInfoPtr pCursorInfo;
DeviceIntPtr pDev; DeviceIntPtr pDev;
pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates, pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
miSpriteScreenKey); miSpriteScreenKey);
@ -164,9 +164,9 @@ miSpriteReportDamage (DamagePtr pDamage, RegionPtr pRegion, void *closure)
pCursorInfo = MISPRITE(pDev); pCursorInfo = MISPRITE(pDev);
if (pCursorInfo->isUp && if (pCursorInfo->isUp &&
pCursorInfo->pScreen == pScreen && pCursorInfo->pScreen == pScreen &&
RECT_IN_REGION (pScreen, pRegion, &pCursorInfo->saved) RECT_IN_REGION (pScreen, pRegion, &pCursorInfo->saved)
!= rgnOUT) != rgnOUT)
{ {
SPRITE_DEBUG(("Damage remove\n")); SPRITE_DEBUG(("Damage remove\n"));
miSpriteRemoveCursor (pDev, pScreen); miSpriteRemoveCursor (pDev, pScreen);
@ -188,14 +188,14 @@ miSpriteInitialize (ScreenPtr pScreen,
{ {
miSpriteScreenPtr pScreenPriv; miSpriteScreenPtr pScreenPriv;
VisualPtr pVisual; VisualPtr pVisual;
if (!DamageSetup (pScreen)) if (!DamageSetup (pScreen))
return FALSE; return FALSE;
pScreenPriv = (miSpriteScreenPtr) xalloc (sizeof (miSpriteScreenRec)); pScreenPriv = (miSpriteScreenPtr) xalloc (sizeof (miSpriteScreenRec));
if (!pScreenPriv) if (!pScreenPriv)
return FALSE; return FALSE;
pScreenPriv->pDamage = DamageCreate (miSpriteReportDamage, pScreenPriv->pDamage = DamageCreate (miSpriteReportDamage,
(DamageDestroyFunc) 0, (DamageDestroyFunc) 0,
DamageReportRawRegion, DamageReportRawRegion,
@ -219,10 +219,10 @@ miSpriteInitialize (ScreenPtr pScreen,
pScreenPriv->SourceValidate = pScreen->SourceValidate; pScreenPriv->SourceValidate = pScreen->SourceValidate;
pScreenPriv->CopyWindow = pScreen->CopyWindow; pScreenPriv->CopyWindow = pScreen->CopyWindow;
pScreenPriv->InstallColormap = pScreen->InstallColormap; pScreenPriv->InstallColormap = pScreen->InstallColormap;
pScreenPriv->StoreColors = pScreen->StoreColors; pScreenPriv->StoreColors = pScreen->StoreColors;
pScreenPriv->BlockHandler = pScreen->BlockHandler; pScreenPriv->BlockHandler = pScreen->BlockHandler;
pScreenPriv->DeviceCursorInitialize = pScreen->DeviceCursorInitialize; pScreenPriv->DeviceCursorInitialize = pScreen->DeviceCursorInitialize;
@ -238,7 +238,7 @@ miSpriteInitialize (ScreenPtr pScreen,
pScreenPriv->colors[MASK_COLOR].green = 0; pScreenPriv->colors[MASK_COLOR].green = 0;
pScreenPriv->colors[MASK_COLOR].blue = 0; pScreenPriv->colors[MASK_COLOR].blue = 0;
dixSetPrivate(&pScreen->devPrivates, miSpriteScreenKey, pScreenPriv); dixSetPrivate(&pScreen->devPrivates, miSpriteScreenKey, pScreenPriv);
pScreen->CloseScreen = miSpriteCloseScreen; pScreen->CloseScreen = miSpriteCloseScreen;
pScreen->GetImage = miSpriteGetImage; pScreen->GetImage = miSpriteGetImage;
pScreen->GetSpans = miSpriteGetSpans; pScreen->GetSpans = miSpriteGetSpans;
@ -268,6 +268,7 @@ static Bool
miSpriteCloseScreen (int i, ScreenPtr pScreen) miSpriteCloseScreen (int i, ScreenPtr pScreen)
{ {
miSpriteScreenPtr pScreenPriv; miSpriteScreenPtr pScreenPriv;
DeviceIntPtr pDev;
pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates, pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
miSpriteScreenKey); miSpriteScreenKey);
@ -295,7 +296,7 @@ miSpriteGetImage (DrawablePtr pDrawable, int sx, int sy, int w, int h,
miSpriteScreenPtr pScreenPriv; miSpriteScreenPtr pScreenPriv;
DeviceIntPtr pDev = inputInfo.pointer; DeviceIntPtr pDev = inputInfo.pointer;
miCursorInfoPtr pCursorInfo; miCursorInfoPtr pCursorInfo;
SCREEN_PROLOGUE (pScreen, GetImage); SCREEN_PROLOGUE (pScreen, GetImage);
pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates, pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
@ -308,8 +309,8 @@ miSpriteGetImage (DrawablePtr pDrawable, int sx, int sy, int w, int h,
if (pDrawable->type == DRAWABLE_WINDOW && if (pDrawable->type == DRAWABLE_WINDOW &&
pCursorInfo->isUp && pCursorInfo->isUp &&
pCursorInfo->pScreen == pScreen && pCursorInfo->pScreen == pScreen &&
ORG_OVERLAP(&pCursorInfo->saved,pDrawable->x,pDrawable->y, ORG_OVERLAP(&pCursorInfo->saved,pDrawable->x,pDrawable->y,
sx, sy, w, h)) sx, sy, w, h))
{ {
SPRITE_DEBUG (("GetImage remove\n")); SPRITE_DEBUG (("GetImage remove\n"));
miSpriteRemoveCursor (pDev, pScreen); miSpriteRemoveCursor (pDev, pScreen);
@ -331,7 +332,7 @@ miSpriteGetSpans (DrawablePtr pDrawable, int wMax, DDXPointPtr ppt,
miSpriteScreenPtr pScreenPriv; miSpriteScreenPtr pScreenPriv;
DeviceIntPtr pDev = inputInfo.pointer; DeviceIntPtr pDev = inputInfo.pointer;
miCursorInfoPtr pCursorInfo; miCursorInfoPtr pCursorInfo;
SCREEN_PROLOGUE (pScreen, GetSpans); SCREEN_PROLOGUE (pScreen, GetSpans);
pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates, pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
@ -343,8 +344,8 @@ miSpriteGetSpans (DrawablePtr pDrawable, int wMax, DDXPointPtr ppt,
{ {
pCursorInfo = MISPRITE(pDev); pCursorInfo = MISPRITE(pDev);
if (pDrawable->type == DRAWABLE_WINDOW && if (pDrawable->type == DRAWABLE_WINDOW &&
pCursorInfo->isUp && pCursorInfo->isUp &&
pCursorInfo->pScreen == pScreen) pCursorInfo->pScreen == pScreen)
{ {
DDXPointPtr pts; DDXPointPtr pts;
@ -385,7 +386,7 @@ miSpriteSourceValidate (DrawablePtr pDrawable, int x, int y, int width,
miSpriteScreenPtr pScreenPriv; miSpriteScreenPtr pScreenPriv;
DeviceIntPtr pDev = inputInfo.pointer; DeviceIntPtr pDev = inputInfo.pointer;
miCursorInfoPtr pCursorInfo; miCursorInfoPtr pCursorInfo;
SCREEN_PROLOGUE (pScreen, SourceValidate); SCREEN_PROLOGUE (pScreen, SourceValidate);
pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates, pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
@ -397,7 +398,7 @@ miSpriteSourceValidate (DrawablePtr pDrawable, int x, int y, int width,
{ {
pCursorInfo = MISPRITE(pDev); pCursorInfo = MISPRITE(pDev);
if (pDrawable->type == DRAWABLE_WINDOW && pCursorInfo->isUp && if (pDrawable->type == DRAWABLE_WINDOW && pCursorInfo->isUp &&
pCursorInfo->pScreen == pScreen && pCursorInfo->pScreen == pScreen &&
ORG_OVERLAP(&pCursorInfo->saved, pDrawable->x, pDrawable->y, ORG_OVERLAP(&pCursorInfo->saved, pDrawable->x, pDrawable->y,
x, y, width, height)) x, y, width, height))
{ {
@ -420,7 +421,7 @@ miSpriteCopyWindow (WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
miSpriteScreenPtr pScreenPriv; miSpriteScreenPtr pScreenPriv;
DeviceIntPtr pDev = inputInfo.pointer; DeviceIntPtr pDev = inputInfo.pointer;
miCursorInfoPtr pCursorInfo; miCursorInfoPtr pCursorInfo;
SCREEN_PROLOGUE (pScreen, CopyWindow); SCREEN_PROLOGUE (pScreen, CopyWindow);
pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates, pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
@ -503,7 +504,7 @@ miSpriteInstallColormap (ColormapPtr pMap)
pPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates, pPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
miSpriteScreenKey); miSpriteScreenKey);
SCREEN_PROLOGUE(pScreen, InstallColormap); SCREEN_PROLOGUE(pScreen, InstallColormap);
(*pScreen->InstallColormap) (pMap); (*pScreen->InstallColormap) (pMap);
SCREEN_EPILOGUE(pScreen, InstallColormap); SCREEN_EPILOGUE(pScreen, InstallColormap);
@ -542,7 +543,7 @@ miSpriteStoreColors (ColormapPtr pMap, int ndef, xColorItem *pdef)
pPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates, pPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
miSpriteScreenKey); miSpriteScreenKey);
SCREEN_PROLOGUE(pScreen, StoreColors); SCREEN_PROLOGUE(pScreen, StoreColors);
(*pScreen->StoreColors) (pMap, ndef, pdef); (*pScreen->StoreColors) (pMap, ndef, pdef);
SCREEN_EPILOGUE(pScreen, StoreColors); SCREEN_EPILOGUE(pScreen, StoreColors);
@ -581,14 +582,14 @@ miSpriteStoreColors (ColormapPtr pMap, int ndef, xColorItem *pdef)
for (i = 0; i < ndef; i++) for (i = 0; i < ndef; i++)
{ {
if (pdef[i].pixel == if (pdef[i].pixel ==
pPriv->colors[SOURCE_COLOR].pixel) pPriv->colors[SOURCE_COLOR].pixel)
{ {
pPriv->colors[SOURCE_COLOR] = pdef[i]; pPriv->colors[SOURCE_COLOR] = pdef[i];
if (++updated == 2) if (++updated == 2)
break; break;
} }
if (pdef[i].pixel == if (pdef[i].pixel ==
pPriv->colors[MASK_COLOR].pixel) pPriv->colors[MASK_COLOR].pixel)
{ {
pPriv->colors[MASK_COLOR] = pdef[i]; pPriv->colors[MASK_COLOR] = pdef[i];
if (++updated == 2) if (++updated == 2)
@ -695,7 +696,7 @@ miSpriteSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates, pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
miSpriteScreenKey); miSpriteScreenKey);
miCursorInfoPtr pPointer; miCursorInfoPtr pPointer;
if (!pDev->isMaster && !pDev->u.master) if (!pDev->isMaster && !pDev->u.master)
{ {
ErrorF("[mi] miSpriteSetCursor called for floating device.\n"); ErrorF("[mi] miSpriteSetCursor called for floating device.\n");
@ -754,7 +755,7 @@ miSpriteSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
sx + (int)pCursor->bits->width < pointer->saved.x2 sx + (int)pCursor->bits->width < pointer->saved.x2
&& sy >= pointer->saved.y1 && && sy >= pointer->saved.y1 &&
sy + (int)pCursor->bits->height < sy + (int)pCursor->bits->height <
pointer->saved.y2)) pointer->saved.y2))
{ {
int oldx1, oldy1, dx, dy; int oldx1, oldy1, dx, dy;
@ -967,7 +968,7 @@ miSpriteRestoreCursor (DeviceIntPtr pDev, ScreenPtr pScreen)
int x, y; int x, y;
CursorPtr pCursor; CursorPtr pCursor;
miCursorInfoPtr pCursorInfo; miCursorInfoPtr pCursorInfo;
if (!pDev->isMaster && !pDev->u.master) if (!pDev->isMaster && !pDev->u.master)
{ {
ErrorF("[mi] miSpriteRestoreCursor called for floating device.\n"); ErrorF("[mi] miSpriteRestoreCursor called for floating device.\n");
@ -988,7 +989,7 @@ miSpriteRestoreCursor (DeviceIntPtr pDev, ScreenPtr pScreen)
SPRITE_DEBUG(("RestoreCursor %d\n", pDev->id)); SPRITE_DEBUG(("RestoreCursor %d\n", pDev->id));
if (pCursorInfo->checkPixels) if (pCursorInfo->checkPixels)
miSpriteFindColors (pCursorInfo, pScreen); miSpriteFindColors (pCursorInfo, pScreen);
if ((*pScreenPriv->funcs->PutUpCursor) (pDev, pScreen, if ((*pScreenPriv->funcs->PutUpCursor) (pDev, pScreen,
pCursor, x, y, pCursor, x, y,
pScreenPriv->colors[SOURCE_COLOR].pixel, pScreenPriv->colors[SOURCE_COLOR].pixel,
pScreenPriv->colors[MASK_COLOR].pixel)) pScreenPriv->colors[MASK_COLOR].pixel))