[fusion-commits] compiz mirror: Changes to 'master' (c7735ff216150807f920f91e9657ed61c1ac6668)

[compiz at server.beryl-project.org]

New commits:
commit c7735ff216150807f920f91e9657ed61c1ac6668
Author: David Reveman <davidr at novell.com>
Date:   Mon Jul 30 15:02:13 2007 -0400

    Replace move argument that was always true with an allowDecorations
    argument that can be used to remove any window decorations from
    decorFiniWindow.

commit f6494950b0d0f1b4fa161a5289db998e0856ca6a
Author: David Reveman <davidr at novell.com>
Date:   Mon Jul 30 14:47:10 2007 -0400

    move argument to decorWindowUpdate should always be true.


 plugins/decoration.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)


Modified: compiz/plugins/decoration.c
===================================================================
--- compiz/plugins/decoration.c
+++ compiz/plugins/decoration.c
@@ -697,7 +697,7 @@ decorWindowShiftY (CompWindow *w)
 
 static Bool
 decorWindowUpdate (CompWindow *w,
-		   Bool	      move)
+		   Bool	      allowDecoration)
 {
     WindowDecoration *wd;
     Decoration	     *old, *decor = NULL;
@@ -726,7 +726,7 @@ decorWindowUpdate (CompWindow *w,
     }
 
     if (w->attrib.override_redirect)
-	decorate = move = FALSE;
+	decorate = FALSE;
 
     if (decorate)
     {
@@ -769,7 +769,7 @@ decorWindowUpdate (CompWindow *w,
 	}
     }
 
-    if (!ds->dmWin || restartSignal || shutDown)
+    if (!ds->dmWin || !allowDecoration)
 	decor = NULL;
 
     if (decor == old)
@@ -811,7 +811,7 @@ decorWindowUpdate (CompWindow *w,
 	moveDy = -oldShiftY;
     }
 
-    if (move && (moveDx || moveDy))
+    if (!w->attrib.override_redirect && (moveDx || moveDy))
     {
 	XWindowChanges xwc;
 	unsigned int   mask = CWX | CWY;
@@ -984,11 +984,11 @@ decorHandleEvent (CompDisplay *d,
     {
 	w = findWindowAtDisplay (d, activeWindow);
 	if (w)
-	    decorWindowUpdate (w, FALSE);
+	    decorWindowUpdate (w, TRUE);
 
 	w = findWindowAtDisplay (d, d->activeWindow);
 	if (w)
-	    decorWindowUpdate (w, FALSE);
+	    decorWindowUpdate (w, TRUE);
     }
 
     switch (event->type) {
@@ -1437,7 +1437,7 @@ decorFiniWindow (CompPlugin *p,
     DECOR_WINDOW (w);
 
     if (!w->destroyed)
-	decorWindowUpdate (w, TRUE);
+	decorWindowUpdate (w, FALSE);
 
     if (dw->wd)
 	destroyWindowDecoration (w->screen, dw->wd);