summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@opencompositing.org>2007-06-01 03:07:14 +0200
committerDennis kasprzyk <onestone@opencompositing.org>2007-06-01 03:07:14 +0200
commit3b4a895af4139428651ccced02682728b6b68f5b (patch)
tree64e8634db95ed300c76d1eb4db1e7ce66ac5ac2b
parent2b7a2e9912039e484523f7e93a83e3c4c5620bea (diff)
downloadtile-3b4a895af4139428651ccced02682728b6b68f5b.tar.gz
tile-3b4a895af4139428651ccced02682728b6b68f5b.tar.bz2
Applied lastest core changes
-rw-r--r--tile.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/tile.c b/tile.c
index 629e08e..8fb5c18 100644
--- a/tile.c
+++ b/tile.c
@@ -61,7 +61,7 @@ typedef struct _TileScreen {
WindowResizeNotifyProc windowResizeNotify;
PreparePaintScreenProc preparePaintScreen;
DonePaintScreenProc donePaintScreen;
- PaintScreenProc paintScreen;
+ PaintOutputProc paintOutput;
} TileScreen;
typedef struct _TileWindow {
@@ -261,10 +261,11 @@ static void tileDonePaintScreen(CompScreen * s)
WRAP(ts, s, donePaintScreen, tileDonePaintScreen);
}
-static Bool tilePaintScreen(CompScreen * s,
+static Bool tilePaintOutput(CompScreen * s,
const ScreenPaintAttrib * sa,
const CompTransform * transform,
- Region region, int output, unsigned int mask)
+ Region region, CompOutput *output,
+ unsigned int mask)
{
Bool status;
CompTransform sTransform = *transform;
@@ -274,9 +275,9 @@ static Bool tilePaintScreen(CompScreen * s,
if (ts->grabIndex)
mask |= PAINT_SCREEN_WITH_TRANSFORMED_WINDOWS_MASK;
- UNWRAP(ts, s, paintScreen);
- status = (*s->paintScreen) (s, sa, transform, region, output, mask);
- WRAP(ts, s, paintScreen, tilePaintScreen);
+ UNWRAP(ts, s, paintOutput);
+ status = (*s->paintOutput) (s, sa, transform, region, output, mask);
+ WRAP(ts, s, paintOutput, tilePaintOutput);
// Check if animation is enabled, there is resizing on screen and only outline should be drawn
@@ -497,7 +498,7 @@ static Bool tileInitScreen(CompPlugin * p, CompScreen * s)
ts->oneDuration = 0;
// Wrap plugin functions
- WRAP(ts, s, paintScreen, tilePaintScreen);
+ WRAP(ts, s, paintOutput, tilePaintOutput);
WRAP(ts, s, preparePaintScreen, tilePreparePaintScreen);
WRAP(ts, s, donePaintScreen, tileDonePaintScreen);
WRAP(ts, s, windowResizeNotify, tileResizeNotify);
@@ -513,7 +514,7 @@ static void tileFiniScreen(CompPlugin * p, CompScreen * s)
freeWindowPrivateIndex(s, ts->windowPrivateIndex);
//Restore the original function
- UNWRAP(ts, s, paintScreen);
+ UNWRAP(ts, s, paintOutput);
UNWRAP(ts, s, preparePaintScreen);
UNWRAP(ts, s, donePaintScreen);
UNWRAP(ts, s, windowResizeNotify);