summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/blurfx.c
diff options
context:
space:
mode:
authormaniac <maniac@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-11-26 12:07:41 +0000
committermaniac <maniac@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-11-26 12:07:41 +0000
commitfa6fec9cfca98dbca1fbe814cbb7e342a717edff (patch)
tree6f4a8cd83da8a030d7289337bf6222f50b6111ef /beryl-plugins/src/blurfx.c
parente4f7b9137b5db55109bb8c9efc8b517e6535bbbe (diff)
downloadmarex-dev-fa6fec9cfca98dbca1fbe814cbb7e342a717edff.tar.gz
marex-dev-fa6fec9cfca98dbca1fbe814cbb7e342a717edff.tar.bz2
blurfx plugin: fix blur artifacts appearing when invoking scale by hooking into drawWindow instead of paintWindow (onestone, pls check)
git-svn-id: file:///beryl/trunk@1429 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/blurfx.c')
-rw-r--r--beryl-plugins/src/blurfx.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/beryl-plugins/src/blurfx.c b/beryl-plugins/src/blurfx.c
index 8fdf031..d5cc6b8 100644
--- a/beryl-plugins/src/blurfx.c
+++ b/beryl-plugins/src/blurfx.c
@@ -210,7 +210,7 @@ blurfxInitScreen (CompPlugin * p, CompScreen * s)
//Take over the window draw function
WRAP (bs, s, drawWindowTexture, blurfxDrawWindowTexture);
- WRAP (bs, s, paintWindow, blurfxPaintWindow);
+ WRAP (bs, s, drawWindow, blurfxDrawWindow);
WRAP (bs, s, damageWindowRect, blurfxDamageWindowRect);
WRAP (bs, s, paintScreen, blurfxPaintScreen);
WRAP (bs, s, addWindowGeometry, blurfxAddWindowGeometry);
@@ -274,7 +274,7 @@ blurfxFiniScreen (CompPlugin * p, CompScreen * s)
// restore the original function
UNWRAP (bs, s, drawWindowTexture);
- UNWRAP (bs, s, paintWindow);
+ UNWRAP (bs, s, drawWindow);
UNWRAP (bs, s, damageWindowRect);
UNWRAP (bs, s, paintScreen);
UNWRAP (bs, s, addWindowGeometry);
@@ -1093,7 +1093,7 @@ blurfxPaintScreen (CompScreen * s, const ScreenPaintAttrib * sa,
continue;
}
XUnionRegion (bs->occlusion, getEmptyRegion(), bw->clip);
- (*s->paintWindow) (w, &w->paint, &s->region,
+ (*s->drawWindow) (w, &w->paint, &s->region,
PAINT_WINDOW_SOLID_MASK);
}
}
@@ -1418,7 +1418,7 @@ blurfxPaintTransformedScreen (CompScreen * s, const ScreenPaintAttrib * sa,
continue;
}
XUnionRegion (bs->occlusion, getEmptyRegion(), bw->clip);
- (*s->paintWindow) (w, &w->paint, &s->region,
+ (*s->drawWindow) (w, &w->paint, &s->region,
PAINT_WINDOW_SOLID_MASK);
}
}
@@ -1430,7 +1430,7 @@ blurfxPaintTransformedScreen (CompScreen * s, const ScreenPaintAttrib * sa,
static Bool
-blurfxPaintWindow (CompWindow * w, const WindowPaintAttrib * attrib,
+blurfxDrawWindow (CompWindow * w, const WindowPaintAttrib * attrib,
Region region, unsigned int mask)
{
Bool status;
@@ -1444,9 +1444,9 @@ blurfxPaintWindow (CompWindow * w, const WindowPaintAttrib * attrib,
if (bs->mode == MODE_OCCLUSION)
{
- UNWRAP (bs, s, paintWindow);
- status = (*s->paintWindow) (w, attrib, region, mask);
- WRAP (bs, s, paintWindow, blurfxPaintWindow);
+ UNWRAP (bs, s, drawWindow);
+ status = (*s->drawWindow) (w, attrib, region, mask);
+ WRAP (bs, s, drawWindow, blurfxDrawWindow);
return status;
}
@@ -1564,9 +1564,9 @@ blurfxPaintWindow (CompWindow * w, const WindowPaintAttrib * attrib,
bs->paintingSwitcher = bw->isSwitcher;
- UNWRAP (bs, s, paintWindow);
- status = (*s->paintWindow) (w, attrib, region, mask);
- WRAP (bs, s, paintWindow, blurfxPaintWindow);
+ UNWRAP (bs, s, drawWindow);
+ status = (*s->drawWindow) (w, attrib, region, mask);
+ WRAP (bs, s, drawWindow, blurfxDrawWindow);
glColor4usv (defaultColor);
screenTexEnvMode (w->screen, GL_REPLACE);
@@ -1577,9 +1577,9 @@ blurfxPaintWindow (CompWindow * w, const WindowPaintAttrib * attrib,
bs->mode = MODE_NORMAL;
bs->was_transformed = FALSE;
- UNWRAP (bs, s, paintWindow);
- status = (*s->paintWindow) (w, &w->lastPaint, region, mask);
- WRAP (bs, s, paintWindow, blurfxPaintWindow);
+ UNWRAP (bs, s, drawWindow);
+ status = (*s->drawWindow) (w, &w->lastPaint, region, mask);
+ WRAP (bs, s, drawWindow, blurfxDrawWindow);
}
else
@@ -1588,9 +1588,9 @@ blurfxPaintWindow (CompWindow * w, const WindowPaintAttrib * attrib,
bs->mode = MODE_NORMAL;
bs->was_transformed = FALSE;
- UNWRAP (bs, s, paintWindow);
- status = (*s->paintWindow) (w, attrib, region, mask);
- WRAP (bs, s, paintWindow, blurfxPaintWindow);
+ UNWRAP (bs, s, drawWindow);
+ status = (*s->drawWindow) (w, attrib, region, mask);
+ WRAP (bs, s, drawWindow, blurfxDrawWindow);
}