2004-07-29 16:42:24 +02:00
|
|
|
/*
|
|
|
|
* Copyright © 2003 Keith Packard
|
|
|
|
*
|
|
|
|
* 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, and that the name of Keith Packard not be used in
|
|
|
|
* advertising or publicity pertaining to distribution of the software without
|
|
|
|
* specific, written prior permission. Keith Packard makes no
|
|
|
|
* representations about the suitability of this software for any purpose. It
|
|
|
|
* is provided "as is" without express or implied warranty.
|
|
|
|
*
|
|
|
|
* KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
|
|
|
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
|
|
|
* EVENT SHALL KEITH PACKARD 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.
|
|
|
|
*/
|
|
|
|
|
2005-07-03 09:02:09 +02:00
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
|
|
#include <dix-config.h>
|
|
|
|
#endif
|
|
|
|
|
2006-02-10 23:00:30 +01:00
|
|
|
#include <stdlib.h>
|
|
|
|
|
2004-07-29 16:42:24 +02:00
|
|
|
#include <X11/X.h>
|
|
|
|
#include "scrnintstr.h"
|
|
|
|
#include "windowstr.h"
|
2005-07-03 09:02:09 +02:00
|
|
|
#include <X11/fonts/font.h>
|
2004-07-29 16:42:24 +02:00
|
|
|
#include "dixfontstr.h"
|
2005-07-03 09:02:09 +02:00
|
|
|
#include <X11/fonts/fontstruct.h>
|
2004-07-29 16:42:24 +02:00
|
|
|
#include "mi.h"
|
|
|
|
#include "regionstr.h"
|
|
|
|
#include "globals.h"
|
|
|
|
#include "gcstruct.h"
|
|
|
|
#include "damage.h"
|
|
|
|
#include "damagestr.h"
|
|
|
|
|
|
|
|
#define wrap(priv, real, mem, func) {\
|
|
|
|
priv->mem = real->mem; \
|
|
|
|
real->mem = func; \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define unwrap(priv, real, mem) {\
|
|
|
|
real->mem = priv->mem; \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define BOX_SAME(a,b) \
|
|
|
|
((a)->x1 == (b)->x1 && \
|
|
|
|
(a)->y1 == (b)->y1 && \
|
|
|
|
(a)->x2 == (b)->x2 && \
|
|
|
|
(a)->y2 == (b)->y2)
|
|
|
|
|
2004-07-31 03:38:46 +02:00
|
|
|
#define DAMAGE_VALIDATE_ENABLE 0
|
2004-07-29 16:42:24 +02:00
|
|
|
#define DAMAGE_DEBUG_ENABLE 0
|
|
|
|
#if DAMAGE_DEBUG_ENABLE
|
|
|
|
#define DAMAGE_DEBUG(x) ErrorF x
|
|
|
|
#else
|
|
|
|
#define DAMAGE_DEBUG(x)
|
|
|
|
#endif
|
|
|
|
|
2007-08-28 15:28:25 +02:00
|
|
|
#define getPixmapDamageRef(pPixmap) ((DamagePtr *) \
|
|
|
|
dixLookupPrivateAddr(&(pPixmap)->devPrivates, damagePixPrivateKey))
|
2004-08-12 00:40:14 +02:00
|
|
|
|
|
|
|
#define pixmapDamage(pPixmap) damagePixPriv(pPixmap)
|
|
|
|
|
2010-04-27 02:22:21 +02:00
|
|
|
static DevPrivateKeyRec damageScrPrivateKeyRec;
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2010-04-27 02:22:21 +02:00
|
|
|
#define damageScrPrivateKey (&damageScrPrivateKeyRec)
|
|
|
|
static DevPrivateKeyRec damagePixPrivateKeyRec;
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2010-04-27 02:22:21 +02:00
|
|
|
#define damagePixPrivateKey (&damagePixPrivateKeyRec)
|
|
|
|
static DevPrivateKeyRec damageGCPrivateKeyRec;
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2010-04-27 02:22:21 +02:00
|
|
|
#define damageGCPrivateKey (&damageGCPrivateKeyRec)
|
|
|
|
static DevPrivateKeyRec damageWinPrivateKeyRec;
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2010-04-27 02:22:21 +02:00
|
|
|
#define damageWinPrivateKey (&damageWinPrivateKeyRec)
|
2007-03-25 18:27:01 +02:00
|
|
|
|
2004-08-12 00:40:14 +02:00
|
|
|
static DamagePtr *
|
2012-03-21 20:55:09 +01:00
|
|
|
getDrawableDamageRef(DrawablePtr pDrawable)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
PixmapPtr pPixmap;
|
2004-08-12 00:40:14 +02:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (WindowDrawable(pDrawable->type)) {
|
|
|
|
ScreenPtr pScreen = pDrawable->pScreen;
|
|
|
|
|
|
|
|
pPixmap = 0;
|
|
|
|
if (pScreen->GetWindowPixmap
|
2011-02-28 00:49:10 +01:00
|
|
|
#ifdef ROOTLESS_WORKAROUND
|
2012-03-21 20:55:09 +01:00
|
|
|
&& ((WindowPtr) pDrawable)->viewable
|
2011-02-28 00:49:10 +01:00
|
|
|
#endif
|
2012-03-21 20:55:09 +01:00
|
|
|
)
|
|
|
|
pPixmap = (*pScreen->GetWindowPixmap) ((WindowPtr) pDrawable);
|
2004-08-12 00:40:14 +02:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (!pPixmap) {
|
|
|
|
damageScrPriv(pScreen);
|
2004-08-12 00:40:14 +02:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
return &pScrPriv->pScreenDamage;
|
|
|
|
}
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
else
|
2012-03-21 20:55:09 +01:00
|
|
|
pPixmap = (PixmapPtr) pDrawable;
|
|
|
|
return getPixmapDamageRef(pPixmap);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
2004-08-12 00:40:14 +02:00
|
|
|
#define getDrawableDamage(pDrawable) (*getDrawableDamageRef (pDrawable))
|
|
|
|
#define getWindowDamage(pWin) getDrawableDamage(&(pWin)->drawable)
|
|
|
|
|
|
|
|
#define drawableDamage(pDrawable) \
|
|
|
|
DamagePtr pDamage = getDrawableDamage(pDrawable)
|
|
|
|
|
|
|
|
#define windowDamage(pWin) drawableDamage(&(pWin)->drawable)
|
|
|
|
|
2004-07-29 16:42:24 +02:00
|
|
|
#define winDamageRef(pWindow) \
|
|
|
|
DamagePtr *pPrev = (DamagePtr *) \
|
2007-08-28 15:28:25 +02:00
|
|
|
dixLookupPrivateAddr(&(pWindow)->devPrivates, damageWinPrivateKey)
|
2004-07-29 16:42:24 +02:00
|
|
|
|
|
|
|
#if DAMAGE_DEBUG_ENABLE
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
_damageRegionAppend(DrawablePtr pDrawable, RegionPtr pRegion, Bool clip,
|
|
|
|
int subWindowMode, const char *where)
|
2008-08-31 17:45:08 +02:00
|
|
|
#define damageRegionAppend(d,r,c,m) _damageRegionAppend(d,r,c,m,__FUNCTION__)
|
2004-07-29 16:42:24 +02:00
|
|
|
#else
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damageRegionAppend(DrawablePtr pDrawable, RegionPtr pRegion, Bool clip,
|
|
|
|
int subWindowMode)
|
2004-07-29 16:42:24 +02:00
|
|
|
#endif
|
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
ScreenPtr pScreen = pDrawable->pScreen;
|
|
|
|
|
2004-08-07 03:23:07 +02:00
|
|
|
damageScrPriv(pScreen);
|
|
|
|
drawableDamage(pDrawable);
|
2012-03-21 20:55:09 +01:00
|
|
|
DamagePtr pNext;
|
|
|
|
RegionRec clippedRec;
|
|
|
|
RegionPtr pDamageRegion;
|
|
|
|
RegionRec pixClip;
|
|
|
|
int draw_x, draw_y;
|
|
|
|
|
2004-07-31 03:38:46 +02:00
|
|
|
#ifdef COMPOSITE
|
2012-03-21 20:55:09 +01:00
|
|
|
int screen_x = 0, screen_y = 0;
|
2004-07-31 03:38:46 +02:00
|
|
|
#endif
|
2004-07-29 16:42:24 +02:00
|
|
|
|
|
|
|
/* short circuit for empty regions */
|
2010-05-22 00:05:48 +02:00
|
|
|
if (!RegionNotEmpty(pRegion))
|
2012-03-21 20:55:09 +01:00
|
|
|
return;
|
|
|
|
|
2004-07-31 03:38:46 +02:00
|
|
|
#ifdef COMPOSITE
|
|
|
|
/*
|
|
|
|
* When drawing to a pixmap which is storing window contents,
|
|
|
|
* the region presented is in pixmap relative coordinates which
|
|
|
|
* need to be converted to screen relative coordinates
|
|
|
|
*/
|
2012-03-21 20:55:09 +01:00
|
|
|
if (pDrawable->type != DRAWABLE_WINDOW) {
|
|
|
|
screen_x = ((PixmapPtr) pDrawable)->screen_x - pDrawable->x;
|
|
|
|
screen_y = ((PixmapPtr) pDrawable)->screen_y - pDrawable->y;
|
2004-07-31 03:38:46 +02:00
|
|
|
}
|
|
|
|
if (screen_x || screen_y)
|
2010-05-22 00:05:48 +02:00
|
|
|
RegionTranslate(pRegion, screen_x, screen_y);
|
2004-07-31 03:38:46 +02:00
|
|
|
#endif
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2005-06-09 05:01:57 +02:00
|
|
|
if (pDrawable->type == DRAWABLE_WINDOW &&
|
2012-03-21 20:55:09 +01:00
|
|
|
((WindowPtr) (pDrawable))->backingStore == NotUseful) {
|
|
|
|
if (subWindowMode == ClipByChildren) {
|
|
|
|
RegionIntersect(pRegion, pRegion,
|
|
|
|
&((WindowPtr) (pDrawable))->clipList);
|
|
|
|
}
|
|
|
|
else if (subWindowMode == IncludeInferiors) {
|
|
|
|
RegionPtr pTempRegion =
|
|
|
|
NotClippedByChildren((WindowPtr) (pDrawable));
|
|
|
|
RegionIntersect(pRegion, pRegion, pTempRegion);
|
|
|
|
RegionDestroy(pTempRegion);
|
|
|
|
}
|
|
|
|
/* If subWindowMode is set to an invalid value, don't perform
|
|
|
|
* any drawable-based clipping. */
|
2005-06-09 05:01:57 +02:00
|
|
|
}
|
|
|
|
|
2010-05-22 00:05:48 +02:00
|
|
|
RegionNull(&clippedRec);
|
2012-03-21 20:55:09 +01:00
|
|
|
for (; pDamage; pDamage = pNext) {
|
|
|
|
pNext = pDamage->pNext;
|
|
|
|
/*
|
|
|
|
* Check for internal damage and don't send events
|
|
|
|
*/
|
|
|
|
if (pScrPriv->internalLevel > 0 && !pDamage->isInternal) {
|
|
|
|
DAMAGE_DEBUG(("non internal damage, skipping at %d\n",
|
|
|
|
pScrPriv->internalLevel));
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* Check for unrealized windows
|
|
|
|
*/
|
|
|
|
if (pDamage->pDrawable->type == DRAWABLE_WINDOW &&
|
|
|
|
!((WindowPtr) (pDamage->pDrawable))->realized) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
draw_x = pDamage->pDrawable->x;
|
|
|
|
draw_y = pDamage->pDrawable->y;
|
2004-07-31 03:38:46 +02:00
|
|
|
#ifdef COMPOSITE
|
2012-03-21 20:55:09 +01:00
|
|
|
/*
|
|
|
|
* Need to move everyone to screen coordinates
|
|
|
|
* XXX what about off-screen pixmaps with non-zero x/y?
|
|
|
|
*/
|
|
|
|
if (!WindowDrawable(pDamage->pDrawable->type)) {
|
|
|
|
draw_x += ((PixmapPtr) pDamage->pDrawable)->screen_x;
|
|
|
|
draw_y += ((PixmapPtr) pDamage->pDrawable)->screen_y;
|
|
|
|
}
|
2004-07-31 03:38:46 +02:00
|
|
|
#endif
|
2012-03-21 20:55:09 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Clip against border or pixmap bounds
|
|
|
|
*/
|
|
|
|
|
|
|
|
pDamageRegion = pRegion;
|
|
|
|
if (clip || pDamage->pDrawable != pDrawable) {
|
|
|
|
pDamageRegion = &clippedRec;
|
|
|
|
if (pDamage->pDrawable->type == DRAWABLE_WINDOW) {
|
|
|
|
RegionIntersect(pDamageRegion, pRegion,
|
|
|
|
&((WindowPtr) (pDamage->pDrawable))->
|
|
|
|
borderClip);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
BoxRec box;
|
|
|
|
|
|
|
|
box.x1 = draw_x;
|
|
|
|
box.y1 = draw_y;
|
|
|
|
box.x2 = draw_x + pDamage->pDrawable->width;
|
|
|
|
box.y2 = draw_y + pDamage->pDrawable->height;
|
|
|
|
RegionInit(&pixClip, &box, 1);
|
|
|
|
RegionIntersect(pDamageRegion, pRegion, &pixClip);
|
|
|
|
RegionUninit(&pixClip);
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* Short circuit empty results
|
|
|
|
*/
|
|
|
|
if (!RegionNotEmpty(pDamageRegion))
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
DAMAGE_DEBUG(("%s %d x %d +%d +%d (target 0x%lx monitor 0x%lx)\n",
|
|
|
|
where,
|
|
|
|
pDamageRegion->extents.x2 - pDamageRegion->extents.x1,
|
|
|
|
pDamageRegion->extents.y2 - pDamageRegion->extents.y1,
|
|
|
|
pDamageRegion->extents.x1, pDamageRegion->extents.y1,
|
|
|
|
pDrawable->id, pDamage->pDrawable->id));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Move region to target coordinate space
|
|
|
|
*/
|
|
|
|
if (draw_x || draw_y)
|
|
|
|
RegionTranslate(pDamageRegion, -draw_x, -draw_y);
|
|
|
|
|
|
|
|
/* Store damage region if needed after submission. */
|
2013-08-21 17:57:24 +02:00
|
|
|
if (pDamage->reportAfter)
|
2012-03-21 20:55:09 +01:00
|
|
|
RegionUnion(&pDamage->pendingDamage,
|
|
|
|
&pDamage->pendingDamage, pDamageRegion);
|
|
|
|
|
|
|
|
/* Report damage now, if desired. */
|
|
|
|
if (!pDamage->reportAfter) {
|
|
|
|
if (pDamage->damageReport)
|
|
|
|
DamageReportDamage(pDamage, pDamageRegion);
|
|
|
|
else
|
|
|
|
RegionUnion(&pDamage->damage, &pDamage->damage, pDamageRegion);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* translate original region back
|
|
|
|
*/
|
|
|
|
if (pDamageRegion == pRegion && (draw_x || draw_y))
|
|
|
|
RegionTranslate(pDamageRegion, draw_x, draw_y);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2004-07-31 03:38:46 +02:00
|
|
|
#ifdef COMPOSITE
|
|
|
|
if (screen_x || screen_y)
|
2012-03-21 20:55:09 +01:00
|
|
|
RegionTranslate(pRegion, -screen_x, -screen_y);
|
2004-07-31 03:38:46 +02:00
|
|
|
#endif
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2010-05-22 00:05:48 +02:00
|
|
|
RegionUninit(&clippedRec);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
2006-06-12 20:12:31 +02:00
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damageRegionProcessPending(DrawablePtr pDrawable)
|
2006-06-12 20:12:31 +02:00
|
|
|
{
|
|
|
|
drawableDamage(pDrawable);
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
for (; pDamage != NULL; pDamage = pDamage->pNext) {
|
|
|
|
if (pDamage->reportAfter) {
|
|
|
|
/* It's possible that there is only interest in postRendering reporting. */
|
|
|
|
if (pDamage->damageReport)
|
|
|
|
DamageReportDamage(pDamage, &pDamage->pendingDamage);
|
|
|
|
else
|
|
|
|
RegionUnion(&pDamage->damage, &pDamage->damage,
|
|
|
|
&pDamage->pendingDamage);
|
|
|
|
}
|
|
|
|
|
2013-08-21 17:57:24 +02:00
|
|
|
if (pDamage->reportAfter)
|
2012-03-21 20:55:09 +01:00
|
|
|
RegionEmpty(&pDamage->pendingDamage);
|
2006-06-12 20:12:31 +02:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2006-06-12 20:12:31 +02:00
|
|
|
}
|
|
|
|
|
2004-07-29 16:42:24 +02:00
|
|
|
#if DAMAGE_DEBUG_ENABLE
|
2005-06-09 05:01:57 +02:00
|
|
|
#define damageDamageBox(d,b,m) _damageDamageBox(d,b,m,__FUNCTION__)
|
2004-07-29 16:42:24 +02:00
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
_damageDamageBox(DrawablePtr pDrawable, BoxPtr pBox, int subWindowMode,
|
|
|
|
const char *where)
|
2004-07-29 16:42:24 +02:00
|
|
|
#else
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damageDamageBox(DrawablePtr pDrawable, BoxPtr pBox, int subWindowMode)
|
2004-07-29 16:42:24 +02:00
|
|
|
#endif
|
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
RegionRec region;
|
2004-07-29 16:42:24 +02:00
|
|
|
|
2010-05-22 00:05:48 +02:00
|
|
|
RegionInit(®ion, pBox, 1);
|
2004-07-29 16:42:24 +02:00
|
|
|
#if DAMAGE_DEBUG_ENABLE
|
2012-03-21 20:55:09 +01:00
|
|
|
_damageRegionAppend(pDrawable, ®ion, TRUE, subWindowMode, where);
|
2004-07-29 16:42:24 +02:00
|
|
|
#else
|
2012-03-21 20:55:09 +01:00
|
|
|
damageRegionAppend(pDrawable, ®ion, TRUE, subWindowMode);
|
2004-07-29 16:42:24 +02:00
|
|
|
#endif
|
2010-05-22 00:05:48 +02:00
|
|
|
RegionUninit(®ion);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void damageValidateGC(GCPtr, unsigned long, DrawablePtr);
|
|
|
|
static void damageChangeGC(GCPtr, unsigned long);
|
|
|
|
static void damageCopyGC(GCPtr, unsigned long, GCPtr);
|
|
|
|
static void damageDestroyGC(GCPtr);
|
2013-12-15 10:05:51 +01:00
|
|
|
static void damageChangeClip(GCPtr, int, void *, int);
|
2004-07-29 16:42:24 +02:00
|
|
|
static void damageDestroyClip(GCPtr);
|
|
|
|
static void damageCopyClip(GCPtr, GCPtr);
|
|
|
|
|
2007-03-25 18:27:01 +02:00
|
|
|
static GCFuncs damageGCFuncs = {
|
2004-07-29 16:42:24 +02:00
|
|
|
damageValidateGC, damageChangeGC, damageCopyGC, damageDestroyGC,
|
|
|
|
damageChangeClip, damageDestroyClip, damageCopyClip
|
|
|
|
};
|
|
|
|
|
2007-03-25 18:27:01 +02:00
|
|
|
static GCOps damageGCOps;
|
2004-07-29 16:42:24 +02:00
|
|
|
|
|
|
|
static Bool
|
|
|
|
damageCreateGC(GCPtr pGC)
|
|
|
|
{
|
|
|
|
ScreenPtr pScreen = pGC->pScreen;
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2004-07-29 16:42:24 +02:00
|
|
|
damageScrPriv(pScreen);
|
|
|
|
damageGCPriv(pGC);
|
|
|
|
Bool ret;
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
unwrap(pScrPriv, pScreen, CreateGC);
|
|
|
|
if ((ret = (*pScreen->CreateGC) (pGC))) {
|
|
|
|
pGCPriv->ops = NULL;
|
|
|
|
pGCPriv->funcs = pGC->funcs;
|
|
|
|
pGC->funcs = &damageGCFuncs;
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
wrap(pScrPriv, pScreen, CreateGC, damageCreateGC);
|
2004-07-29 16:42:24 +02:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable) \
|
|
|
|
damageGCPriv(pGC); \
|
2013-11-15 14:02:58 +01:00
|
|
|
const GCFuncs *oldFuncs = pGC->funcs; \
|
2004-07-29 16:42:24 +02:00
|
|
|
unwrap(pGCPriv, pGC, funcs); \
|
|
|
|
unwrap(pGCPriv, pGC, ops); \
|
|
|
|
|
|
|
|
#define DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable) \
|
|
|
|
wrap(pGCPriv, pGC, funcs, oldFuncs); \
|
|
|
|
wrap(pGCPriv, pGC, ops, &damageGCOps)
|
|
|
|
|
|
|
|
#define DAMAGE_GC_FUNC_PROLOGUE(pGC) \
|
|
|
|
damageGCPriv(pGC); \
|
|
|
|
unwrap(pGCPriv, pGC, funcs); \
|
|
|
|
if (pGCPriv->ops) unwrap(pGCPriv, pGC, ops)
|
|
|
|
|
|
|
|
#define DAMAGE_GC_FUNC_EPILOGUE(pGC) \
|
|
|
|
wrap(pGCPriv, pGC, funcs, &damageGCFuncs); \
|
|
|
|
if (pGCPriv->ops) wrap(pGCPriv, pGC, ops, &damageGCOps)
|
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damageValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
DAMAGE_GC_FUNC_PROLOGUE(pGC);
|
|
|
|
(*pGC->funcs->ValidateGC) (pGC, changes, pDrawable);
|
2013-10-31 16:57:56 +01:00
|
|
|
pGCPriv->ops = pGC->ops; /* just so it's not NULL */
|
2012-03-21 20:55:09 +01:00
|
|
|
DAMAGE_GC_FUNC_EPILOGUE(pGC);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
damageDestroyGC(GCPtr pGC)
|
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
DAMAGE_GC_FUNC_PROLOGUE(pGC);
|
|
|
|
(*pGC->funcs->DestroyGC) (pGC);
|
|
|
|
DAMAGE_GC_FUNC_EPILOGUE(pGC);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damageChangeGC(GCPtr pGC, unsigned long mask)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
DAMAGE_GC_FUNC_PROLOGUE(pGC);
|
2004-07-29 16:42:24 +02:00
|
|
|
(*pGC->funcs->ChangeGC) (pGC, mask);
|
2012-03-21 20:55:09 +01:00
|
|
|
DAMAGE_GC_FUNC_EPILOGUE(pGC);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damageCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
DAMAGE_GC_FUNC_PROLOGUE(pGCDst);
|
2004-07-29 16:42:24 +02:00
|
|
|
(*pGCDst->funcs->CopyGC) (pGCSrc, mask, pGCDst);
|
2012-03-21 20:55:09 +01:00
|
|
|
DAMAGE_GC_FUNC_EPILOGUE(pGCDst);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2013-12-15 10:05:51 +01:00
|
|
|
damageChangeClip(GCPtr pGC, int type, void *pvalue, int nrects)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
DAMAGE_GC_FUNC_PROLOGUE(pGC);
|
2004-07-29 16:42:24 +02:00
|
|
|
(*pGC->funcs->ChangeClip) (pGC, type, pvalue, nrects);
|
2012-03-21 20:55:09 +01:00
|
|
|
DAMAGE_GC_FUNC_EPILOGUE(pGC);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
damageCopyClip(GCPtr pgcDst, GCPtr pgcSrc)
|
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
DAMAGE_GC_FUNC_PROLOGUE(pgcDst);
|
|
|
|
(*pgcDst->funcs->CopyClip) (pgcDst, pgcSrc);
|
|
|
|
DAMAGE_GC_FUNC_EPILOGUE(pgcDst);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
damageDestroyClip(GCPtr pGC)
|
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
DAMAGE_GC_FUNC_PROLOGUE(pGC);
|
|
|
|
(*pGC->funcs->DestroyClip) (pGC);
|
|
|
|
DAMAGE_GC_FUNC_EPILOGUE(pGC);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
2004-08-12 00:40:14 +02:00
|
|
|
#define TRIM_BOX(box, pGC) if (pGC->pCompositeClip) { \
|
2004-07-29 16:42:24 +02:00
|
|
|
BoxPtr extents = &pGC->pCompositeClip->extents;\
|
|
|
|
if(box.x1 < extents->x1) box.x1 = extents->x1; \
|
|
|
|
if(box.x2 > extents->x2) box.x2 = extents->x2; \
|
|
|
|
if(box.y1 < extents->y1) box.y1 = extents->y1; \
|
|
|
|
if(box.y2 > extents->y2) box.y2 = extents->y2; \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define TRANSLATE_BOX(box, pDrawable) { \
|
|
|
|
box.x1 += pDrawable->x; \
|
|
|
|
box.x2 += pDrawable->x; \
|
|
|
|
box.y1 += pDrawable->y; \
|
|
|
|
box.y2 += pDrawable->y; \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define TRIM_AND_TRANSLATE_BOX(box, pDrawable, pGC) { \
|
|
|
|
TRANSLATE_BOX(box, pDrawable); \
|
|
|
|
TRIM_BOX(box, pGC); \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define BOX_NOT_EMPTY(box) \
|
|
|
|
(((box.x2 - box.x1) > 0) && ((box.y2 - box.y1) > 0))
|
|
|
|
|
|
|
|
#define checkGCDamage(d,g) (getDrawableDamage(d) && \
|
2004-08-12 00:40:14 +02:00
|
|
|
(!g->pCompositeClip ||\
|
2010-06-06 05:55:29 +02:00
|
|
|
RegionNotEmpty(g->pCompositeClip)))
|
2004-07-29 16:42:24 +02:00
|
|
|
|
|
|
|
#define TRIM_PICTURE_BOX(box, pDst) { \
|
|
|
|
BoxPtr extents = &pDst->pCompositeClip->extents;\
|
|
|
|
if(box.x1 < extents->x1) box.x1 = extents->x1; \
|
|
|
|
if(box.x2 > extents->x2) box.x2 = extents->x2; \
|
|
|
|
if(box.y1 < extents->y1) box.y1 = extents->y1; \
|
|
|
|
if(box.y2 > extents->y2) box.y2 = extents->y2; \
|
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2004-07-29 16:42:24 +02:00
|
|
|
#define checkPictureDamage(p) (getDrawableDamage(p->pDrawable) && \
|
2010-05-22 00:05:48 +02:00
|
|
|
RegionNotEmpty(p->pCompositeClip))
|
2004-07-29 16:42:24 +02:00
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damageComposite(CARD8 op,
|
|
|
|
PicturePtr pSrc,
|
|
|
|
PicturePtr pMask,
|
|
|
|
PicturePtr pDst,
|
|
|
|
INT16 xSrc,
|
|
|
|
INT16 ySrc,
|
|
|
|
INT16 xMask,
|
|
|
|
INT16 yMask,
|
|
|
|
INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)
|
|
|
|
{
|
|
|
|
ScreenPtr pScreen = pDst->pDrawable->pScreen;
|
|
|
|
PictureScreenPtr ps = GetPictureScreen(pScreen);
|
|
|
|
|
2004-07-29 16:42:24 +02:00
|
|
|
damageScrPriv(pScreen);
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (checkPictureDamage(pDst)) {
|
|
|
|
BoxRec box;
|
|
|
|
|
|
|
|
box.x1 = xDst + pDst->pDrawable->x;
|
|
|
|
box.y1 = yDst + pDst->pDrawable->y;
|
|
|
|
box.x2 = box.x1 + width;
|
|
|
|
box.y2 = box.y1 + height;
|
|
|
|
TRIM_PICTURE_BOX(box, pDst);
|
|
|
|
if (BOX_NOT_EMPTY(box))
|
|
|
|
damageDamageBox(pDst->pDrawable, &box, pDst->subWindowMode);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
unwrap(pScrPriv, ps, Composite);
|
2004-07-29 16:42:24 +02:00
|
|
|
(*ps->Composite) (op,
|
2012-03-21 20:55:09 +01:00
|
|
|
pSrc,
|
|
|
|
pMask,
|
|
|
|
pDst,
|
|
|
|
xSrc, ySrc, xMask, yMask, xDst, yDst, width, height);
|
|
|
|
damageRegionProcessPending(pDst->pDrawable);
|
|
|
|
wrap(pScrPriv, ps, Composite, damageComposite);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damageGlyphs(CARD8 op,
|
|
|
|
PicturePtr pSrc,
|
|
|
|
PicturePtr pDst,
|
|
|
|
PictFormatPtr maskFormat,
|
|
|
|
INT16 xSrc,
|
|
|
|
INT16 ySrc, int nlist, GlyphListPtr list, GlyphPtr * glyphs)
|
|
|
|
{
|
|
|
|
ScreenPtr pScreen = pDst->pDrawable->pScreen;
|
|
|
|
PictureScreenPtr ps = GetPictureScreen(pScreen);
|
|
|
|
|
2004-07-29 16:42:24 +02:00
|
|
|
damageScrPriv(pScreen);
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (checkPictureDamage(pDst)) {
|
|
|
|
int nlistTmp = nlist;
|
|
|
|
GlyphListPtr listTmp = list;
|
|
|
|
GlyphPtr *glyphsTmp = glyphs;
|
|
|
|
int x, y;
|
|
|
|
int n;
|
|
|
|
GlyphPtr glyph;
|
|
|
|
BoxRec box;
|
|
|
|
int x1, y1, x2, y2;
|
|
|
|
|
|
|
|
box.x1 = 32767;
|
|
|
|
box.y1 = 32767;
|
|
|
|
box.x2 = -32767;
|
|
|
|
box.y2 = -32767;
|
|
|
|
x = pDst->pDrawable->x;
|
|
|
|
y = pDst->pDrawable->y;
|
|
|
|
while (nlistTmp--) {
|
|
|
|
x += listTmp->xOff;
|
|
|
|
y += listTmp->yOff;
|
|
|
|
n = listTmp->len;
|
|
|
|
while (n--) {
|
|
|
|
glyph = *glyphsTmp++;
|
|
|
|
x1 = x - glyph->info.x;
|
|
|
|
y1 = y - glyph->info.y;
|
|
|
|
x2 = x1 + glyph->info.width;
|
|
|
|
y2 = y1 + glyph->info.height;
|
|
|
|
if (x1 < box.x1)
|
|
|
|
box.x1 = x1;
|
|
|
|
if (y1 < box.y1)
|
|
|
|
box.y1 = y1;
|
|
|
|
if (x2 > box.x2)
|
|
|
|
box.x2 = x2;
|
|
|
|
if (y2 > box.y2)
|
|
|
|
box.y2 = y2;
|
|
|
|
x += glyph->info.xOff;
|
|
|
|
y += glyph->info.yOff;
|
|
|
|
}
|
|
|
|
listTmp++;
|
|
|
|
}
|
|
|
|
TRIM_PICTURE_BOX(box, pDst);
|
|
|
|
if (BOX_NOT_EMPTY(box))
|
|
|
|
damageDamageBox(pDst->pDrawable, &box, pDst->subWindowMode);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
unwrap(pScrPriv, ps, Glyphs);
|
2004-07-29 16:42:24 +02:00
|
|
|
(*ps->Glyphs) (op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs);
|
2012-03-21 20:55:09 +01:00
|
|
|
damageRegionProcessPending(pDst->pDrawable);
|
|
|
|
wrap(pScrPriv, ps, Glyphs, damageGlyphs);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2008-04-04 21:11:14 +02:00
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damageAddTraps(PicturePtr pPicture,
|
|
|
|
INT16 x_off, INT16 y_off, int ntrap, xTrap * traps)
|
|
|
|
{
|
|
|
|
ScreenPtr pScreen = pPicture->pDrawable->pScreen;
|
|
|
|
PictureScreenPtr ps = GetPictureScreen(pScreen);
|
|
|
|
|
2008-04-04 21:11:14 +02:00
|
|
|
damageScrPriv(pScreen);
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (checkPictureDamage(pPicture)) {
|
|
|
|
BoxRec box;
|
|
|
|
int i;
|
|
|
|
int x, y;
|
|
|
|
xTrap *t = traps;
|
|
|
|
|
|
|
|
box.x1 = 32767;
|
|
|
|
box.y1 = 32767;
|
|
|
|
box.x2 = -32767;
|
|
|
|
box.y2 = -32767;
|
|
|
|
x = pPicture->pDrawable->x + x_off;
|
|
|
|
y = pPicture->pDrawable->y + y_off;
|
|
|
|
for (i = 0; i < ntrap; i++) {
|
|
|
|
pixman_fixed_t l = min(t->top.l, t->bot.l);
|
|
|
|
pixman_fixed_t r = max(t->top.r, t->bot.r);
|
|
|
|
int x1 = x + pixman_fixed_to_int(l);
|
|
|
|
int x2 = x + pixman_fixed_to_int(pixman_fixed_ceil(r));
|
|
|
|
int y1 = y + pixman_fixed_to_int(t->top.y);
|
|
|
|
int y2 = y + pixman_fixed_to_int(pixman_fixed_ceil(t->bot.y));
|
|
|
|
|
|
|
|
if (x1 < box.x1)
|
|
|
|
box.x1 = x1;
|
|
|
|
if (x2 > box.x2)
|
|
|
|
box.x2 = x2;
|
|
|
|
if (y1 < box.y1)
|
|
|
|
box.y1 = y1;
|
|
|
|
if (y2 > box.y2)
|
|
|
|
box.y2 = y2;
|
|
|
|
}
|
|
|
|
TRIM_PICTURE_BOX(box, pPicture);
|
|
|
|
if (BOX_NOT_EMPTY(box))
|
|
|
|
damageDamageBox(pPicture->pDrawable, &box, pPicture->subWindowMode);
|
2008-04-04 21:11:14 +02:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
unwrap(pScrPriv, ps, AddTraps);
|
2008-04-04 21:11:14 +02:00
|
|
|
(*ps->AddTraps) (pPicture, x_off, y_off, ntrap, traps);
|
2012-03-21 20:55:09 +01:00
|
|
|
damageRegionProcessPending(pPicture->pDrawable);
|
|
|
|
wrap(pScrPriv, ps, AddTraps, damageAddTraps);
|
2008-04-04 21:11:14 +02:00
|
|
|
}
|
2004-07-29 16:42:24 +02:00
|
|
|
|
|
|
|
/**********************************************************/
|
|
|
|
|
|
|
|
static void
|
|
|
|
damageFillSpans(DrawablePtr pDrawable,
|
2012-03-21 20:55:09 +01:00
|
|
|
GC * pGC, int npt, DDXPointPtr ppt, int *pwidth, int fSorted)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
|
|
|
DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (npt && checkGCDamage(pDrawable, pGC)) {
|
|
|
|
int nptTmp = npt;
|
|
|
|
DDXPointPtr pptTmp = ppt;
|
|
|
|
int *pwidthTmp = pwidth;
|
|
|
|
BoxRec box;
|
|
|
|
|
|
|
|
box.x1 = pptTmp->x;
|
|
|
|
box.x2 = box.x1 + *pwidthTmp;
|
|
|
|
box.y2 = box.y1 = pptTmp->y;
|
|
|
|
|
|
|
|
while (--nptTmp) {
|
|
|
|
pptTmp++;
|
|
|
|
pwidthTmp++;
|
|
|
|
if (box.x1 > pptTmp->x)
|
|
|
|
box.x1 = pptTmp->x;
|
|
|
|
if (box.x2 < (pptTmp->x + *pwidthTmp))
|
|
|
|
box.x2 = pptTmp->x + *pwidthTmp;
|
|
|
|
if (box.y1 > pptTmp->y)
|
|
|
|
box.y1 = pptTmp->y;
|
|
|
|
else if (box.y2 < pptTmp->y)
|
|
|
|
box.y2 = pptTmp->y;
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
box.y2++;
|
|
|
|
|
|
|
|
if (!pGC->miTranslate) {
|
|
|
|
TRANSLATE_BOX(box, pDrawable);
|
|
|
|
}
|
|
|
|
TRIM_BOX(box, pGC);
|
|
|
|
|
|
|
|
if (BOX_NOT_EMPTY(box))
|
|
|
|
damageDamageBox(pDrawable, &box, pGC->subWindowMode);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
(*pGC->ops->FillSpans) (pDrawable, pGC, npt, ppt, pwidth, fSorted);
|
|
|
|
|
|
|
|
damageRegionProcessPending(pDrawable);
|
2004-07-29 16:42:24 +02:00
|
|
|
DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damageSetSpans(DrawablePtr pDrawable,
|
|
|
|
GCPtr pGC,
|
|
|
|
char *pcharsrc,
|
|
|
|
DDXPointPtr ppt, int *pwidth, int npt, int fSorted)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
|
|
|
DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (npt && checkGCDamage(pDrawable, pGC)) {
|
|
|
|
DDXPointPtr pptTmp = ppt;
|
|
|
|
int *pwidthTmp = pwidth;
|
|
|
|
int nptTmp = npt;
|
|
|
|
BoxRec box;
|
|
|
|
|
|
|
|
box.x1 = pptTmp->x;
|
|
|
|
box.x2 = box.x1 + *pwidthTmp;
|
|
|
|
box.y2 = box.y1 = pptTmp->y;
|
|
|
|
|
|
|
|
while (--nptTmp) {
|
|
|
|
pptTmp++;
|
|
|
|
pwidthTmp++;
|
|
|
|
if (box.x1 > pptTmp->x)
|
|
|
|
box.x1 = pptTmp->x;
|
|
|
|
if (box.x2 < (pptTmp->x + *pwidthTmp))
|
|
|
|
box.x2 = pptTmp->x + *pwidthTmp;
|
|
|
|
if (box.y1 > pptTmp->y)
|
|
|
|
box.y1 = pptTmp->y;
|
|
|
|
else if (box.y2 < pptTmp->y)
|
|
|
|
box.y2 = pptTmp->y;
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
box.y2++;
|
|
|
|
|
|
|
|
if (!pGC->miTranslate) {
|
|
|
|
TRANSLATE_BOX(box, pDrawable);
|
|
|
|
}
|
|
|
|
TRIM_BOX(box, pGC);
|
|
|
|
|
|
|
|
if (BOX_NOT_EMPTY(box))
|
|
|
|
damageDamageBox(pDrawable, &box, pGC->subWindowMode);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
(*pGC->ops->SetSpans) (pDrawable, pGC, pcharsrc, ppt, pwidth, npt, fSorted);
|
|
|
|
damageRegionProcessPending(pDrawable);
|
2004-07-29 16:42:24 +02:00
|
|
|
DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damagePutImage(DrawablePtr pDrawable,
|
|
|
|
GCPtr pGC,
|
|
|
|
int depth,
|
|
|
|
int x,
|
|
|
|
int y, int w, int h, int leftPad, int format, char *pImage)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
|
|
|
DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
|
2012-03-21 20:55:09 +01:00
|
|
|
if (checkGCDamage(pDrawable, pGC)) {
|
|
|
|
BoxRec box;
|
|
|
|
|
|
|
|
box.x1 = x + pDrawable->x;
|
|
|
|
box.x2 = box.x1 + w;
|
|
|
|
box.y1 = y + pDrawable->y;
|
|
|
|
box.y2 = box.y1 + h;
|
|
|
|
|
|
|
|
TRIM_BOX(box, pGC);
|
|
|
|
if (BOX_NOT_EMPTY(box))
|
|
|
|
damageDamageBox(pDrawable, &box, pGC->subWindowMode);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
(*pGC->ops->PutImage) (pDrawable, pGC, depth, x, y, w, h,
|
|
|
|
leftPad, format, pImage);
|
|
|
|
damageRegionProcessPending(pDrawable);
|
2004-07-29 16:42:24 +02:00
|
|
|
DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
|
|
|
|
}
|
|
|
|
|
|
|
|
static RegionPtr
|
2012-03-21 20:55:09 +01:00
|
|
|
damageCopyArea(DrawablePtr pSrc,
|
|
|
|
DrawablePtr pDst,
|
|
|
|
GC * pGC,
|
|
|
|
int srcx, int srcy, int width, int height, int dstx, int dsty)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
|
|
|
RegionPtr ret;
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2004-07-29 16:42:24 +02:00
|
|
|
DAMAGE_GC_OP_PROLOGUE(pGC, pDst);
|
2012-03-21 20:55:09 +01:00
|
|
|
|
|
|
|
if (checkGCDamage(pDst, pGC)) {
|
|
|
|
BoxRec box;
|
|
|
|
|
|
|
|
box.x1 = dstx + pDst->x;
|
|
|
|
box.x2 = box.x1 + width;
|
|
|
|
box.y1 = dsty + pDst->y;
|
|
|
|
box.y2 = box.y1 + height;
|
|
|
|
|
|
|
|
TRIM_BOX(box, pGC);
|
|
|
|
if (BOX_NOT_EMPTY(box))
|
|
|
|
damageDamageBox(pDst, &box, pGC->subWindowMode);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
ret = (*pGC->ops->CopyArea) (pSrc, pDst,
|
|
|
|
pGC, srcx, srcy, width, height, dstx, dsty);
|
|
|
|
damageRegionProcessPending(pDst);
|
2004-07-29 16:42:24 +02:00
|
|
|
DAMAGE_GC_OP_EPILOGUE(pGC, pDst);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static RegionPtr
|
2012-03-21 20:55:09 +01:00
|
|
|
damageCopyPlane(DrawablePtr pSrc,
|
|
|
|
DrawablePtr pDst,
|
|
|
|
GCPtr pGC,
|
|
|
|
int srcx,
|
|
|
|
int srcy,
|
|
|
|
int width,
|
|
|
|
int height, int dstx, int dsty, unsigned long bitPlane)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
|
|
|
RegionPtr ret;
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2004-07-29 16:42:24 +02:00
|
|
|
DAMAGE_GC_OP_PROLOGUE(pGC, pDst);
|
2004-08-12 03:57:51 +02:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (checkGCDamage(pDst, pGC)) {
|
|
|
|
BoxRec box;
|
2004-07-29 16:42:24 +02:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
box.x1 = dstx + pDst->x;
|
|
|
|
box.x2 = box.x1 + width;
|
|
|
|
box.y1 = dsty + pDst->y;
|
|
|
|
box.y2 = box.y1 + height;
|
2004-07-29 16:42:24 +02:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
TRIM_BOX(box, pGC);
|
|
|
|
if (BOX_NOT_EMPTY(box))
|
|
|
|
damageDamageBox(pDst, &box, pGC->subWindowMode);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
ret = (*pGC->ops->CopyPlane) (pSrc, pDst,
|
|
|
|
pGC, srcx, srcy, width, height, dstx, dsty,
|
|
|
|
bitPlane);
|
|
|
|
damageRegionProcessPending(pDst);
|
2004-07-29 16:42:24 +02:00
|
|
|
DAMAGE_GC_OP_EPILOGUE(pGC, pDst);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
damagePolyPoint(DrawablePtr pDrawable,
|
2012-03-21 20:55:09 +01:00
|
|
|
GCPtr pGC, int mode, int npt, xPoint * ppt)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
|
|
|
DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (npt && checkGCDamage(pDrawable, pGC)) {
|
|
|
|
BoxRec box;
|
|
|
|
int nptTmp = npt;
|
|
|
|
xPoint *pptTmp = ppt;
|
|
|
|
|
|
|
|
box.x2 = box.x1 = pptTmp->x;
|
|
|
|
box.y2 = box.y1 = pptTmp->y;
|
|
|
|
|
|
|
|
/* this could be slow if the points were spread out */
|
|
|
|
|
|
|
|
while (--nptTmp) {
|
|
|
|
pptTmp++;
|
|
|
|
if (box.x1 > pptTmp->x)
|
|
|
|
box.x1 = pptTmp->x;
|
|
|
|
else if (box.x2 < pptTmp->x)
|
|
|
|
box.x2 = pptTmp->x;
|
|
|
|
if (box.y1 > pptTmp->y)
|
|
|
|
box.y1 = pptTmp->y;
|
|
|
|
else if (box.y2 < pptTmp->y)
|
|
|
|
box.y2 = pptTmp->y;
|
|
|
|
}
|
2004-07-29 16:42:24 +02:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
box.x2++;
|
|
|
|
box.y2++;
|
2004-07-29 16:42:24 +02:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
TRIM_AND_TRANSLATE_BOX(box, pDrawable, pGC);
|
|
|
|
if (BOX_NOT_EMPTY(box))
|
|
|
|
damageDamageBox(pDrawable, &box, pGC->subWindowMode);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
(*pGC->ops->PolyPoint) (pDrawable, pGC, mode, npt, ppt);
|
|
|
|
damageRegionProcessPending(pDrawable);
|
2004-07-29 16:42:24 +02:00
|
|
|
DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
damagePolylines(DrawablePtr pDrawable,
|
2012-03-21 20:55:09 +01:00
|
|
|
GCPtr pGC, int mode, int npt, DDXPointPtr ppt)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
|
|
|
DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (npt && checkGCDamage(pDrawable, pGC)) {
|
|
|
|
int nptTmp = npt;
|
|
|
|
DDXPointPtr pptTmp = ppt;
|
|
|
|
BoxRec box;
|
|
|
|
int extra = pGC->lineWidth >> 1;
|
|
|
|
|
|
|
|
box.x2 = box.x1 = pptTmp->x;
|
|
|
|
box.y2 = box.y1 = pptTmp->y;
|
|
|
|
|
|
|
|
if (nptTmp > 1) {
|
|
|
|
if (pGC->joinStyle == JoinMiter)
|
|
|
|
extra = 6 * pGC->lineWidth;
|
|
|
|
else if (pGC->capStyle == CapProjecting)
|
|
|
|
extra = pGC->lineWidth;
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (mode == CoordModePrevious) {
|
|
|
|
int x = box.x1;
|
|
|
|
int y = box.y1;
|
|
|
|
|
|
|
|
while (--nptTmp) {
|
|
|
|
pptTmp++;
|
|
|
|
x += pptTmp->x;
|
|
|
|
y += pptTmp->y;
|
|
|
|
if (box.x1 > x)
|
|
|
|
box.x1 = x;
|
|
|
|
else if (box.x2 < x)
|
|
|
|
box.x2 = x;
|
|
|
|
if (box.y1 > y)
|
|
|
|
box.y1 = y;
|
|
|
|
else if (box.y2 < y)
|
|
|
|
box.y2 = y;
|
|
|
|
}
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
else {
|
|
|
|
while (--nptTmp) {
|
|
|
|
pptTmp++;
|
|
|
|
if (box.x1 > pptTmp->x)
|
|
|
|
box.x1 = pptTmp->x;
|
|
|
|
else if (box.x2 < pptTmp->x)
|
|
|
|
box.x2 = pptTmp->x;
|
|
|
|
if (box.y1 > pptTmp->y)
|
|
|
|
box.y1 = pptTmp->y;
|
|
|
|
else if (box.y2 < pptTmp->y)
|
|
|
|
box.y2 = pptTmp->y;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
box.x2++;
|
|
|
|
box.y2++;
|
2004-07-29 16:42:24 +02:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (extra) {
|
|
|
|
box.x1 -= extra;
|
|
|
|
box.x2 += extra;
|
|
|
|
box.y1 -= extra;
|
|
|
|
box.y2 += extra;
|
|
|
|
}
|
|
|
|
|
|
|
|
TRIM_AND_TRANSLATE_BOX(box, pDrawable, pGC);
|
|
|
|
if (BOX_NOT_EMPTY(box))
|
|
|
|
damageDamageBox(pDrawable, &box, pGC->subWindowMode);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
(*pGC->ops->Polylines) (pDrawable, pGC, mode, npt, ppt);
|
|
|
|
damageRegionProcessPending(pDrawable);
|
2004-07-29 16:42:24 +02:00
|
|
|
DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damagePolySegment(DrawablePtr pDrawable, GCPtr pGC, int nSeg, xSegment * pSeg)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
|
|
|
DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (nSeg && checkGCDamage(pDrawable, pGC)) {
|
|
|
|
BoxRec box;
|
|
|
|
int extra = pGC->lineWidth;
|
|
|
|
int nsegTmp = nSeg;
|
|
|
|
xSegment *pSegTmp = pSeg;
|
|
|
|
|
|
|
|
if (pGC->capStyle != CapProjecting)
|
|
|
|
extra >>= 1;
|
|
|
|
|
|
|
|
if (pSegTmp->x2 > pSegTmp->x1) {
|
|
|
|
box.x1 = pSegTmp->x1;
|
|
|
|
box.x2 = pSegTmp->x2;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
box.x2 = pSegTmp->x1;
|
|
|
|
box.x1 = pSegTmp->x2;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pSegTmp->y2 > pSegTmp->y1) {
|
|
|
|
box.y1 = pSegTmp->y1;
|
|
|
|
box.y2 = pSegTmp->y2;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
box.y2 = pSegTmp->y1;
|
|
|
|
box.y1 = pSegTmp->y2;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (--nsegTmp) {
|
|
|
|
pSegTmp++;
|
|
|
|
if (pSegTmp->x2 > pSegTmp->x1) {
|
|
|
|
if (pSegTmp->x1 < box.x1)
|
|
|
|
box.x1 = pSegTmp->x1;
|
|
|
|
if (pSegTmp->x2 > box.x2)
|
|
|
|
box.x2 = pSegTmp->x2;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (pSegTmp->x2 < box.x1)
|
|
|
|
box.x1 = pSegTmp->x2;
|
|
|
|
if (pSegTmp->x1 > box.x2)
|
|
|
|
box.x2 = pSegTmp->x1;
|
|
|
|
}
|
|
|
|
if (pSegTmp->y2 > pSegTmp->y1) {
|
|
|
|
if (pSegTmp->y1 < box.y1)
|
|
|
|
box.y1 = pSegTmp->y1;
|
|
|
|
if (pSegTmp->y2 > box.y2)
|
|
|
|
box.y2 = pSegTmp->y2;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (pSegTmp->y2 < box.y1)
|
|
|
|
box.y1 = pSegTmp->y2;
|
|
|
|
if (pSegTmp->y1 > box.y2)
|
|
|
|
box.y2 = pSegTmp->y1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
box.x2++;
|
|
|
|
box.y2++;
|
|
|
|
|
|
|
|
if (extra) {
|
|
|
|
box.x1 -= extra;
|
|
|
|
box.x2 += extra;
|
|
|
|
box.y1 -= extra;
|
|
|
|
box.y2 += extra;
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
TRIM_AND_TRANSLATE_BOX(box, pDrawable, pGC);
|
|
|
|
if (BOX_NOT_EMPTY(box))
|
|
|
|
damageDamageBox(pDrawable, &box, pGC->subWindowMode);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
(*pGC->ops->PolySegment) (pDrawable, pGC, nSeg, pSeg);
|
|
|
|
damageRegionProcessPending(pDrawable);
|
2004-07-29 16:42:24 +02:00
|
|
|
DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damagePolyRectangle(DrawablePtr pDrawable,
|
|
|
|
GCPtr pGC, int nRects, xRectangle *pRects)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
|
|
|
DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (nRects && checkGCDamage(pDrawable, pGC)) {
|
|
|
|
BoxRec box;
|
|
|
|
int offset1, offset2, offset3;
|
|
|
|
int nRectsTmp = nRects;
|
|
|
|
xRectangle *pRectsTmp = pRects;
|
|
|
|
|
|
|
|
offset2 = pGC->lineWidth;
|
|
|
|
if (!offset2)
|
|
|
|
offset2 = 1;
|
|
|
|
offset1 = offset2 >> 1;
|
|
|
|
offset3 = offset2 - offset1;
|
|
|
|
|
|
|
|
while (nRectsTmp--) {
|
|
|
|
box.x1 = pRectsTmp->x - offset1;
|
|
|
|
box.y1 = pRectsTmp->y - offset1;
|
|
|
|
box.x2 = box.x1 + pRectsTmp->width + offset2;
|
|
|
|
box.y2 = box.y1 + offset2;
|
|
|
|
TRIM_AND_TRANSLATE_BOX(box, pDrawable, pGC);
|
|
|
|
if (BOX_NOT_EMPTY(box))
|
|
|
|
damageDamageBox(pDrawable, &box, pGC->subWindowMode);
|
|
|
|
|
|
|
|
box.x1 = pRectsTmp->x - offset1;
|
|
|
|
box.y1 = pRectsTmp->y + offset3;
|
|
|
|
box.x2 = box.x1 + offset2;
|
|
|
|
box.y2 = box.y1 + pRectsTmp->height - offset2;
|
|
|
|
TRIM_AND_TRANSLATE_BOX(box, pDrawable, pGC);
|
|
|
|
if (BOX_NOT_EMPTY(box))
|
|
|
|
damageDamageBox(pDrawable, &box, pGC->subWindowMode);
|
|
|
|
|
|
|
|
box.x1 = pRectsTmp->x + pRectsTmp->width - offset1;
|
|
|
|
box.y1 = pRectsTmp->y + offset3;
|
|
|
|
box.x2 = box.x1 + offset2;
|
|
|
|
box.y2 = box.y1 + pRectsTmp->height - offset2;
|
|
|
|
TRIM_AND_TRANSLATE_BOX(box, pDrawable, pGC);
|
|
|
|
if (BOX_NOT_EMPTY(box))
|
|
|
|
damageDamageBox(pDrawable, &box, pGC->subWindowMode);
|
|
|
|
|
|
|
|
box.x1 = pRectsTmp->x - offset1;
|
|
|
|
box.y1 = pRectsTmp->y + pRectsTmp->height - offset1;
|
|
|
|
box.x2 = box.x1 + pRectsTmp->width + offset2;
|
|
|
|
box.y2 = box.y1 + offset2;
|
|
|
|
TRIM_AND_TRANSLATE_BOX(box, pDrawable, pGC);
|
|
|
|
if (BOX_NOT_EMPTY(box))
|
|
|
|
damageDamageBox(pDrawable, &box, pGC->subWindowMode);
|
|
|
|
|
|
|
|
pRectsTmp++;
|
|
|
|
}
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
(*pGC->ops->PolyRectangle) (pDrawable, pGC, nRects, pRects);
|
|
|
|
damageRegionProcessPending(pDrawable);
|
2004-07-29 16:42:24 +02:00
|
|
|
DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damagePolyArc(DrawablePtr pDrawable, GCPtr pGC, int nArcs, xArc * pArcs)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
|
|
|
DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (nArcs && checkGCDamage(pDrawable, pGC)) {
|
|
|
|
int extra = pGC->lineWidth >> 1;
|
|
|
|
BoxRec box;
|
|
|
|
int nArcsTmp = nArcs;
|
|
|
|
xArc *pArcsTmp = pArcs;
|
|
|
|
|
|
|
|
box.x1 = pArcsTmp->x;
|
|
|
|
box.x2 = box.x1 + pArcsTmp->width;
|
|
|
|
box.y1 = pArcsTmp->y;
|
|
|
|
box.y2 = box.y1 + pArcsTmp->height;
|
|
|
|
|
|
|
|
while (--nArcsTmp) {
|
|
|
|
pArcsTmp++;
|
|
|
|
if (box.x1 > pArcsTmp->x)
|
|
|
|
box.x1 = pArcsTmp->x;
|
|
|
|
if (box.x2 < (pArcsTmp->x + pArcsTmp->width))
|
|
|
|
box.x2 = pArcsTmp->x + pArcsTmp->width;
|
|
|
|
if (box.y1 > pArcsTmp->y)
|
|
|
|
box.y1 = pArcsTmp->y;
|
|
|
|
if (box.y2 < (pArcsTmp->y + pArcsTmp->height))
|
|
|
|
box.y2 = pArcsTmp->y + pArcsTmp->height;
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (extra) {
|
|
|
|
box.x1 -= extra;
|
|
|
|
box.x2 += extra;
|
|
|
|
box.y1 -= extra;
|
|
|
|
box.y2 += extra;
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
box.x2++;
|
|
|
|
box.y2++;
|
2004-07-29 16:42:24 +02:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
TRIM_AND_TRANSLATE_BOX(box, pDrawable, pGC);
|
|
|
|
if (BOX_NOT_EMPTY(box))
|
|
|
|
damageDamageBox(pDrawable, &box, pGC->subWindowMode);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
(*pGC->ops->PolyArc) (pDrawable, pGC, nArcs, pArcs);
|
|
|
|
damageRegionProcessPending(pDrawable);
|
2004-07-29 16:42:24 +02:00
|
|
|
DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damageFillPolygon(DrawablePtr pDrawable,
|
|
|
|
GCPtr pGC, int shape, int mode, int npt, DDXPointPtr ppt)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
|
|
|
DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (npt > 2 && checkGCDamage(pDrawable, pGC)) {
|
|
|
|
DDXPointPtr pptTmp = ppt;
|
|
|
|
int nptTmp = npt;
|
|
|
|
BoxRec box;
|
|
|
|
|
|
|
|
box.x2 = box.x1 = pptTmp->x;
|
|
|
|
box.y2 = box.y1 = pptTmp->y;
|
|
|
|
|
|
|
|
if (mode != CoordModeOrigin) {
|
|
|
|
int x = box.x1;
|
|
|
|
int y = box.y1;
|
|
|
|
|
|
|
|
while (--nptTmp) {
|
|
|
|
pptTmp++;
|
|
|
|
x += pptTmp->x;
|
|
|
|
y += pptTmp->y;
|
|
|
|
if (box.x1 > x)
|
|
|
|
box.x1 = x;
|
|
|
|
else if (box.x2 < x)
|
|
|
|
box.x2 = x;
|
|
|
|
if (box.y1 > y)
|
|
|
|
box.y1 = y;
|
|
|
|
else if (box.y2 < y)
|
|
|
|
box.y2 = y;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
while (--nptTmp) {
|
|
|
|
pptTmp++;
|
|
|
|
if (box.x1 > pptTmp->x)
|
|
|
|
box.x1 = pptTmp->x;
|
|
|
|
else if (box.x2 < pptTmp->x)
|
|
|
|
box.x2 = pptTmp->x;
|
|
|
|
if (box.y1 > pptTmp->y)
|
|
|
|
box.y1 = pptTmp->y;
|
|
|
|
else if (box.y2 < pptTmp->y)
|
|
|
|
box.y2 = pptTmp->y;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
box.x2++;
|
|
|
|
box.y2++;
|
|
|
|
|
|
|
|
TRIM_AND_TRANSLATE_BOX(box, pDrawable, pGC);
|
|
|
|
if (BOX_NOT_EMPTY(box))
|
|
|
|
damageDamageBox(pDrawable, &box, pGC->subWindowMode);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
|
|
|
|
(*pGC->ops->FillPolygon) (pDrawable, pGC, shape, mode, npt, ppt);
|
|
|
|
damageRegionProcessPending(pDrawable);
|
2004-07-29 16:42:24 +02:00
|
|
|
DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damagePolyFillRect(DrawablePtr pDrawable,
|
|
|
|
GCPtr pGC, int nRects, xRectangle *pRects)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
|
|
|
DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
|
2012-03-21 20:55:09 +01:00
|
|
|
if (nRects && checkGCDamage(pDrawable, pGC)) {
|
|
|
|
BoxRec box;
|
|
|
|
xRectangle *pRectsTmp = pRects;
|
|
|
|
int nRectsTmp = nRects;
|
|
|
|
|
|
|
|
box.x1 = pRectsTmp->x;
|
|
|
|
box.x2 = box.x1 + pRectsTmp->width;
|
|
|
|
box.y1 = pRectsTmp->y;
|
|
|
|
box.y2 = box.y1 + pRectsTmp->height;
|
|
|
|
|
|
|
|
while (--nRectsTmp) {
|
|
|
|
pRectsTmp++;
|
|
|
|
if (box.x1 > pRectsTmp->x)
|
|
|
|
box.x1 = pRectsTmp->x;
|
|
|
|
if (box.x2 < (pRectsTmp->x + pRectsTmp->width))
|
|
|
|
box.x2 = pRectsTmp->x + pRectsTmp->width;
|
|
|
|
if (box.y1 > pRectsTmp->y)
|
|
|
|
box.y1 = pRectsTmp->y;
|
|
|
|
if (box.y2 < (pRectsTmp->y + pRectsTmp->height))
|
|
|
|
box.y2 = pRectsTmp->y + pRectsTmp->height;
|
|
|
|
}
|
|
|
|
|
|
|
|
TRIM_AND_TRANSLATE_BOX(box, pDrawable, pGC);
|
|
|
|
if (BOX_NOT_EMPTY(box))
|
|
|
|
damageDamageBox(pDrawable, &box, pGC->subWindowMode);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
(*pGC->ops->PolyFillRect) (pDrawable, pGC, nRects, pRects);
|
|
|
|
damageRegionProcessPending(pDrawable);
|
2004-07-29 16:42:24 +02:00
|
|
|
DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damagePolyFillArc(DrawablePtr pDrawable, GCPtr pGC, int nArcs, xArc * pArcs)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
|
|
|
DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (nArcs && checkGCDamage(pDrawable, pGC)) {
|
|
|
|
BoxRec box;
|
|
|
|
int nArcsTmp = nArcs;
|
|
|
|
xArc *pArcsTmp = pArcs;
|
|
|
|
|
|
|
|
box.x1 = pArcsTmp->x;
|
|
|
|
box.x2 = box.x1 + pArcsTmp->width;
|
|
|
|
box.y1 = pArcsTmp->y;
|
|
|
|
box.y2 = box.y1 + pArcsTmp->height;
|
|
|
|
|
|
|
|
while (--nArcsTmp) {
|
|
|
|
pArcsTmp++;
|
|
|
|
if (box.x1 > pArcsTmp->x)
|
|
|
|
box.x1 = pArcsTmp->x;
|
|
|
|
if (box.x2 < (pArcsTmp->x + pArcsTmp->width))
|
|
|
|
box.x2 = pArcsTmp->x + pArcsTmp->width;
|
|
|
|
if (box.y1 > pArcsTmp->y)
|
|
|
|
box.y1 = pArcsTmp->y;
|
|
|
|
if (box.y2 < (pArcsTmp->y + pArcsTmp->height))
|
|
|
|
box.y2 = pArcsTmp->y + pArcsTmp->height;
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
TRIM_AND_TRANSLATE_BOX(box, pDrawable, pGC);
|
|
|
|
if (BOX_NOT_EMPTY(box))
|
|
|
|
damageDamageBox(pDrawable, &box, pGC->subWindowMode);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
(*pGC->ops->PolyFillArc) (pDrawable, pGC, nArcs, pArcs);
|
|
|
|
damageRegionProcessPending(pDrawable);
|
2004-07-29 16:42:24 +02:00
|
|
|
DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* general Poly/Image text function. Extract glyph information,
|
|
|
|
* compute bounding box and remove cursor if it is overlapped.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damageDamageChars(DrawablePtr pDrawable,
|
|
|
|
FontPtr font,
|
|
|
|
int x,
|
|
|
|
int y,
|
|
|
|
unsigned int n,
|
|
|
|
CharInfoPtr * charinfo, Bool imageblt, int subWindowMode)
|
|
|
|
{
|
|
|
|
ExtentInfoRec extents;
|
|
|
|
BoxRec box;
|
2004-07-29 16:42:24 +02:00
|
|
|
|
|
|
|
QueryGlyphExtents(font, charinfo, n, &extents);
|
2012-03-21 20:55:09 +01:00
|
|
|
if (imageblt) {
|
|
|
|
if (extents.overallWidth > extents.overallRight)
|
|
|
|
extents.overallRight = extents.overallWidth;
|
|
|
|
if (extents.overallWidth < extents.overallLeft)
|
|
|
|
extents.overallLeft = extents.overallWidth;
|
|
|
|
if (extents.overallLeft > 0)
|
|
|
|
extents.overallLeft = 0;
|
|
|
|
if (extents.fontAscent > extents.overallAscent)
|
|
|
|
extents.overallAscent = extents.fontAscent;
|
|
|
|
if (extents.fontDescent > extents.overallDescent)
|
|
|
|
extents.overallDescent = extents.fontDescent;
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
box.x1 = x + extents.overallLeft;
|
|
|
|
box.y1 = y - extents.overallAscent;
|
|
|
|
box.x2 = x + extents.overallRight;
|
|
|
|
box.y2 = y + extents.overallDescent;
|
2012-03-21 20:55:09 +01:00
|
|
|
damageDamageBox(pDrawable, &box, subWindowMode);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* values for textType:
|
|
|
|
*/
|
|
|
|
#define TT_POLY8 0
|
|
|
|
#define TT_IMAGE8 1
|
|
|
|
#define TT_POLY16 2
|
|
|
|
#define TT_IMAGE16 3
|
|
|
|
|
2013-08-21 17:13:11 +02:00
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damageText(DrawablePtr pDrawable,
|
|
|
|
GCPtr pGC,
|
|
|
|
int x,
|
|
|
|
int y,
|
|
|
|
unsigned long count,
|
|
|
|
char *chars, FontEncoding fontEncoding, Bool textType)
|
|
|
|
{
|
|
|
|
CharInfoPtr *charinfo;
|
|
|
|
unsigned long i;
|
|
|
|
unsigned int n;
|
|
|
|
Bool imageblt;
|
2004-07-29 16:42:24 +02:00
|
|
|
|
|
|
|
imageblt = (textType == TT_IMAGE8) || (textType == TT_IMAGE16);
|
|
|
|
|
2013-08-21 17:13:11 +02:00
|
|
|
if (!checkGCDamage(pDrawable, pGC))
|
|
|
|
return;
|
|
|
|
|
2010-05-05 20:44:06 +02:00
|
|
|
charinfo = malloc(count * sizeof(CharInfoPtr));
|
2004-07-29 16:42:24 +02:00
|
|
|
if (!charinfo)
|
2013-08-21 17:13:11 +02:00
|
|
|
return;
|
2004-07-29 16:42:24 +02:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
GetGlyphs(pGC->font, count, (unsigned char *) chars,
|
|
|
|
fontEncoding, &i, charinfo);
|
|
|
|
n = (unsigned int) i;
|
2004-07-29 16:42:24 +02:00
|
|
|
|
|
|
|
if (n != 0) {
|
2012-03-21 20:55:09 +01:00
|
|
|
damageDamageChars(pDrawable, pGC->font, x + pDrawable->x,
|
|
|
|
y + pDrawable->y, n, charinfo, imageblt,
|
|
|
|
pGC->subWindowMode);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2010-05-05 20:44:06 +02:00
|
|
|
free(charinfo);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
damagePolyText8(DrawablePtr pDrawable,
|
2012-03-21 20:55:09 +01:00
|
|
|
GCPtr pGC, int x, int y, int count, char *chars)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
|
|
|
DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
|
2013-08-21 17:13:11 +02:00
|
|
|
damageText(pDrawable, pGC, x, y, (unsigned long) count, chars, Linear8Bit,
|
|
|
|
TT_POLY8);
|
|
|
|
x = (*pGC->ops->PolyText8) (pDrawable, pGC, x, y, count, chars);
|
2012-03-21 20:55:09 +01:00
|
|
|
damageRegionProcessPending(pDrawable);
|
2004-07-29 16:42:24 +02:00
|
|
|
DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
|
|
|
|
return x;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2012-03-21 20:55:09 +01:00
|
|
|
damagePolyText16(DrawablePtr pDrawable,
|
|
|
|
GCPtr pGC, int x, int y, int count, unsigned short *chars)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
|
|
|
DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
|
2013-08-21 17:13:11 +02:00
|
|
|
damageText(pDrawable, pGC, x, y, (unsigned long) count, (char *) chars,
|
|
|
|
FONTLASTROW(pGC->font) == 0 ? Linear16Bit : TwoD16Bit,
|
|
|
|
TT_POLY16);
|
|
|
|
x = (*pGC->ops->PolyText16) (pDrawable, pGC, x, y, count, chars);
|
2012-03-21 20:55:09 +01:00
|
|
|
damageRegionProcessPending(pDrawable);
|
2004-07-29 16:42:24 +02:00
|
|
|
DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
|
|
|
|
return x;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damageImageText8(DrawablePtr pDrawable,
|
|
|
|
GCPtr pGC, int x, int y, int count, char *chars)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
|
|
|
DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
|
2013-08-21 17:13:11 +02:00
|
|
|
damageText(pDrawable, pGC, x, y, (unsigned long) count, chars, Linear8Bit,
|
|
|
|
TT_IMAGE8);
|
|
|
|
(*pGC->ops->ImageText8) (pDrawable, pGC, x, y, count, chars);
|
2012-03-21 20:55:09 +01:00
|
|
|
damageRegionProcessPending(pDrawable);
|
2004-07-29 16:42:24 +02:00
|
|
|
DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damageImageText16(DrawablePtr pDrawable,
|
|
|
|
GCPtr pGC, int x, int y, int count, unsigned short *chars)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
|
|
|
DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
|
2013-08-21 17:13:11 +02:00
|
|
|
damageText(pDrawable, pGC, x, y, (unsigned long) count, (char *) chars,
|
|
|
|
FONTLASTROW(pGC->font) == 0 ? Linear16Bit : TwoD16Bit,
|
|
|
|
TT_IMAGE16);
|
|
|
|
(*pGC->ops->ImageText16) (pDrawable, pGC, x, y, count, chars);
|
2012-03-21 20:55:09 +01:00
|
|
|
damageRegionProcessPending(pDrawable);
|
2004-07-29 16:42:24 +02:00
|
|
|
DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damageImageGlyphBlt(DrawablePtr pDrawable,
|
|
|
|
GCPtr pGC,
|
|
|
|
int x,
|
|
|
|
int y,
|
2013-12-15 10:05:51 +01:00
|
|
|
unsigned int nglyph, CharInfoPtr * ppci, void *pglyphBase)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
|
|
|
DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
|
2012-03-21 20:55:09 +01:00
|
|
|
damageDamageChars(pDrawable, pGC->font, x + pDrawable->x, y + pDrawable->y,
|
|
|
|
nglyph, ppci, TRUE, pGC->subWindowMode);
|
|
|
|
(*pGC->ops->ImageGlyphBlt) (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
|
|
|
|
damageRegionProcessPending(pDrawable);
|
2004-07-29 16:42:24 +02:00
|
|
|
DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damagePolyGlyphBlt(DrawablePtr pDrawable,
|
|
|
|
GCPtr pGC,
|
|
|
|
int x,
|
|
|
|
int y,
|
2013-12-15 10:05:51 +01:00
|
|
|
unsigned int nglyph, CharInfoPtr * ppci, void *pglyphBase)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
|
|
|
DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
|
2012-03-21 20:55:09 +01:00
|
|
|
damageDamageChars(pDrawable, pGC->font, x + pDrawable->x, y + pDrawable->y,
|
|
|
|
nglyph, ppci, FALSE, pGC->subWindowMode);
|
|
|
|
(*pGC->ops->PolyGlyphBlt) (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
|
|
|
|
damageRegionProcessPending(pDrawable);
|
2004-07-29 16:42:24 +02:00
|
|
|
DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damagePushPixels(GCPtr pGC,
|
|
|
|
PixmapPtr pBitMap,
|
|
|
|
DrawablePtr pDrawable, int dx, int dy, int xOrg, int yOrg)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
|
|
|
DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
|
2012-03-21 20:55:09 +01:00
|
|
|
if (checkGCDamage(pDrawable, pGC)) {
|
|
|
|
BoxRec box;
|
2004-07-29 16:42:24 +02:00
|
|
|
|
|
|
|
box.x1 = xOrg;
|
|
|
|
box.y1 = yOrg;
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (!pGC->miTranslate) {
|
|
|
|
box.x1 += pDrawable->x;
|
|
|
|
box.y1 += pDrawable->y;
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
box.x2 = box.x1 + dx;
|
|
|
|
box.y2 = box.y1 + dy;
|
2004-07-29 16:42:24 +02:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
TRIM_BOX(box, pGC);
|
|
|
|
if (BOX_NOT_EMPTY(box))
|
|
|
|
damageDamageBox(pDrawable, &box, pGC->subWindowMode);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
(*pGC->ops->PushPixels) (pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg);
|
|
|
|
damageRegionProcessPending(pDrawable);
|
2004-07-29 16:42:24 +02:00
|
|
|
DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damageRemoveDamage(DamagePtr * pPrev, DamagePtr pDamage)
|
|
|
|
{
|
|
|
|
while (*pPrev) {
|
|
|
|
if (*pPrev == pDamage) {
|
|
|
|
*pPrev = pDamage->pNext;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
pPrev = &(*pPrev)->pNext;
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2004-07-31 03:38:46 +02:00
|
|
|
#if DAMAGE_VALIDATE_ENABLE
|
2012-03-21 20:55:09 +01:00
|
|
|
ErrorF("Damage not on list\n");
|
|
|
|
OsAbort();
|
2004-07-31 03:38:46 +02:00
|
|
|
#endif
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damageInsertDamage(DamagePtr * pPrev, DamagePtr pDamage)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
2004-07-31 03:38:46 +02:00
|
|
|
#if DAMAGE_VALIDATE_ENABLE
|
2012-03-21 20:55:09 +01:00
|
|
|
DamagePtr pOld;
|
2004-07-31 03:38:46 +02:00
|
|
|
|
|
|
|
for (pOld = *pPrev; pOld; pOld = pOld->pNext)
|
2012-03-21 20:55:09 +01:00
|
|
|
if (pOld == pDamage) {
|
|
|
|
ErrorF("Damage already on list\n");
|
|
|
|
OsAbort();
|
|
|
|
}
|
2004-07-31 03:38:46 +02:00
|
|
|
#endif
|
2004-07-29 16:42:24 +02:00
|
|
|
pDamage->pNext = *pPrev;
|
|
|
|
*pPrev = pDamage;
|
|
|
|
}
|
|
|
|
|
|
|
|
static Bool
|
2012-03-21 20:55:09 +01:00
|
|
|
damageDestroyPixmap(PixmapPtr pPixmap)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
ScreenPtr pScreen = pPixmap->drawable.pScreen;
|
|
|
|
|
2004-07-29 16:42:24 +02:00
|
|
|
damageScrPriv(pScreen);
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (pPixmap->refcnt == 1) {
|
|
|
|
DamagePtr *pPrev = getPixmapDamageRef(pPixmap);
|
|
|
|
DamagePtr pDamage;
|
|
|
|
|
|
|
|
while ((pDamage = *pPrev)) {
|
|
|
|
damageRemoveDamage(pPrev, pDamage);
|
|
|
|
if (!pDamage->isWindow)
|
|
|
|
DamageDestroy(pDamage);
|
|
|
|
}
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
unwrap(pScrPriv, pScreen, DestroyPixmap);
|
2004-07-29 16:42:24 +02:00
|
|
|
(*pScreen->DestroyPixmap) (pPixmap);
|
2012-03-21 20:55:09 +01:00
|
|
|
wrap(pScrPriv, pScreen, DestroyPixmap, damageDestroyPixmap);
|
2004-07-29 16:42:24 +02:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damageCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
|
|
|
ScreenPtr pScreen = pWindow->drawable.pScreen;
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2004-07-29 16:42:24 +02:00
|
|
|
damageScrPriv(pScreen);
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (getWindowDamage(pWindow)) {
|
|
|
|
int dx = pWindow->drawable.x - ptOldOrg.x;
|
|
|
|
int dy = pWindow->drawable.y - ptOldOrg.y;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The region comes in source relative, but the damage occurs
|
|
|
|
* at the destination location. Translate back and forth.
|
|
|
|
*/
|
|
|
|
RegionTranslate(prgnSrc, dx, dy);
|
|
|
|
damageRegionAppend(&pWindow->drawable, prgnSrc, FALSE, -1);
|
|
|
|
RegionTranslate(prgnSrc, -dx, -dy);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
unwrap(pScrPriv, pScreen, CopyWindow);
|
2004-07-29 16:42:24 +02:00
|
|
|
(*pScreen->CopyWindow) (pWindow, ptOldOrg, prgnSrc);
|
2012-03-21 20:55:09 +01:00
|
|
|
damageRegionProcessPending(&pWindow->drawable);
|
|
|
|
wrap(pScrPriv, pScreen, CopyWindow, damageCopyWindow);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
2007-03-25 18:27:01 +02:00
|
|
|
static GCOps damageGCOps = {
|
2004-07-29 16:42:24 +02:00
|
|
|
damageFillSpans, damageSetSpans,
|
|
|
|
damagePutImage, damageCopyArea,
|
|
|
|
damageCopyPlane, damagePolyPoint,
|
|
|
|
damagePolylines, damagePolySegment,
|
|
|
|
damagePolyRectangle, damagePolyArc,
|
|
|
|
damageFillPolygon, damagePolyFillRect,
|
|
|
|
damagePolyFillArc, damagePolyText8,
|
|
|
|
damagePolyText16, damageImageText8,
|
|
|
|
damageImageText16, damageImageGlyphBlt,
|
|
|
|
damagePolyGlyphBlt, damagePushPixels,
|
|
|
|
};
|
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
damageSetWindowPixmap(WindowPtr pWindow, PixmapPtr pPixmap)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
DamagePtr pDamage;
|
|
|
|
ScreenPtr pScreen = pWindow->drawable.pScreen;
|
|
|
|
|
2004-07-29 16:42:24 +02:00
|
|
|
damageScrPriv(pScreen);
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if ((pDamage = damageGetWinPriv(pWindow))) {
|
|
|
|
PixmapPtr pOldPixmap = (*pScreen->GetWindowPixmap) (pWindow);
|
|
|
|
DamagePtr *pPrev = getPixmapDamageRef(pOldPixmap);
|
|
|
|
|
|
|
|
while (pDamage) {
|
|
|
|
damageRemoveDamage(pPrev, pDamage);
|
|
|
|
pDamage = pDamage->pNextWin;
|
|
|
|
}
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
unwrap(pScrPriv, pScreen, SetWindowPixmap);
|
2004-07-29 16:42:24 +02:00
|
|
|
(*pScreen->SetWindowPixmap) (pWindow, pPixmap);
|
2012-03-21 20:55:09 +01:00
|
|
|
wrap(pScrPriv, pScreen, SetWindowPixmap, damageSetWindowPixmap);
|
|
|
|
if ((pDamage = damageGetWinPriv(pWindow))) {
|
|
|
|
DamagePtr *pPrev = getPixmapDamageRef(pPixmap);
|
|
|
|
|
|
|
|
while (pDamage) {
|
|
|
|
damageInsertDamage(pPrev, pDamage);
|
|
|
|
pDamage = pDamage->pNextWin;
|
|
|
|
}
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static Bool
|
2012-03-21 20:55:09 +01:00
|
|
|
damageDestroyWindow(WindowPtr pWindow)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
DamagePtr pDamage;
|
|
|
|
ScreenPtr pScreen = pWindow->drawable.pScreen;
|
|
|
|
Bool ret;
|
|
|
|
|
2004-07-29 16:42:24 +02:00
|
|
|
damageScrPriv(pScreen);
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
while ((pDamage = damageGetWinPriv(pWindow))) {
|
|
|
|
DamageDestroy(pDamage);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
unwrap(pScrPriv, pScreen, DestroyWindow);
|
2004-07-29 16:42:24 +02:00
|
|
|
ret = (*pScreen->DestroyWindow) (pWindow);
|
2012-03-21 20:55:09 +01:00
|
|
|
wrap(pScrPriv, pScreen, DestroyWindow, damageDestroyWindow);
|
2004-07-29 16:42:24 +02:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static Bool
|
api: rework the X server driver API to avoid global arrays.
This is a squash merge containing all the API changes, as
well as the video ABI bump.
Its been squashed to make bisection easier.
Full patch log below:
commit b202738bbf0c5a1c1172767119c2c71f1e7f8070
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon May 14 15:16:11 2012 -0700
xfree86: Bump video ABI to 13.0
The ABI was broken by changes to convert from screen index numbers to ScreenPtr
/ ScrnInfoPtr in various structures and function signatures.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3d5f7d9f8d408bcad3f83277d255f25d3b0edbf3
Author: Dave Airlie <airlied@redhat.com>
Date: Thu May 24 10:56:57 2012 +0100
xf86: xf86ClearEntityListForScreen should take a pScrn
When adding GPU screens this make life easier.
(also fix comment, as pointed out by Alan)
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit afee8b5ab4501597ecc1ade34124d7ca227ab055
Author: Dave Airlie <airlied@redhat.com>
Date: Thu May 24 07:07:32 2012 +0100
xf86i2c: add pscrn for drivers to use
This just adds a pScrn pointer into the struct for the drivers to use
instead of scrnIndex. Mostly scrnIndex is used for logging, but some
drivers use it to lookup xf86Screens, so let them stash a pScrn instead.
Removing the scrnIndex is a bit more involved and I'm not sure its worth
the effort. Doing i2c in the X server is legacy code as far as I'm concerned.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit ea5092f1f679691d187f1eee9427e6057beec56e
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 19:25:20 2012 +0100
dix/gc: consolidate GC object creation in one place
The standard GC create and scratch GC create were 90% the same really,
and I have a need in the future for creating GC objects without the
other bits, so wanted to avoid a third copy.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3d91482ea9b4883e64e496f2768168e0ffa21ba1
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 10:24:06 2012 +0100
xf86: add a define to denote the new non-index interfaces are being used
This can be used by drivers to provide compatible APIs.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 37c3ae3e6cd4f3dedc72f371096d6743f8f99df3
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 15:09:12 2012 +0100
dix: make Create/Free scratch pixmaps take a ScreenPtr
While technically an API/ABI change I doubt anyone uses it,
but it helps in splitting screens up.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 75f2062a3fe94f04764ecc7d2ff2fbbeccb9da60
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 14:57:55 2012 +0100
xf86/xv: remove scrnIndexfrom xf86FindXvOptions.
Move this interface to taking an ScrnInfoPtr.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit f80c2374f40ea7b2ee0556e2e76cc07406f3d843
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 14:53:59 2012 +0100
xf86: make xf86DeleteScreen take a ScrnInfoPtr (v2)
stop passing indices into this function.
v2: drop flags argument.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 58824e414f35682435f15bfe6c4b656bd90b9235
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 14:48:09 2012 +0100
xf86: fix xf86IsScreenPrimary interface to take a pScrn (API/ABI)
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 6b4fc1f9d391bcdf7ca288766e49bce60f4635cd
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:18:59 2012 +0100
xserver: convert block/wakeup handlers to passing ScreenPtr (ABI/API) (v2)
Instead of passing an index, pass the actual ScreenPtr. This allows
more moving towards not abusing xf86Screens + screenInfo.
v2: drop the blockData/wakeupData args as per ajax's suggestion.,
fix docs.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 790d003de20fb47674420a24dadd92412d78620d
Author: Dave Airlie <airlied@gmail.com>
Date: Wed Apr 11 09:53:14 2012 +0100
xf86/common: remove some more pScrn->pScreen uses
remove some more conversions that appeared after api cleanups.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit aac85e18d1dd093f2cad6bd29375e40bd7af0b8f
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 16:34:53 2012 +0100
ddc: change API to take ScrnInfoPtr (v2)
This removes all xf86Screens usage from ddc code,
it modifies the API for some functions to avoid taking indices.
v2: address Alan's comments about dropping DDC2Init parameter.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit fe3f57b6eaf6860a33876a54f9439f69578f03a5
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 16:31:26 2012 +0100
vbe: don't use index for VBEInterpretPanelID (API)
Remove use of xf86screens from vbe module.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit abf1965f4ed91529036d3fdb470d6a3ce6f29675
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 16:25:11 2012 +0100
int10/vbe: don't use xf86Screens. (ABI) (v3)
Pass the ScrnInfoPtr instead of the index in the int10 struct.
This saves us using it to dereference xf86Screens.
v2: address Alan's comment to fix struct alignment.
v3: squash in all the int10 fixes, test the vm86 code builds,
after comments by Keith.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 23cca612b4fb5efc33683c7624b803b457387e3d
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:30:18 2012 +0100
xserver: drop index argument to ScreenInit (ABI/API) (v2)
This drops the index argument, its the same as pScreen->myNum,
and its the last major index abuse I can find.
v2: address Alan's review - update docs, fix xwin/xnest/darwin
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 40d360e2d7e832407f3ed64e3a02c27ecc89a960
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:23:01 2012 +0100
xf86: migrate PointerMoved from index to ScrnInfoPtr (ABI/API)
This migrates PointerMoved from an index to ScrnInfoPtr.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit aa60a2f38679d0eeb979a9c2648c9bc771409bf9
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:20:46 2012 +0100
xf86: migrate PMEvent to a ScrnInfoPtr (ABI/API)
This migrates the PMEvent from index to ScrnInfoPtr.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit d3f28ef44371ed4a039ffc5dd7eb6408d1269ba2
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:18:30 2012 +0100
xf86: migrate SetDGAMode from index to ScrnInfoPtr (ABI/API)
This migrates the SetDGAMode callback from an index to ScrnInfoPtr.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit baf5e4818a74f2b68c3dfdcc56f54322351039a0
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:14:11 2012 +0100
xf86: migrate ChangeGamma from index to ScrnInfoPtr (ABI/API) (v2)
This migrates the ChangeGamma interface to avoid passing a index.
v2: fix xf86RandR12.c + xf86cmap.c call
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 51e5f90ada929d6b23176090badbb42fdb3fa550
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:11:09 2012 +0100
xf86/exa: migrate index to screen types for EnableDisableFBAccess (ABI/API)
The EXA interface migrates to ScreenPtr,
and the xf86 interface migrated to ScrnInfoPtr.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 94f1f21d17e86f96d4a54292a399160950087675
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:02:11 2012 +0100
xf86: migrate ValidMode callback to ScrnInfoPtr (ABI/API)
This migrates the ValidMode to passing a ScrnInfoPtr instead
of an index.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3f8f18198fed4f39ec805b508a3482e91eea26b2
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:59:46 2012 +0100
xf86: migrate SwitchMode to taking ScrnInfoPtr (ABI/API) (v2)
This migrate the SwitchMode interface to take a ScrnInfoPtr
instead of an index.
v2: drop flags.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit d06a038a5c49328ab3a8d969d24f9fcd22c63202
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:50:37 2012 +0100
xf86: move AdjustFrame to passing ScrnInfoPtr (ABI/API) (v2)
This converts AdjustFrame code paths to passing a ScrnInfoPtr
instead of an integer index.
v2: drop flags args.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 53d2f8608ffd4090d08e7d5cf2e92fb954959b90
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:41:27 2012 +0100
xf86: modify FreeScreen callback to take pScrn instead of index. (ABI/API) (v2)
Another index->pScrn conversion.
v2: drop flags arg.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 60db37c0b247052e0f5c54b1921fe58a3609c2e3
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:35:41 2012 +0100
xf86: change EnterVT/LeaveVT to take a ScrnInfoPtr (ABI/API break) (v2)
This modifies the EnterVT/LeaveVT interfaces to take a ScrnInfoPtr
instead of an index into xf86Screens. This allows dropping more
public dereferences of the xf86Screens and screenInfo.
v2: drop flags args as suggested by Keith, fix docs.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 06729dbbc804a20242e6499f446acb5d94023c3c
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:04:59 2012 +0100
xserver: remove index from CloseScreen (API/ABI breakage)
This drops the index from the CloseScreen callback,
its always been useless really, since the pScreen contains it.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2012-06-05 14:22:18 +02:00
|
|
|
damageCloseScreen(ScreenPtr pScreen)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
|
|
|
damageScrPriv(pScreen);
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
unwrap(pScrPriv, pScreen, DestroyPixmap);
|
|
|
|
unwrap(pScrPriv, pScreen, CreateGC);
|
|
|
|
unwrap(pScrPriv, pScreen, CopyWindow);
|
|
|
|
unwrap(pScrPriv, pScreen, CloseScreen);
|
2010-05-05 20:44:06 +02:00
|
|
|
free(pScrPriv);
|
api: rework the X server driver API to avoid global arrays.
This is a squash merge containing all the API changes, as
well as the video ABI bump.
Its been squashed to make bisection easier.
Full patch log below:
commit b202738bbf0c5a1c1172767119c2c71f1e7f8070
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon May 14 15:16:11 2012 -0700
xfree86: Bump video ABI to 13.0
The ABI was broken by changes to convert from screen index numbers to ScreenPtr
/ ScrnInfoPtr in various structures and function signatures.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3d5f7d9f8d408bcad3f83277d255f25d3b0edbf3
Author: Dave Airlie <airlied@redhat.com>
Date: Thu May 24 10:56:57 2012 +0100
xf86: xf86ClearEntityListForScreen should take a pScrn
When adding GPU screens this make life easier.
(also fix comment, as pointed out by Alan)
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit afee8b5ab4501597ecc1ade34124d7ca227ab055
Author: Dave Airlie <airlied@redhat.com>
Date: Thu May 24 07:07:32 2012 +0100
xf86i2c: add pscrn for drivers to use
This just adds a pScrn pointer into the struct for the drivers to use
instead of scrnIndex. Mostly scrnIndex is used for logging, but some
drivers use it to lookup xf86Screens, so let them stash a pScrn instead.
Removing the scrnIndex is a bit more involved and I'm not sure its worth
the effort. Doing i2c in the X server is legacy code as far as I'm concerned.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit ea5092f1f679691d187f1eee9427e6057beec56e
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 19:25:20 2012 +0100
dix/gc: consolidate GC object creation in one place
The standard GC create and scratch GC create were 90% the same really,
and I have a need in the future for creating GC objects without the
other bits, so wanted to avoid a third copy.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3d91482ea9b4883e64e496f2768168e0ffa21ba1
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 10:24:06 2012 +0100
xf86: add a define to denote the new non-index interfaces are being used
This can be used by drivers to provide compatible APIs.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 37c3ae3e6cd4f3dedc72f371096d6743f8f99df3
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 15:09:12 2012 +0100
dix: make Create/Free scratch pixmaps take a ScreenPtr
While technically an API/ABI change I doubt anyone uses it,
but it helps in splitting screens up.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 75f2062a3fe94f04764ecc7d2ff2fbbeccb9da60
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 14:57:55 2012 +0100
xf86/xv: remove scrnIndexfrom xf86FindXvOptions.
Move this interface to taking an ScrnInfoPtr.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit f80c2374f40ea7b2ee0556e2e76cc07406f3d843
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 14:53:59 2012 +0100
xf86: make xf86DeleteScreen take a ScrnInfoPtr (v2)
stop passing indices into this function.
v2: drop flags argument.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 58824e414f35682435f15bfe6c4b656bd90b9235
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 14:48:09 2012 +0100
xf86: fix xf86IsScreenPrimary interface to take a pScrn (API/ABI)
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 6b4fc1f9d391bcdf7ca288766e49bce60f4635cd
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:18:59 2012 +0100
xserver: convert block/wakeup handlers to passing ScreenPtr (ABI/API) (v2)
Instead of passing an index, pass the actual ScreenPtr. This allows
more moving towards not abusing xf86Screens + screenInfo.
v2: drop the blockData/wakeupData args as per ajax's suggestion.,
fix docs.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 790d003de20fb47674420a24dadd92412d78620d
Author: Dave Airlie <airlied@gmail.com>
Date: Wed Apr 11 09:53:14 2012 +0100
xf86/common: remove some more pScrn->pScreen uses
remove some more conversions that appeared after api cleanups.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit aac85e18d1dd093f2cad6bd29375e40bd7af0b8f
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 16:34:53 2012 +0100
ddc: change API to take ScrnInfoPtr (v2)
This removes all xf86Screens usage from ddc code,
it modifies the API for some functions to avoid taking indices.
v2: address Alan's comments about dropping DDC2Init parameter.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit fe3f57b6eaf6860a33876a54f9439f69578f03a5
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 16:31:26 2012 +0100
vbe: don't use index for VBEInterpretPanelID (API)
Remove use of xf86screens from vbe module.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit abf1965f4ed91529036d3fdb470d6a3ce6f29675
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 16:25:11 2012 +0100
int10/vbe: don't use xf86Screens. (ABI) (v3)
Pass the ScrnInfoPtr instead of the index in the int10 struct.
This saves us using it to dereference xf86Screens.
v2: address Alan's comment to fix struct alignment.
v3: squash in all the int10 fixes, test the vm86 code builds,
after comments by Keith.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 23cca612b4fb5efc33683c7624b803b457387e3d
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:30:18 2012 +0100
xserver: drop index argument to ScreenInit (ABI/API) (v2)
This drops the index argument, its the same as pScreen->myNum,
and its the last major index abuse I can find.
v2: address Alan's review - update docs, fix xwin/xnest/darwin
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 40d360e2d7e832407f3ed64e3a02c27ecc89a960
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:23:01 2012 +0100
xf86: migrate PointerMoved from index to ScrnInfoPtr (ABI/API)
This migrates PointerMoved from an index to ScrnInfoPtr.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit aa60a2f38679d0eeb979a9c2648c9bc771409bf9
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:20:46 2012 +0100
xf86: migrate PMEvent to a ScrnInfoPtr (ABI/API)
This migrates the PMEvent from index to ScrnInfoPtr.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit d3f28ef44371ed4a039ffc5dd7eb6408d1269ba2
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:18:30 2012 +0100
xf86: migrate SetDGAMode from index to ScrnInfoPtr (ABI/API)
This migrates the SetDGAMode callback from an index to ScrnInfoPtr.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit baf5e4818a74f2b68c3dfdcc56f54322351039a0
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:14:11 2012 +0100
xf86: migrate ChangeGamma from index to ScrnInfoPtr (ABI/API) (v2)
This migrates the ChangeGamma interface to avoid passing a index.
v2: fix xf86RandR12.c + xf86cmap.c call
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 51e5f90ada929d6b23176090badbb42fdb3fa550
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:11:09 2012 +0100
xf86/exa: migrate index to screen types for EnableDisableFBAccess (ABI/API)
The EXA interface migrates to ScreenPtr,
and the xf86 interface migrated to ScrnInfoPtr.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 94f1f21d17e86f96d4a54292a399160950087675
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:02:11 2012 +0100
xf86: migrate ValidMode callback to ScrnInfoPtr (ABI/API)
This migrates the ValidMode to passing a ScrnInfoPtr instead
of an index.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3f8f18198fed4f39ec805b508a3482e91eea26b2
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:59:46 2012 +0100
xf86: migrate SwitchMode to taking ScrnInfoPtr (ABI/API) (v2)
This migrate the SwitchMode interface to take a ScrnInfoPtr
instead of an index.
v2: drop flags.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit d06a038a5c49328ab3a8d969d24f9fcd22c63202
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:50:37 2012 +0100
xf86: move AdjustFrame to passing ScrnInfoPtr (ABI/API) (v2)
This converts AdjustFrame code paths to passing a ScrnInfoPtr
instead of an integer index.
v2: drop flags args.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 53d2f8608ffd4090d08e7d5cf2e92fb954959b90
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:41:27 2012 +0100
xf86: modify FreeScreen callback to take pScrn instead of index. (ABI/API) (v2)
Another index->pScrn conversion.
v2: drop flags arg.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 60db37c0b247052e0f5c54b1921fe58a3609c2e3
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:35:41 2012 +0100
xf86: change EnterVT/LeaveVT to take a ScrnInfoPtr (ABI/API break) (v2)
This modifies the EnterVT/LeaveVT interfaces to take a ScrnInfoPtr
instead of an index into xf86Screens. This allows dropping more
public dereferences of the xf86Screens and screenInfo.
v2: drop flags args as suggested by Keith, fix docs.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 06729dbbc804a20242e6499f446acb5d94023c3c
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:04:59 2012 +0100
xserver: remove index from CloseScreen (API/ABI breakage)
This drops the index from the CloseScreen callback,
its always been useless really, since the pScreen contains it.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2012-06-05 14:22:18 +02:00
|
|
|
return (*pScreen->CloseScreen) (pScreen);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
2009-07-18 00:10:32 +02:00
|
|
|
/**
|
|
|
|
* Default implementations of the damage management functions.
|
|
|
|
*/
|
2012-03-21 20:55:09 +01:00
|
|
|
void
|
|
|
|
miDamageCreate(DamagePtr pDamage)
|
2009-07-18 00:10:32 +02:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2012-09-20 23:57:00 +02:00
|
|
|
/*
|
|
|
|
* We only wrap into the GC when there's a registered listener. For windows,
|
|
|
|
* damage includes damage to children. So if there's a GC validated against
|
|
|
|
* a subwindow and we then register a damage on the parent, we need to bump
|
|
|
|
* the serial numbers of the children to re-trigger validation.
|
|
|
|
*
|
|
|
|
* Since we can't know if a GC has been validated against one of the affected
|
|
|
|
* children, just bump them all to be safe.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
damageRegisterVisit(WindowPtr pWin, void *data)
|
|
|
|
{
|
|
|
|
pWin->drawable.serialNumber = NEXT_SERIAL_NUMBER;
|
|
|
|
return WT_WALKCHILDREN;
|
|
|
|
}
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
void
|
|
|
|
miDamageRegister(DrawablePtr pDrawable, DamagePtr pDamage)
|
2009-07-18 00:10:32 +02:00
|
|
|
{
|
2012-09-20 23:57:00 +02:00
|
|
|
if (pDrawable->type == DRAWABLE_WINDOW)
|
|
|
|
TraverseTree((WindowPtr)pDrawable, damageRegisterVisit, NULL);
|
|
|
|
else
|
|
|
|
pDrawable->serialNumber = NEXT_SERIAL_NUMBER;
|
2009-07-18 00:10:32 +02:00
|
|
|
}
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
void
|
|
|
|
miDamageUnregister(DrawablePtr pDrawable, DamagePtr pDamage)
|
2009-07-18 00:10:32 +02:00
|
|
|
{
|
2012-09-20 23:57:00 +02:00
|
|
|
if (pDrawable->type == DRAWABLE_WINDOW)
|
|
|
|
TraverseTree((WindowPtr)pDrawable, damageRegisterVisit, NULL);
|
|
|
|
else
|
|
|
|
pDrawable->serialNumber = NEXT_SERIAL_NUMBER;
|
2009-07-18 00:10:32 +02:00
|
|
|
}
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
void
|
|
|
|
miDamageDestroy(DamagePtr pDamage)
|
2009-07-18 00:10:32 +02:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2008-08-29 22:15:23 +02:00
|
|
|
/**
|
|
|
|
* Public functions for consumption outside this file.
|
|
|
|
*/
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
Bool
|
2012-03-21 20:55:09 +01:00
|
|
|
DamageSetup(ScreenPtr pScreen)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
DamageScrPrivPtr pScrPriv;
|
|
|
|
PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
|
|
|
|
|
2009-07-18 00:10:32 +02:00
|
|
|
const DamageScreenFuncsRec miFuncs = {
|
2012-03-21 20:55:09 +01:00
|
|
|
miDamageCreate, miDamageRegister, miDamageUnregister, miDamageDestroy
|
2009-07-18 00:10:32 +02:00
|
|
|
};
|
2004-07-29 16:42:24 +02:00
|
|
|
|
2010-04-27 02:22:21 +02:00
|
|
|
if (!dixRegisterPrivateKey(&damageScrPrivateKeyRec, PRIVATE_SCREEN, 0))
|
2012-03-21 20:55:09 +01:00
|
|
|
return FALSE;
|
2010-04-27 02:22:21 +02:00
|
|
|
|
2007-08-28 15:28:25 +02:00
|
|
|
if (dixLookupPrivate(&pScreen->devPrivates, damageScrPrivateKey))
|
2012-03-21 20:55:09 +01:00
|
|
|
return TRUE;
|
2004-07-29 16:42:24 +02:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (!dixRegisterPrivateKey
|
|
|
|
(&damageGCPrivateKeyRec, PRIVATE_GC, sizeof(DamageGCPrivRec)))
|
|
|
|
return FALSE;
|
2010-04-27 02:22:21 +02:00
|
|
|
|
2010-06-06 06:34:51 +02:00
|
|
|
if (!dixRegisterPrivateKey(&damagePixPrivateKeyRec, PRIVATE_PIXMAP, 0))
|
2012-03-21 20:55:09 +01:00
|
|
|
return FALSE;
|
2010-04-27 02:22:21 +02:00
|
|
|
|
|
|
|
if (!dixRegisterPrivateKey(&damageWinPrivateKeyRec, PRIVATE_WINDOW, 0))
|
2012-03-21 20:55:09 +01:00
|
|
|
return FALSE;
|
2004-07-29 16:42:24 +02:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
pScrPriv = malloc(sizeof(DamageScrPrivRec));
|
2004-07-29 16:42:24 +02:00
|
|
|
if (!pScrPriv)
|
2012-03-21 20:55:09 +01:00
|
|
|
return FALSE;
|
2004-07-29 16:42:24 +02:00
|
|
|
|
|
|
|
pScrPriv->internalLevel = 0;
|
2004-08-12 00:40:14 +02:00
|
|
|
pScrPriv->pScreenDamage = 0;
|
2004-07-29 16:42:24 +02:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
wrap(pScrPriv, pScreen, DestroyPixmap, damageDestroyPixmap);
|
|
|
|
wrap(pScrPriv, pScreen, CreateGC, damageCreateGC);
|
|
|
|
wrap(pScrPriv, pScreen, DestroyWindow, damageDestroyWindow);
|
|
|
|
wrap(pScrPriv, pScreen, SetWindowPixmap, damageSetWindowPixmap);
|
|
|
|
wrap(pScrPriv, pScreen, CopyWindow, damageCopyWindow);
|
|
|
|
wrap(pScrPriv, pScreen, CloseScreen, damageCloseScreen);
|
2004-07-29 16:42:24 +02:00
|
|
|
if (ps) {
|
2012-03-21 20:55:09 +01:00
|
|
|
wrap(pScrPriv, ps, Glyphs, damageGlyphs);
|
|
|
|
wrap(pScrPriv, ps, Composite, damageComposite);
|
|
|
|
wrap(pScrPriv, ps, AddTraps, damageAddTraps);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
2009-07-18 00:10:32 +02:00
|
|
|
pScrPriv->funcs = miFuncs;
|
|
|
|
|
2007-08-28 15:28:25 +02:00
|
|
|
dixSetPrivate(&pScreen->devPrivates, damageScrPrivateKey, pScrPriv);
|
2004-07-29 16:42:24 +02:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
DamagePtr
|
2012-03-21 20:55:09 +01:00
|
|
|
DamageCreate(DamageReportFunc damageReport,
|
|
|
|
DamageDestroyFunc damageDestroy,
|
|
|
|
DamageReportLevel damageLevel,
|
|
|
|
Bool isInternal, ScreenPtr pScreen, void *closure)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
2009-07-18 00:10:32 +02:00
|
|
|
damageScrPriv(pScreen);
|
2012-03-21 20:55:09 +01:00
|
|
|
DamagePtr pDamage;
|
2004-07-29 16:42:24 +02:00
|
|
|
|
2010-04-27 02:22:21 +02:00
|
|
|
pDamage = dixAllocateObjectWithPrivates(DamageRec, PRIVATE_DAMAGE);
|
2004-07-29 16:42:24 +02:00
|
|
|
if (!pDamage)
|
2012-03-21 20:55:09 +01:00
|
|
|
return 0;
|
2004-07-29 16:42:24 +02:00
|
|
|
pDamage->pNext = 0;
|
|
|
|
pDamage->pNextWin = 0;
|
2010-05-22 00:05:48 +02:00
|
|
|
RegionNull(&pDamage->damage);
|
|
|
|
RegionNull(&pDamage->pendingDamage);
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2004-07-29 16:42:24 +02:00
|
|
|
pDamage->damageLevel = damageLevel;
|
|
|
|
pDamage->isInternal = isInternal;
|
|
|
|
pDamage->closure = closure;
|
|
|
|
pDamage->isWindow = FALSE;
|
|
|
|
pDamage->pDrawable = 0;
|
2006-06-12 20:12:31 +02:00
|
|
|
pDamage->reportAfter = FALSE;
|
2004-07-29 16:42:24 +02:00
|
|
|
|
|
|
|
pDamage->damageReport = damageReport;
|
|
|
|
pDamage->damageDestroy = damageDestroy;
|
2009-07-18 00:10:32 +02:00
|
|
|
pDamage->pScreen = pScreen;
|
|
|
|
|
|
|
|
(*pScrPriv->funcs.Create) (pDamage);
|
|
|
|
|
2004-07-29 16:42:24 +02:00
|
|
|
return pDamage;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2012-03-21 20:55:09 +01:00
|
|
|
DamageRegister(DrawablePtr pDrawable, DamagePtr pDamage)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
2009-07-18 00:10:32 +02:00
|
|
|
ScreenPtr pScreen = pDrawable->pScreen;
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2009-07-18 00:10:32 +02:00
|
|
|
damageScrPriv(pScreen);
|
|
|
|
|
|
|
|
#if DAMAGE_VALIDATE_ENABLE
|
2012-03-21 20:55:09 +01:00
|
|
|
if (pDrawable->pScreen != pDamage->pScreen) {
|
|
|
|
ErrorF("DamageRegister called with mismatched screens\n");
|
|
|
|
OsAbort();
|
2009-07-18 00:10:32 +02:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (pDrawable->type == DRAWABLE_WINDOW) {
|
|
|
|
WindowPtr pWindow = (WindowPtr) pDrawable;
|
|
|
|
|
|
|
|
winDamageRef(pWindow);
|
2004-07-29 16:42:24 +02:00
|
|
|
|
2004-07-31 03:38:46 +02:00
|
|
|
#if DAMAGE_VALIDATE_ENABLE
|
2012-03-21 20:55:09 +01:00
|
|
|
DamagePtr pOld;
|
|
|
|
|
|
|
|
for (pOld = *pPrev; pOld; pOld = pOld->pNextWin)
|
|
|
|
if (pOld == pDamage) {
|
|
|
|
ErrorF("Damage already on window list\n");
|
|
|
|
OsAbort();
|
|
|
|
}
|
2004-07-31 03:38:46 +02:00
|
|
|
#endif
|
2012-03-21 20:55:09 +01:00
|
|
|
pDamage->pNextWin = *pPrev;
|
|
|
|
*pPrev = pDamage;
|
|
|
|
pDamage->isWindow = TRUE;
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
else
|
2012-03-21 20:55:09 +01:00
|
|
|
pDamage->isWindow = FALSE;
|
2004-07-29 16:42:24 +02:00
|
|
|
pDamage->pDrawable = pDrawable;
|
2012-03-21 20:55:09 +01:00
|
|
|
damageInsertDamage(getDrawableDamageRef(pDrawable), pDamage);
|
2009-07-18 00:10:32 +02:00
|
|
|
(*pScrPriv->funcs.Register) (pDrawable, pDamage);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2012-03-21 20:55:09 +01:00
|
|
|
DamageDrawInternal(ScreenPtr pScreen, Bool enable)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
damageScrPriv(pScreen);
|
2004-07-29 16:42:24 +02:00
|
|
|
|
|
|
|
pScrPriv->internalLevel += enable ? 1 : -1;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2013-08-26 20:03:51 +02:00
|
|
|
DamageUnregister(DamagePtr pDamage)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
2013-08-26 20:03:51 +02:00
|
|
|
DrawablePtr pDrawable = pDamage->pDrawable;
|
2009-07-18 00:10:32 +02:00
|
|
|
ScreenPtr pScreen = pDrawable->pScreen;
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2009-07-18 00:10:32 +02:00
|
|
|
damageScrPriv(pScreen);
|
|
|
|
|
|
|
|
(*pScrPriv->funcs.Unregister) (pDrawable, pDamage);
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (pDrawable->type == DRAWABLE_WINDOW) {
|
|
|
|
WindowPtr pWindow = (WindowPtr) pDrawable;
|
|
|
|
|
|
|
|
winDamageRef(pWindow);
|
2004-07-31 03:38:46 +02:00
|
|
|
#if DAMAGE_VALIDATE_ENABLE
|
2012-03-21 20:55:09 +01:00
|
|
|
int found = 0;
|
2004-07-31 03:38:46 +02:00
|
|
|
#endif
|
2004-07-29 16:42:24 +02:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
while (*pPrev) {
|
|
|
|
if (*pPrev == pDamage) {
|
|
|
|
*pPrev = pDamage->pNextWin;
|
2004-07-31 03:38:46 +02:00
|
|
|
#if DAMAGE_VALIDATE_ENABLE
|
2012-03-21 20:55:09 +01:00
|
|
|
found = 1;
|
2004-07-31 03:38:46 +02:00
|
|
|
#endif
|
2012-03-21 20:55:09 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
pPrev = &(*pPrev)->pNextWin;
|
|
|
|
}
|
2004-07-31 03:38:46 +02:00
|
|
|
#if DAMAGE_VALIDATE_ENABLE
|
2012-03-21 20:55:09 +01:00
|
|
|
if (!found) {
|
|
|
|
ErrorF("Damage not on window list\n");
|
|
|
|
OsAbort();
|
|
|
|
}
|
2004-07-31 03:38:46 +02:00
|
|
|
#endif
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
pDamage->pDrawable = 0;
|
2012-03-21 20:55:09 +01:00
|
|
|
damageRemoveDamage(getDrawableDamageRef(pDrawable), pDamage);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2012-03-21 20:55:09 +01:00
|
|
|
DamageDestroy(DamagePtr pDamage)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
2009-07-18 00:10:32 +02:00
|
|
|
ScreenPtr pScreen = pDamage->pScreen;
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2009-07-18 00:10:32 +02:00
|
|
|
damageScrPriv(pScreen);
|
|
|
|
|
2013-08-26 19:52:14 +02:00
|
|
|
if (pDamage->pDrawable)
|
2013-08-26 20:03:51 +02:00
|
|
|
DamageUnregister(pDamage);
|
2013-08-26 19:52:14 +02:00
|
|
|
|
2004-07-29 16:42:24 +02:00
|
|
|
if (pDamage->damageDestroy)
|
2012-03-21 20:55:09 +01:00
|
|
|
(*pDamage->damageDestroy) (pDamage, pDamage->closure);
|
2009-07-18 00:10:32 +02:00
|
|
|
(*pScrPriv->funcs.Destroy) (pDamage);
|
2010-05-22 00:05:48 +02:00
|
|
|
RegionUninit(&pDamage->damage);
|
|
|
|
RegionUninit(&pDamage->pendingDamage);
|
2010-04-27 02:22:21 +02:00
|
|
|
dixFreeObjectWithPrivates(pDamage, PRIVATE_DAMAGE);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
Bool
|
2012-03-21 20:55:09 +01:00
|
|
|
DamageSubtract(DamagePtr pDamage, const RegionPtr pRegion)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
RegionPtr pClip;
|
|
|
|
RegionRec pixmapClip;
|
|
|
|
DrawablePtr pDrawable = pDamage->pDrawable;
|
|
|
|
|
2010-05-22 00:05:48 +02:00
|
|
|
RegionSubtract(&pDamage->damage, &pDamage->damage, pRegion);
|
2012-03-21 20:55:09 +01:00
|
|
|
if (pDrawable) {
|
|
|
|
if (pDrawable->type == DRAWABLE_WINDOW)
|
|
|
|
pClip = &((WindowPtr) pDrawable)->borderClip;
|
|
|
|
else {
|
|
|
|
BoxRec box;
|
|
|
|
|
|
|
|
box.x1 = pDrawable->x;
|
|
|
|
box.y1 = pDrawable->y;
|
|
|
|
box.x2 = pDrawable->x + pDrawable->width;
|
|
|
|
box.y2 = pDrawable->y + pDrawable->height;
|
|
|
|
RegionInit(&pixmapClip, &box, 1);
|
|
|
|
pClip = &pixmapClip;
|
|
|
|
}
|
|
|
|
RegionTranslate(&pDamage->damage, pDrawable->x, pDrawable->y);
|
|
|
|
RegionIntersect(&pDamage->damage, &pDamage->damage, pClip);
|
|
|
|
RegionTranslate(&pDamage->damage, -pDrawable->x, -pDrawable->y);
|
|
|
|
if (pDrawable->type != DRAWABLE_WINDOW)
|
|
|
|
RegionUninit(&pixmapClip);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2010-05-22 00:05:48 +02:00
|
|
|
return RegionNotEmpty(&pDamage->damage);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2012-03-21 20:55:09 +01:00
|
|
|
DamageEmpty(DamagePtr pDamage)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
2010-05-22 00:05:48 +02:00
|
|
|
RegionEmpty(&pDamage->damage);
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
RegionPtr
|
2012-03-21 20:55:09 +01:00
|
|
|
DamageRegion(DamagePtr pDamage)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
|
|
|
return &pDamage->damage;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
RegionPtr
|
2012-03-21 20:55:09 +01:00
|
|
|
DamagePendingRegion(DamagePtr pDamage)
|
2007-08-29 19:41:52 +02:00
|
|
|
{
|
|
|
|
return &pDamage->pendingDamage;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2012-03-21 20:55:09 +01:00
|
|
|
DamageRegionAppend(DrawablePtr pDrawable, RegionPtr pRegion)
|
2008-08-29 22:15:23 +02:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
damageRegionAppend(pDrawable, pRegion, FALSE, -1);
|
2008-08-29 22:15:23 +02:00
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2012-03-21 20:55:09 +01:00
|
|
|
DamageRegionProcessPending(DrawablePtr pDrawable)
|
2008-08-29 22:15:23 +02:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
damageRegionProcessPending(pDrawable);
|
2008-08-29 22:15:23 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* This call is very odd, i'm leaving it intact for API sake, but please don't use it. */
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2012-03-21 20:55:09 +01:00
|
|
|
DamageDamageRegion(DrawablePtr pDrawable, RegionPtr pRegion)
|
2004-07-29 16:42:24 +02:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
damageRegionAppend(pDrawable, pRegion, FALSE, -1);
|
2006-06-12 20:12:31 +02:00
|
|
|
|
|
|
|
/* Go back and report this damage for DamagePtrs with reportAfter set, since
|
|
|
|
* this call isn't part of an in-progress drawing op in the call chain and
|
|
|
|
* the DDX probably just wants to know about it right away.
|
|
|
|
*/
|
2012-03-21 20:55:09 +01:00
|
|
|
damageRegionProcessPending(pDrawable);
|
2006-06-12 20:12:31 +02:00
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2012-03-21 20:55:09 +01:00
|
|
|
DamageSetReportAfterOp(DamagePtr pDamage, Bool reportAfter)
|
2006-06-12 20:12:31 +02:00
|
|
|
{
|
|
|
|
pDamage->reportAfter = reportAfter;
|
2004-07-29 16:42:24 +02:00
|
|
|
}
|
2008-08-30 00:37:11 +02:00
|
|
|
|
2009-07-18 00:10:32 +02:00
|
|
|
DamageScreenFuncsPtr
|
2012-03-21 20:55:09 +01:00
|
|
|
DamageGetScreenFuncs(ScreenPtr pScreen)
|
2009-07-18 00:10:32 +02:00
|
|
|
{
|
|
|
|
damageScrPriv(pScreen);
|
|
|
|
return &pScrPriv->funcs;
|
|
|
|
}
|
2011-04-12 11:55:56 +02:00
|
|
|
|
|
|
|
void
|
2012-03-21 20:55:09 +01:00
|
|
|
DamageReportDamage(DamagePtr pDamage, RegionPtr pDamageRegion)
|
2011-04-12 11:55:56 +02:00
|
|
|
{
|
|
|
|
BoxRec tmpBox;
|
|
|
|
RegionRec tmpRegion;
|
|
|
|
Bool was_empty;
|
|
|
|
|
|
|
|
switch (pDamage->damageLevel) {
|
|
|
|
case DamageReportRawRegion:
|
2012-03-21 20:55:09 +01:00
|
|
|
RegionUnion(&pDamage->damage, &pDamage->damage, pDamageRegion);
|
|
|
|
(*pDamage->damageReport) (pDamage, pDamageRegion, pDamage->closure);
|
|
|
|
break;
|
2011-04-12 11:55:56 +02:00
|
|
|
case DamageReportDeltaRegion:
|
2012-03-21 20:55:09 +01:00
|
|
|
RegionNull(&tmpRegion);
|
|
|
|
RegionSubtract(&tmpRegion, pDamageRegion, &pDamage->damage);
|
|
|
|
if (RegionNotEmpty(&tmpRegion)) {
|
|
|
|
RegionUnion(&pDamage->damage, &pDamage->damage, pDamageRegion);
|
|
|
|
(*pDamage->damageReport) (pDamage, &tmpRegion, pDamage->closure);
|
|
|
|
}
|
|
|
|
RegionUninit(&tmpRegion);
|
|
|
|
break;
|
2011-04-12 11:55:56 +02:00
|
|
|
case DamageReportBoundingBox:
|
2012-03-21 20:55:09 +01:00
|
|
|
tmpBox = *RegionExtents(&pDamage->damage);
|
|
|
|
RegionUnion(&pDamage->damage, &pDamage->damage, pDamageRegion);
|
|
|
|
if (!BOX_SAME(&tmpBox, RegionExtents(&pDamage->damage))) {
|
|
|
|
(*pDamage->damageReport) (pDamage, &pDamage->damage,
|
|
|
|
pDamage->closure);
|
|
|
|
}
|
|
|
|
break;
|
2011-04-12 11:55:56 +02:00
|
|
|
case DamageReportNonEmpty:
|
2012-03-21 20:55:09 +01:00
|
|
|
was_empty = !RegionNotEmpty(&pDamage->damage);
|
|
|
|
RegionUnion(&pDamage->damage, &pDamage->damage, pDamageRegion);
|
|
|
|
if (was_empty && RegionNotEmpty(&pDamage->damage)) {
|
|
|
|
(*pDamage->damageReport) (pDamage, &pDamage->damage,
|
|
|
|
pDamage->closure);
|
|
|
|
}
|
|
|
|
break;
|
2011-04-12 11:55:56 +02:00
|
|
|
case DamageReportNone:
|
2012-03-21 20:55:09 +01:00
|
|
|
RegionUnion(&pDamage->damage, &pDamage->damage, pDamageRegion);
|
|
|
|
break;
|
2011-04-12 11:55:56 +02:00
|
|
|
}
|
|
|
|
}
|