summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/blurfx.c
diff options
context:
space:
mode:
authormaniac <maniac@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-11-21 07:23:43 +0000
committermaniac <maniac@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-11-21 07:23:43 +0000
commit2533334edeb53d040f1b724c2b8a02483346373a (patch)
treed23ed977888719541e70ca0b9ceb65aa96afd92d /beryl-plugins/src/blurfx.c
parentaaaf03eb4499b7b55275d9acb3310bb525422427 (diff)
downloadmarex-dev-2533334edeb53d040f1b724c2b8a02483346373a.tar.gz
marex-dev-2533334edeb53d040f1b724c2b8a02483346373a.tar.bz2
ns:
- added function detecting if a listed screen grab is active - replaced similar function in blurfx with that one - partly revert Vuen patch from #1055 and use the new functionality instead - make scale and showdesktop work together correctly using the new functionality (end showdesktop before starting scale), closes #1029 git-svn-id: file:///beryl/trunk@1336 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/blurfx.c')
-rw-r--r--beryl-plugins/src/blurfx.c35
1 files changed, 10 insertions, 25 deletions
diff --git a/beryl-plugins/src/blurfx.c b/beryl-plugins/src/blurfx.c
index 310134b..2d6eb8d 100644
--- a/beryl-plugins/src/blurfx.c
+++ b/beryl-plugins/src/blurfx.c
@@ -956,7 +956,7 @@ blurfxPreparePaintScreen (CompScreen * s, int ms)
bs->
opt
[BLURFX_SCREEN_OPTION_MOTION_BLUR_ON_SCREENGRAB_OF].
- value.list.value[i].s);
+ value.list.value[i].s, 0);
}
bs->motion_blur_active |= bs->mb_activated;
@@ -1057,7 +1057,7 @@ blurfxPaintScreen (CompScreen * s, const ScreenPaintAttrib * sa,
bs->
opt
[BLURFX_SCREEN_OPTION_DISABLE_BLUR_ON_SCREENGRAB_OF].
- value.list.value[i].s);
+ value.list.value[i].s, 0);
}
bs->od_active = FALSE;
@@ -1487,7 +1487,7 @@ blurfxPaintWindow (CompWindow * w, const WindowPaintAttrib * attrib,
bs->
opt
[BLURFX_SCREEN_OPTION_DISABLE_BLUR_ON_SCREENGRAB_OF].
- value.list.value[i].s);
+ value.list.value[i].s, 0);
}
for (i = 0;
@@ -1500,7 +1500,7 @@ blurfxPaintWindow (CompWindow * w, const WindowPaintAttrib * attrib,
bs->
opt
[BLURFX_SCREEN_OPTION_DISABLE_REFLECTION_ON_SCREENGRAB_OF].
- value.list.value[i].s);
+ value.list.value[i].s, 0);
}
Bool splash = IPCS_GetBoolND (IPCS_OBJECT (s), "SPLASH_IS_ACTIVE", FALSE);
@@ -1705,7 +1705,7 @@ blurfxDrawWindowTexture (CompWindow * w, CompTexture * texture,
bs->
opt
[BLURFX_SCREEN_OPTION_DISABLE_BLUR_ON_SCREENGRAB_OF].
- value.list.value[i].s);
+ value.list.value[i].s, 0);
}
for (i = 0;
@@ -1718,7 +1718,7 @@ blurfxDrawWindowTexture (CompWindow * w, CompTexture * texture,
bs->
opt
[BLURFX_SCREEN_OPTION_DISABLE_REFLECTION_ON_SCREENGRAB_OF].
- value.list.value[i].s);
+ value.list.value[i].s, 0);
}
Bool splash = IPCS_GetBoolND (IPCS_OBJECT (s), "SPLASH_IS_ACTIVE", FALSE);
@@ -2121,7 +2121,7 @@ updateBlurTexture (CompWindow * w, CompScreen * s,
stride = 4 * sizeof (GLfloat);
- if (screenGrabExist (s, "switcher") || bw->isSwitcher)
+ if (screenGrabExist (s, "switcher", 0) || bw->isSwitcher)
{
bw->texUpdated = FALSE;
XDestroyRegion (reblurRegion);
@@ -2782,7 +2782,7 @@ updateBlurTextureNoFBO (CompWindow * w, CompScreen * s,
return;
}
- if (screenGrabExist (s, "switcher")
+ if (screenGrabExist (s, "switcher", 0)
|| mask & PAINT_WINDOW_ON_TRANSFORMED_SCREEN_MASK
|| mask & PAINT_WINDOW_TRANSFORMED_MASK || bw->isSwitcher)
{
@@ -3615,7 +3615,7 @@ drawBlur (CompWindow * w, CompScreen * s, CompTexture * texture,
Bool switcher = FALSE;
if (w->resName == 0 && w->resClass == 0
&& (mask & PAINT_WINDOW_DECORATION_MASK)
- && screenGrabExist (s, "switcher"))
+ && screenGrabExist (s, "switcher", 0))
switcher = TRUE;
// we need alpha dependend blur if window has alpha channel
@@ -4014,7 +4014,7 @@ drawReflection (CompWindow * w, CompScreen * s, CompTexture * texture,
Bool switcher = FALSE;
if (w->resName == 0 && w->resClass == 0
&& (mask & PAINT_WINDOW_DECORATION_MASK)
- && screenGrabExist (s, "switcher"))
+ && screenGrabExist (s, "switcher", 0))
switcher = TRUE;
// we need alpha dependend reflection if window has alpha channel
@@ -4636,18 +4636,3 @@ switchBlurfxTexture (BlurTexture * from, BlurTexture * to,
}
}
-static Bool
-screenGrabExist (CompScreen * s, const char *name)
-{
- int i;
-
- for (i = 0; i < s->maxGrab; i++)
- {
- if (s->grabs[i].active)
- {
- if (strcmp (name, s->grabs[i].name) == 0)
- return TRUE;
- }
- }
- return FALSE;
-}