[fusion-commits] Animation plugin: Changes to 'master' (074ecd4faa2ca0d313193fb3f0e29b5ddf9cef81)

[cornelius at server.beryl-project.org]

New commits:
commit 074ecd4faa2ca0d313193fb3f0e29b5ddf9cef81
Author: Erkin Bahceci <erkinbah at gmail.com>
Date:   Sun Jul 29 01:34:59 2007 -0400

    Fix screen lock window handling after workaround changes.

commit f3a65310292e5239e193e4837dbfc0b3ef8887cf
Author: Erkin Bahceci <erkinbah at gmail.com>
Date:   Sun Jul 29 00:54:39 2007 -0400

    Fix KDE menus.
    Please do more testing before removing stuff ;)


 animation.c      |   15 +++++++++++----
 animation.xml.in |    8 ++++----
 2 files changed, 15 insertions(+), 8 deletions(-)


Modified: fusion/plugins/animation/animation.c
===================================================================
--- fusion/plugins/animation/animation.c
+++ fusion/plugins/animation/animation.c
@@ -2729,6 +2729,13 @@ updateLastClientListStacking(CompScreen *s)
 	   sizeof (Window) * n);
 }
 
+static Bool
+windowHasUserTime(CompWindow *w)
+{
+    Time t;
+    return getWindowUserTime (w, &t);
+}
+
 static void animHandleEvent(CompDisplay * d, XEvent * event)
 {
     CompWindow *w;
@@ -2952,9 +2959,9 @@ static void animHandleEvent(CompDisplay * d, XEvent * event)
 	    {
 		ANIM_WINDOW(w);
 
-		// don't animate windows that don't have properties
+		// don't animate windows that don't have certain properties
 		// like the fullscreen darkening layer of gksudo
-		if (!w->resName)
+		if (!(w->resName || windowHasUserTime (w)))
 		    break;
 
 		int duration = 200;
@@ -3484,9 +3491,9 @@ static Bool animDamageWindowRect(CompWindow * w, Bool initial, BoxPtr rect)
 	    // OPEN event!
 
 	    if (chosenEffect &&
-		// don't animate windows that don't have properties
+		// don't animate windows that don't have certain properties
 		// like the fullscreen darkening layer of gksudo
-		w->resName &&
+		(w->resName || windowHasUserTime (w)) &&
 		// suppress switcher window
 		// (1st window that opens after switcher becomes active)
 		(!as->pluginActive[0] || as->switcherWinOpeningSuppressed) &&

Modified: fusion/plugins/animation/animation.xml.in
===================================================================
--- fusion/plugins/animation/animation.xml.in
+++ fusion/plugins/animation/animation.xml.in
@@ -126,8 +126,8 @@
 	    <_long>The windows that will be animated.</_long>
 	    <type>match</type>
 	    <default>
-	      <value>(type=Normal | Dialog | ModalDialog | Utility | Unknown)</value>
-	      <value>(type=Menu | PopupMenu | DropdownMenu) &amp; !(name=gnome-screensaver)</value>
+	      <value>(type=Normal | Dialog | ModalDialog | Utility | Unknown) &amp; !(name=gnome-screensaver)</value>
+	      <value>(type=Menu | PopupMenu | DropdownMenu)</value>
 	      <value>(type=Tooltip | Notification)</value>
 	    </default>
 	  </option>
@@ -353,8 +353,8 @@
 	    <_long>The windows that will be animated.</_long>
 	    <type>match</type>
 	    <default>
-	      <value>(type=Normal | Dialog | ModalDialog | Utility | Unknown)</value>
-	      <value>(type=Menu | PopupMenu | DropdownMenu) &amp; !(name=gnome-screensaver)</value>
+	      <value>(type=Normal | Dialog | ModalDialog | Utility | Unknown) &amp; !(name=gnome-screensaver)</value>
+	      <value>(type=Menu | PopupMenu | DropdownMenu)</value>
 	      <value>(type=Tooltip | Notification)</value>
 	    </default>
 	  </option>