commit compiz-fusion-plugins-main for openSUSE:Factory

3 Feb 2009

Hello community,

here is the log from the commit of package compiz-fusion-plugins-main for openSUSE:Factory
checked in at Tue Feb 3 22:37:00 CET 2009.


--------

--- compiz-fusion-plugins-main/compiz-fusion-plugins-main.changes	2009-01-28 23:29:51.000000000 +0100
+++ compiz-fusion-plugins-main/compiz-fusion-plugins-main.changes	2009-02-02 17:23:47.000000000 +0100
@@ -1,0 +2,13 @@
+Mon Feb  2 11:10:57 EST 2009 - davidr@novell.com
+
+- Fix a number of issues to make animation plugin work
+  better with non top-level windows and remote desktops.
+  (bnc#471559)
+
+-------------------------------------------------------------------
+Fri Jan 30 18:16:14 EST 2009 - davidr@novell.com
+
+- Enable wobbly support in expo plugin again as compiz core
+  now includes the appropriate fix. (bnc#470020)
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ compiz-fusion-plugins-main.spec ++++++
--- /var/tmp/diff_new_pack.e14011/_old	2009-02-03 22:35:41.000000000 +0100
+++ /var/tmp/diff_new_pack.e14011/_new	2009-02-03 22:35:41.000000000 +0100
@@ -33,7 +33,7 @@
 Conflicts:      compiz-extra compiz-extra-git
 Obsoletes:      compiz-fusion-plugins-git
 Version:        0.7.8 
-Release:        8
+Release:        9
 Summary:        Compiz-Fusion community main plugins
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %ix86 x86_64 ppc ppc64 ia64
@@ -137,6 +137,13 @@
 %endif
 
 %changelog
+* Mon Feb 02 2009 davidr@novell.com
+- Fix a number of issues to make animation plugin work
+  better with non top-level windows and remote desktops.
+  (bnc#471559)
+* Fri Jan 30 2009 davidr@novell.com
+- Enable wobbly support in expo plugin again as compiz core
+  now includes the appropriate fix. (bnc#470020)
 * Wed Jan 28 2009 davidr@novell.com
 - Disable wobbly support in expo plugin. (bnc#470020)
 * Tue Jan 27 2009 davidr@novell.com

++++++ plugins-main-NOMAD.diff ++++++
--- /var/tmp/diff_new_pack.e14011/_old	2009-02-03 22:35:41.000000000 +0100
+++ /var/tmp/diff_new_pack.e14011/_new	2009-02-03 22:35:41.000000000 +0100
@@ -1,5 +1,31 @@
+diff --git a/include/compiz-animation.h b/include/compiz-animation.h
+index f7d7545..1107916 100644
+--- a/include/compiz-animation.h
++++ b/include/compiz-animation.h
+@@ -131,7 +131,7 @@ typedef struct _AnimBaseFunctions {
+ 			     ExtensionPluginInfo *extensionPluginInfo);
+     CompOptionValue * (*getPluginOptVal)
+ 	(CompWindow *w, ExtensionPluginInfo *extensionPluginInfo, int optionId);
+-    Bool (*getMousePointerXY) (CompScreen *s, short *x, short *y);
++    Bool (*getMousePointerXY) (CompWindow *w, short *x, short *y);
+     UpdateBBProc	updateBBScreen;
+     UpdateBBProc	updateBBWindow;
+     UpdateBBProc	modelUpdateBB;
+diff --git a/src/animation/animation-internal.h b/src/animation/animation-internal.h
+index 4f05465..429080a 100644
+--- a/src/animation/animation-internal.h
++++ b/src/animation/animation-internal.h
+@@ -426,7 +426,7 @@ void
+ animDrawWindowGeometry(CompWindow * w);
+ 
+ Bool
+-getMousePointerXY(CompScreen * s, short *x, short *y);
++getMousePointerXY(CompWindow * w, short *x, short *y);
+ 
+ void
+ expandBoxWithBox (Box *target, Box *source);
 diff --git a/src/animation/animation.c b/src/animation/animation.c
-index c2bde8b..861d316 100644
+index c2bde8b..eb87a83 100644
 --- a/src/animation/animation.c
 +++ b/src/animation/animation.c
 @@ -325,7 +325,8 @@ animRemoveExtension (CompScreen *s,
@@ -12,7 +38,26 @@
      {
  	ANIM_WINDOW (w);
  	if (aw->com.curAnimEffect != AnimEffectNone)
-@@ -998,6 +999,8 @@ compTransformUpdateBB (CompOutput *output,
+@@ -678,6 +679,18 @@ getProgressAndCenter (CompWindow *w,
+ 	    }
+ 	}
+     }
++
++    if (center)
++    {
++	CompWindow *p;
++
++	for (p = w->parent; p; p = p->parent)
++	{
++	    center->x += p->attrib.x;
++	    center->y += p->attrib.y;
++	}
++    }
++
+     return forwardProgress;
+ }
+ 
+@@ -998,6 +1011,8 @@ compTransformUpdateBB (CompOutput *output,
  static void
  damageBoundingBox (CompWindow * w)
  {
@@ -21,7 +66,7 @@
      ANIM_WINDOW(w);
  
      if (aw->BB.x1 == MAXSHORT) // unintialized BB
-@@ -1023,6 +1026,9 @@ damageBoundingBox (CompWindow * w)
+@@ -1023,18 +1038,32 @@ damageBoundingBox (CompWindow * w)
      rect.height = lastBB->y2 - lastBB->y1 + 2;
      XUnionRectWithRegion (&rect, regionToDamage, regionToDamage);
  
@@ -29,18 +74,34 @@
 +	XOffsetRegion (regionToDamage, p->attrib.x, p->attrib.y);
 +
      damageScreenRegion (w->screen, regionToDamage);
++
++    XDestroyRegion (regionToDamage);
  }
  
-@@ -1033,7 +1039,7 @@ Bool getMousePointerXY(CompScreen * s, short *x, short *y)
+-Bool getMousePointerXY(CompScreen * s, short *x, short *y)
++Bool getMousePointerXY(CompWindow * w, short *x, short *y)
+ {
+     Window w1, w2;
+     int xp, yp, xj, yj;
      unsigned int m;
++    CompScreen *s = w->screen;
  
      if (XQueryPointer
 -	(s->display->display, s->root, &w1, &w2, &xj, &yj, &xp, &yp, &m))
 +	(s->display->display, s->root.id, &w1, &w2, &xj, &yj, &xp, &yp, &m))
      {
++	CompWindow *p;
++
++	for (p = w->parent; p; p = p->parent)
++	{
++	    xp -= p->attrib.x;
++	    yp -= p->attrib.y;
++	}
++	
  	*x = xp;
  	*y = yp;
-@@ -1543,7 +1549,7 @@ static void postAnimationCleanupCustom (CompWindow * w,
+ 	return TRUE;
+@@ -1543,7 +1572,7 @@ static void postAnimationCleanupCustom (CompWindow * w,
      if (aw->com.curAnimEffect == AnimEffectFocusFade)
      {
  	CompWindow *w2;
@@ -49,7 +110,7 @@
  	{
  	    AnimWindow *aw2;
  
-@@ -1715,7 +1721,7 @@ animActivateEvent (CompScreen *s,
+@@ -1715,7 +1744,7 @@ animActivateEvent (CompScreen *s,
  
      o[0].type = CompOptionTypeInt;
      o[0].name = "root";
@@ -58,7 +119,7 @@
  
      o[1].type = CompOptionTypeBool;
      o[1].name = "active";
-@@ -2081,7 +2087,8 @@ restackInfoStillGood(CompScreen *s, RestackInfo *restackInfo)
+@@ -2081,7 +2110,8 @@ restackInfoStillGood(CompScreen *s, RestackInfo *restackInfo)
      Bool wRestackedGood = FALSE;
  
      CompWindow *w;
@@ -68,7 +129,7 @@
      {
  	if (restackInfo->wStart == w && isWinVisible(w))
  	    wStartGood = TRUE;
-@@ -2092,6 +2099,7 @@ restackInfoStillGood(CompScreen *s, RestackInfo *restackInfo)
+@@ -2092,6 +2122,7 @@ restackInfoStillGood(CompScreen *s, RestackInfo *restackInfo)
  	if (restackInfo->wOldAbove == w && isWinVisible(w))
  	    wOldAboveGood = TRUE;
      }
@@ -76,7 +137,7 @@
      return (wStartGood && wEndGood && wOldAboveGood && wRestackedGood);
  }
  
-@@ -2100,7 +2108,8 @@ static void
+@@ -2100,7 +2131,8 @@ static void
  resetStackingInfo (CompScreen *s)
  {
      CompWindow *w;
@@ -86,7 +147,7 @@
      {
  	ANIM_WINDOW (w);
  
-@@ -2173,7 +2182,8 @@ static void animPreparePaintScreen(CompScreen * s, int msSinceLastPaint)
+@@ -2173,7 +2205,8 @@ static void animPreparePaintScreen(CompScreen * s, int msSinceLastPaint)
  	  now: C0001B 36000A5 3205B63 1E0000C 1E00050 1E0005B 600003 
  	*/
  	CompWindow *wOldAbove = NULL;
@@ -96,7 +157,7 @@
  	{
  	    ANIM_WINDOW(w);
  	    if (aw->restackInfo)
-@@ -2199,9 +2209,11 @@ static void animPreparePaintScreen(CompScreen * s, int msSinceLastPaint)
+@@ -2199,9 +2232,11 @@ static void animPreparePaintScreen(CompScreen * s, int msSinceLastPaint)
  		}
  	    }
  	}
@@ -109,7 +170,7 @@
  	{
  	    ANIM_WINDOW(w);
  	    if (aw->restackInfo)
-@@ -2259,27 +2271,56 @@ static void animPreparePaintScreen(CompScreen * s, int msSinceLastPaint)
+@@ -2259,27 +2294,56 @@ static void animPreparePaintScreen(CompScreen * s, int msSinceLastPaint)
  		}
  		initiateFocusAnimation(w);
  	    }
@@ -180,7 +241,7 @@
  	}
      }
  	
-@@ -2288,7 +2329,7 @@ static void animPreparePaintScreen(CompScreen * s, int msSinceLastPaint)
+@@ -2288,7 +2352,7 @@ static void animPreparePaintScreen(CompScreen * s, int msSinceLastPaint)
  	AnimWindow *aw;
  	Bool animStillInProgress = FALSE;
  
@@ -189,7 +250,7 @@
  	{
  	    aw = GET_ANIM_WINDOW(w, as);
  
-@@ -2376,7 +2417,7 @@ static void animPreparePaintScreen(CompScreen * s, int msSinceLastPaint)
+@@ -2376,7 +2440,7 @@ static void animPreparePaintScreen(CompScreen * s, int msSinceLastPaint)
  	    }
  	}
  
@@ -198,7 +259,7 @@
  	{
  	    aw = GET_ANIM_WINDOW(w, as);
  	    if (aw && aw->com.curAnimEffect->properties.
-@@ -3118,10 +3159,10 @@ getBottommostInFocusChain (CompWindow *w)
+@@ -3118,10 +3182,10 @@ getBottommostInFocusChain (CompWindow *w)
  }
  
  static void
@@ -211,7 +272,7 @@
      {
  	ANIM_WINDOW(w);
  	aw->walkerOverNewCopy = FALSE;
-@@ -3130,13 +3171,13 @@ resetWalkerMarks (CompScreen *s)
+@@ -3130,13 +3194,13 @@ resetWalkerMarks (CompScreen *s)
  }
  
  static CompWindow*
@@ -229,7 +290,7 @@
      if (w)
      {
  	AnimWindow *aw = GET_ANIM_WINDOW (w, as);
-@@ -3146,13 +3187,13 @@ animWalkFirst (CompScreen *s)
+@@ -3146,13 +3210,13 @@ animWalkFirst (CompScreen *s)
  }
  
  static CompWindow*
@@ -247,7 +308,7 @@
      if (w)
      {
  	AnimWindow *aw = GET_ANIM_WINDOW (w, as);
-@@ -3259,12 +3300,13 @@ animWalkPrev (CompWindow *w)
+@@ -3259,12 +3323,13 @@ animWalkPrev (CompWindow *w)
  
  static void
  animInitWindowWalker (CompScreen *s,
@@ -262,7 +323,16 @@
      WRAP (as, s, initWindowWalker, animInitWindowWalker);
  
      if (as->walkerAnimCount > 0) // only walk if necessary
-@@ -3717,7 +3759,7 @@ static void animHandleEvent(CompDisplay * d, XEvent * event)
+@@ -3662,7 +3727,7 @@ static void animHandleEvent(CompDisplay * d, XEvent * event)
+ 			postAnimationCleanup (w);
+ 		    }
+ 		    else if (getMousePointerXY
+-			     (w->screen, &aw->com.icon.x, &aw->com.icon.y))
++			     (w, &aw->com.icon.x, &aw->com.icon.y))
+ 		    {
+ 			aw->com.icon.width = FAKE_ICON_SIZE;
+ 			aw->com.icon.height = FAKE_ICON_SIZE;
+@@ -3717,7 +3782,7 @@ static void animHandleEvent(CompDisplay * d, XEvent * event)
      {
  	XConfigureEvent *ce = &event->xconfigure;
  	w = findWindowAtDisplay (d, ce->window);
@@ -271,7 +341,7 @@
  	    break;
  	if (w->prev)
  	{
-@@ -3823,7 +3865,7 @@ static void animHandleEvent(CompDisplay * d, XEvent * event)
+@@ -3823,7 +3888,7 @@ static void animHandleEvent(CompDisplay * d, XEvent * event)
  		    onlyTwo = TRUE;
  		}
  		// Clear all configureNotified's
@@ -280,7 +350,16 @@
  		{
  		    AnimWindow *aw2 = GET_ANIM_WINDOW(w2, as);
  		    aw2->configureNotified = FALSE;
-@@ -4254,7 +4296,9 @@ animWindowMoveNotify(CompWindow * w, int dx, int dy, Bool immediate)
+@@ -4106,7 +4171,7 @@ static Bool animDamageWindowRect(CompWindow * w, Bool initial, BoxPtr rect)
+ 		AnimEffectNone !=
+ 		(chosenEffect =
+ 		 getMatchingAnimSelection (w, AnimEventOpen, &duration)) &&
+-		getMousePointerXY(w->screen, &aw->com.icon.x, &aw->com.icon.y))
++		getMousePointerXY(w, &aw->com.icon.x, &aw->com.icon.y))
+ 	    {
+ 		Bool startingNew = TRUE;
+ 		Bool playEffect = TRUE;
+@@ -4254,7 +4319,9 @@ animWindowMoveNotify(CompWindow * w, int dx, int dy, Bool immediate)
  		if (as->animInProgress)
  		{
  		    Bool animStillInProgress = FALSE;
@@ -291,7 +370,7 @@
  		    {
  			AnimWindow *aw2;
  
-@@ -4264,6 +4308,20 @@ animWindowMoveNotify(CompWindow * w, int dx, int dy, Bool immediate)
+@@ -4264,6 +4331,20 @@ animWindowMoveNotify(CompWindow * w, int dx, int dy, Bool immediate)
  			    animStillInProgress = TRUE;
  			    break;
  			}
@@ -312,7 +391,7 @@
  		    }
  
  		    if (!animStillInProgress)
-@@ -4353,7 +4411,7 @@ animPaintOutput(CompScreen * s,
+@@ -4353,7 +4434,7 @@ animPaintOutput(CompScreen * s,
  	if (as->markAllWinCreatedCountdown == 1)
  	{
  	    // Mark all windows as "created"
@@ -321,6 +400,19 @@
  	    {
  		ANIM_WINDOW(w);
  		aw->created = TRUE;
+diff --git a/src/animation/magiclamp.c b/src/animation/magiclamp.c
+index 07d85eb..9e949be 100644
+--- a/src/animation/magiclamp.c
++++ b/src/animation/magiclamp.c
+@@ -163,7 +163,7 @@ fxMagicLampModelStep (CompWindow *w, float time)
+ 	  animGetB (w, ANIM_SCREEN_OPTION_VACUUM_MOVING_END))))
+     {
+ 	// Update icon position
+-	getMousePointerXY (w->screen, &icon->x, &icon->y);
++	getMousePointerXY (w, &icon->x, &icon->y);
+     }
+     float forwardProgress = defaultAnimProgress (w);
+ 
 diff --git a/src/colorfilter/colorfilter.c b/src/colorfilter/colorfilter.c
 index f7674d1..4a94e45 100644
 --- a/src/colorfilter/colorfilter.c
@@ -410,18 +502,10 @@
  	Bool isExcluded;
  
 diff --git a/src/expo/expo.c b/src/expo/expo.c
-index 46fa27b..e8c19bf 100644
+index 46fa27b..7357755 100644
 --- a/src/expo/expo.c
 +++ b/src/expo/expo.c
-@@ -179,7 +179,6 @@ expoFinishWindowMovement (CompWindow *w)
-     EXPO_SCREEN (s);
- 
-     syncWindowPosition (w);
--    (*s->windowUngrabNotify) (w);
-     
-     moveScreenViewport (s, s->x - es->selectedVX,
-     			s->y - es->selectedVY, TRUE);
-@@ -272,7 +271,7 @@ expoDnDFini (CompDisplay     *d,
+@@ -272,7 +272,7 @@ expoDnDFini (CompDisplay     *d,
      {
      	EXPO_SCREEN (s);
  
@@ -430,7 +514,7 @@
  	    continue;
  
  	if (es->dndState == DnDDuring || es->dndState == DnDStart)
-@@ -641,7 +640,8 @@ invertTransformedVertex (CompScreen              *s,
+@@ -641,7 +641,8 @@ invertTransformedVertex (CompScreen              *s,
  
      alpha = -p1[2] / v[2];
  
@@ -440,7 +524,7 @@
      {
  	const float sws = s->width * s->width;
  	const float rs = (es->curveDistance * es->curveDistance) + 0.25;
-@@ -1259,7 +1259,7 @@ expoAddWindowGeometry (CompWindow *w,
+@@ -1259,7 +1260,7 @@ expoAddWindowGeometry (CompWindow *w,
      EXPO_SCREEN (s);
  
      if (es->expoCam > 0.0 && expoGetDeform (s->display) == DeformCurve &&
@@ -449,7 +533,7 @@
      {
  	int         x1, x2, i, oldVCount = w->vCount;
  	REGION      reg;
-@@ -1318,10 +1318,12 @@ expoAddWindowGeometry (CompWindow *w,
+@@ -1318,10 +1319,12 @@ expoAddWindowGeometry (CompWindow *w,
  	v  = w->vertices + (w->vertexStride - 3);
  	v += w->vertexStride * oldVCount;
  
@@ -465,7 +549,7 @@
  	}
  
  	lastX = -1000000000.0;
-@@ -1369,7 +1371,7 @@ expoDrawWindowTexture (CompWindow	    *w,
+@@ -1369,7 +1372,7 @@ expoDrawWindowTexture (CompWindow	    *w,
      EXPO_SCREEN (s);
  
      if (es->expoCam > 0.0 && expoGetDeform (s->display) == DeformCurve &&
@@ -474,7 +558,7 @@
      {
  	int     i, idx;
  	int     offX = 0, offY = 0;
-@@ -1388,10 +1390,12 @@ expoDrawWindowTexture (CompWindow	    *w,
+@@ -1388,10 +1391,12 @@ expoDrawWindowTexture (CompWindow	    *w,
  	    es->winNormSize = w->vCount * 3;
  	}
  	
@@ -490,7 +574,7 @@
  	}
  	
  	v = w->vertices + (w->vertexStride - 3);
-@@ -1556,7 +1560,7 @@ expoDonePaintScreen (CompScreen * s)
+@@ -1556,7 +1561,7 @@ expoDonePaintScreen (CompScreen * s)
  	{
  	    CompWindow *w;
  
@@ -499,16 +583,6 @@
  	    {
  		Bool inWindow;
  		int xOffset, yOffset;
-@@ -1599,9 +1603,6 @@ expoDonePaintScreen (CompScreen * s)
- 		es->dndState  = DnDDuring;
- 		es->dndWindow = w;
- 
--		(*s->windowGrabNotify) (w, nx, ny, 0,
--					CompWindowGrabMoveMask |
--					CompWindowGrabButtonMask);
- 		break;
- 	    }
- 
 diff --git a/src/ezoom/ezoom.c b/src/ezoom/ezoom.c
 index 90bf4ca..91cea99 100644
 --- a/src/ezoom/ezoom.c


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit compiz-fusion-plugins-main for openSUSE:Factory

root＠Hilbert.suse.de