[fusion-commits] Animation plugin: Changes to 'master' (15b9f93f8e583e788492ba104d2e3f4e7181a375)

[cornelius at server.beryl-project.org]

New commits:
commit 15b9f93f8e583e788492ba104d2e3f4e7181a375
Author: Erkin Bahceci <erkinbah at gmail.com>
Date:   Tue Jul 10 00:28:49 2007 -0400

    Fix Qt3 and Qt4 tooltip animations (Regexp plugin should be enabled).

commit ae312d1704ff4e2c2706f0900dc2a2d97c43bcfa
Author: Erkin Bahceci <erkinbah at gmail.com>
Date:   Tue Jul 10 00:26:09 2007 -0400

    Little cleanup.


 animation-internal.h |    1 -
 animation.c          |    4 ++--
 animation.xml.in     |    8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)


Modified: fusion/plugins/animation/animation-internal.h
===================================================================
--- fusion/plugins/animation/animation-internal.h
+++ fusion/plugins/animation/animation-internal.h
@@ -337,7 +337,6 @@ extern CompMetadata animMetadata;
 typedef struct _AnimDisplay
 {
     int screenPrivateIndex;
-    Atom wmHintsAtom;
     Atom winIconGeometryAtom;
     HandleEventProc handleEvent;
     HandleCompizEventProc handleCompizEvent;

Modified: fusion/plugins/animation/animation.c
===================================================================
--- fusion/plugins/animation/animation.c
+++ fusion/plugins/animation/animation.c
@@ -3813,7 +3813,6 @@ static Bool animInitDisplay(CompPlugin * p, CompDisplay * d)
 	return FALSE;
     }
 
-    ad->wmHintsAtom = XInternAtom(d->display, "WM_HINTS", FALSE);
     ad->winIconGeometryAtom =
 	XInternAtom(d->display, "_NET_WM_ICON_GEOMETRY", 0);
 
@@ -4057,7 +4056,7 @@ static Bool animInit(CompPlugin * p)
 					 animScreenOptionInfo,
 					 ANIM_SCREEN_OPTION_NUM))
 	return FALSE;
-		
+
     animDisplayPrivateIndex = allocateDisplayPrivateIndex();
     if (animDisplayPrivateIndex < 0)
     {
@@ -4068,6 +4067,7 @@ static Bool animInit(CompPlugin * p)
     compAddMetadataFromFile (&animMetadata, p->vTable->name);
 
     animEffectPropertiesTmp = animEffectProperties;
+
     return TRUE;
 }
 

Modified: fusion/plugins/animation/animation.xml.in
===================================================================
--- fusion/plugins/animation/animation.xml.in
+++ fusion/plugins/animation/animation.xml.in
@@ -207,7 +207,7 @@
 	  <option name="close1_match" type="match">
 	    <_short>Window Match</_short>
 	    <_long>The windows that will be animated.</_long>
-	    <default>(type=Normal | Dialog | ModalDialog | Utility | Unknown | name=sun-awt-X11-XFramePeer | name=sun-awt-X11-XDialogPeer) &amp; !(type=Normal &amp; override_redirect=1)</default>
+	    <default>((type=Normal | Dialog | ModalDialog | Utility | Unknown) | name=sun-awt-X11-XFramePeer | name=sun-awt-X11-XDialogPeer) &amp; !(role=toolTipTip | role=qtooltip_label) &amp; !(type=Normal &amp; override_redirect=1)</default>
 	  </option>
 	</subgroup>
 
@@ -401,7 +401,7 @@
 	  <option name="close2_match" type="match">
 	    <_short>Window Match</_short>
 	    <_long>The windows that will be animated.</_long>
-	    <default>((type=Menu | PopupMenu | DropdownMenu | Tooltip | Notification | name=sun-awt-X11-XWindowPeer) | (type=Normal &amp; override_redirect=1)) &amp; !(name=sun-awt-X11-XFramePeer | name=sun-awt-X11-XDialogPeer) &amp; !(name=gnome-screensaver)</default>
+	    <default>((type=Menu | PopupMenu | DropdownMenu | Tooltip | Notification) | role=toolTipTip | role=qtooltip_label | name=sun-awt-X11-XWindowPeer | (type=Normal &amp; override_redirect=1)) &amp; !(name=sun-awt-X11-XFramePeer | name=sun-awt-X11-XDialogPeer) &amp; !(name=gnome-screensaver)</default>
 	  </option>
 	</subgroup>
       </group>
@@ -599,7 +599,7 @@
 	  <option name="create1_match" type="match">
 	    <_short>Window Match</_short>
 	    <_long>Window that should animate with this effect when created.</_long>
-	    <default>(type=Normal | Dialog | ModalDialog | Utility | Unknown | name=sun-awt-X11-XFramePeer | name=sun-awt-X11-XDialogPeer) &amp; !(type=Normal &amp; override_redirect=1)</default>
+	    <default>((type=Normal | Dialog | ModalDialog | Utility | Unknown) | name=sun-awt-X11-XFramePeer | name=sun-awt-X11-XDialogPeer) &amp; !(role=toolTipTip | role=qtooltip_label) &amp; !(type=Normal &amp; override_redirect=1)</default>
 	  </option>
 	</subgroup>
 
@@ -793,7 +793,7 @@
 	  <option name="create2_match" type="match">
 	    <_short>Window Match</_short>
 	    <_long>Window that should animate with this effect when created.</_long>
-	    <default>((type=Menu | PopupMenu | DropdownMenu | Tooltip | Notification | name=sun-awt-X11-XWindowPeer) | (type=Normal &amp; override_redirect=1)) &amp; !(name=sun-awt-X11-XFramePeer | name=sun-awt-X11-XDialogPeer) &amp; !(name=gnome-screensaver)</default>
+	    <default>((type=Menu | PopupMenu | DropdownMenu | Tooltip | Notification) | role=toolTipTip | role=qtooltip_label | name=sun-awt-X11-XWindowPeer | (type=Normal &amp; override_redirect=1)) &amp; !(name=sun-awt-X11-XFramePeer | name=sun-awt-X11-XDialogPeer) &amp; !(name=gnome-screensaver)</default>
 	  </option>
 	</subgroup>
       </group>