Hello community, here is the log from the commit of package compiz-fusion-plugins-extra for openSUSE:Factory checked in at Tue Oct 6 05:08:10 CEST 2009. -------- --- compiz-fusion-plugins-extra/compiz-fusion-plugins-extra.changes 2009-04-20 17:45:21.000000000 +0200 +++ compiz-fusion-plugins-extra/compiz-fusion-plugins-extra.changes 2009-04-20 23:59:08.000000000 +0200 @@ -6,0 +7,5 @@ +Fri Dec 5 06:57:48 EST 2008 - davidr@novell.com + +- Handle non top-level windows properly in cubeaddon plugin. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz-fusion-plugins-extra.spec ++++++ --- /var/tmp/diff_new_pack.tdZxrR/_old 2009-10-06 05:07:47.000000000 +0200 +++ /var/tmp/diff_new_pack.tdZxrR/_new 2009-10-06 05:07:47.000000000 +0200 @@ -32,7 +32,7 @@ Requires: compiz compiz-fusion-plugins-main Conflicts: compiz-extra compiz-extra-git Version: 0.7.8 -Release: 4 +Release: 5 Summary: Compiz-Fusion community extra plugins BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 @@ -116,6 +116,7 @@ %post -p /sbin/ldconfig %postun -p /sbin/ldconfig + %posttrans -f %{name}.schemas_posttrans %clean ++++++ plugins-extra-NOMAD.diff ++++++ --- /var/tmp/diff_new_pack.tdZxrR/_old 2009-10-06 05:07:47.000000000 +0200 +++ /var/tmp/diff_new_pack.tdZxrR/_new 2009-10-06 05:07:47.000000000 +0200 @@ -95,7 +95,7 @@ ANIMADDON_WINDOW (w); if (aw->com->animRemainingTime > 0 && diff --git a/src/cubeaddon/cubeaddon.c b/src/cubeaddon/cubeaddon.c -index 413a72d..6748534 100644 +index 413a72d..f02bb17 100644 --- a/src/cubeaddon/cubeaddon.c +++ b/src/cubeaddon/cubeaddon.c @@ -853,7 +853,7 @@ cubeaddonAddWindowGeometry (CompWindow *w, @@ -107,33 +107,83 @@ { int x1, x2, y1, y2, yi, i, j, oldVCount = w->vCount; REGION reg; -@@ -963,8 +963,10 @@ cubeaddonAddWindowGeometry (CompWindow *w, +@@ -865,6 +865,7 @@ cubeaddonAddWindowGeometry (CompWindow *w, + float inv = (cs->invert == 1) ? 1.0 : -1.0; - if (!windowOnAllViewports (w)) + float a1, a2, ang; ++ CompWindow *p; + + if (cubeaddonGetDeformation (s) == DeformationCylinder || cs->unfolded) + { +@@ -961,12 +962,28 @@ cubeaddonAddWindowGeometry (CompWindow *w, + v = w->vertices + (w->vertexStride - 3); + v += w->vertexStride * oldVCount; + +- if (!windowOnAllViewports (w)) ++ for (p = w; p; p = p->parent) { - getWindowMovementForOffset (w, s->windowOffsetX, - s->windowOffsetY, &offX, &offY); -+ getWindowMovementForOffset (w, -+ s->root.viewportOffsetX, -+ s->root.viewportOffsetY, -+ &offX, &offY); ++ offX += p->attrib.x; ++ offY += p->attrib.y; ++ ++ if (p->parent == &s->root && !windowOnAllViewports (p)) ++ { ++ int x, y; ++ ++ getWindowMovementForOffset (p, ++ s->root.viewportOffsetX, ++ s->root.viewportOffsetY, ++ &x, &y); ++ ++ offX += x; ++ offY += y; ++ } } ++ offX -= w->attrib.x; ++ offY -= w->attrib.y; ++ if (cs->moMode == CUBE_MOMODE_ONE) -@@ -1106,8 +1108,10 @@ cubeaddonDrawWindow (CompWindow *w, + { + sx1 = 0; +@@ -1101,15 +1118,32 @@ cubeaddonDrawWindow (CompWindow *w, - if (!windowOnAllViewports (w)) + if (!(mask & PAINT_WINDOW_TRANSFORMED_MASK) && cas->deform) + { ++ CompWindow *p; + int offX = 0, offY = 0; + int x1, x2; + +- if (!windowOnAllViewports (w)) ++ for (p = w; p; p = p->parent) { - getWindowMovementForOffset (w, s->windowOffsetX, - s->windowOffsetY, &offX, &offY); -+ getWindowMovementForOffset (w, -+ s->root.viewportOffsetX, -+ s->root.viewportOffsetY, -+ &offX, &offY); ++ offX += p->attrib.x; ++ offY += p->attrib.y; ++ ++ if (p->parent == &s->root && !windowOnAllViewports (p)) ++ { ++ int x, y; ++ ++ getWindowMovementForOffset (p, ++ s->root.viewportOffsetX, ++ s->root.viewportOffsetY, ++ &x, &y); ++ ++ offX += x; ++ offY += y; ++ } } ++ offX -= w->attrib.x; ++ offY -= w->attrib.y; ++ x1 = w->attrib.x - w->output.left + offX; -@@ -1163,8 +1167,10 @@ cubeaddonDrawWindowTexture (CompWindow *w, + x2 = w->attrib.x + w->width + w->output.right + offX; + if (x1 < 0 && x2 < 0) +@@ -1163,8 +1197,10 @@ cubeaddonDrawWindowTexture (CompWindow *w, if (!windowOnAllViewports (w)) { @@ -146,7 +196,7 @@ } if (cs->moMode == CUBE_MOMODE_ONE) -@@ -1265,7 +1271,7 @@ cubeaddonPaintTransformedOutput (CompScreen *s, +@@ -1265,7 +1301,7 @@ cubeaddonPaintTransformedOutput (CompScreen *s, CUBE_SCREEN (s); if (cubeaddonGetDeformation (s) != DeformationNone ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org