summaryrefslogtreecommitdiff
path: root/put.c
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@opencompositing.org>2007-06-01 03:00:01 +0200
committerDennis kasprzyk <onestone@opencompositing.org>2007-06-01 03:00:01 +0200
commitf28fc0d2cb477966bd4b7bde723f02e1690b2310 (patch)
tree16b3974e41f27f6ff4b5530252f6598d590d9366 /put.c
parent38c84eeda93c9d4ae78783094e4cd1c0d9e59db6 (diff)
downloadput-f28fc0d2cb477966bd4b7bde723f02e1690b2310.tar.gz
put-f28fc0d2cb477966bd4b7bde723f02e1690b2310.tar.bz2
Applied lastest core changes
Diffstat (limited to 'put.c')
-rw-r--r--put.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/put.c b/put.c
index 57bf978..5d18316 100644
--- a/put.c
+++ b/put.c
@@ -69,7 +69,7 @@ typedef struct _PutScreen
int windowPrivateIndex;
PreparePaintScreenProc preparePaintScreen; /* function pointer */
DonePaintScreenProc donePaintScreen; /* function pointer */
- PaintScreenProc paintScreen; /* function pointer */
+ PaintOutputProc paintOutput; /* function pointer */
PaintWindowProc paintWindow; /* function pointer */
int moreAdjust; /* animation flag */
int grabIndex; /* screen grab index */
@@ -239,9 +239,10 @@ static void putDonePaintScreen(CompScreen * s)
}
static Bool
-putPaintScreen(CompScreen * s, const ScreenPaintAttrib * sAttrib,
+putPaintOutput(CompScreen * s, const ScreenPaintAttrib * sAttrib,
const CompTransform *transform,
- Region region, int output, unsigned int mask)
+ Region region, CompOutput *output,
+ unsigned int mask)
{
Bool status;
@@ -250,9 +251,9 @@ putPaintScreen(CompScreen * s, const ScreenPaintAttrib * sAttrib,
if (ps->moreAdjust)
mask |= PAINT_SCREEN_WITH_TRANSFORMED_WINDOWS_MASK;
- UNWRAP(ps, s, paintScreen);
- status = (*s->paintScreen) (s, sAttrib, transform, region, output, mask);
- WRAP(ps, s, paintScreen, putPaintScreen);
+ UNWRAP(ps, s, paintOutput);
+ status = (*s->paintOutput) (s, sAttrib, transform, region, output, mask);
+ WRAP(ps, s, paintOutput, putPaintOutput);
return status;
}
@@ -1298,7 +1299,7 @@ static Bool putInitScreen(CompPlugin * p, CompScreen * s)
/* wrap the overloaded functions */
WRAP(ps, s, preparePaintScreen, putPreparePaintScreen);
WRAP(ps, s, donePaintScreen, putDonePaintScreen);
- WRAP(ps, s, paintScreen, putPaintScreen);
+ WRAP(ps, s, paintOutput, putPaintOutput);
WRAP(ps, s, paintWindow, putPaintWindow);
s->privates[pd->screenPrivateIndex].ptr = ps;
@@ -1313,7 +1314,7 @@ static void putFiniScreen(CompPlugin * p, CompScreen * s)
UNWRAP(ps, s, preparePaintScreen);
UNWRAP(ps, s, donePaintScreen);
- UNWRAP(ps, s, paintScreen);
+ UNWRAP(ps, s, paintOutput);
UNWRAP(ps, s, paintWindow);
free(ps);