Merge lp:~unity-team/compiz/plugins-main-trunk.fixes-2011-03-04 into lp:~unity-team/compiz/trunk

[Sam Spilsbury]

Allows expo to match the visual design better

[Didier Roche-Tolomelli (didrocks)]

The diff has conflicts, did you propose to the right branch?

It seems an UI change, that will be nice that you do the paper work here: https://wiki.ubuntu.com/FreezeExceptionProcess#UserInterfaceFreeze%20Exceptions

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

You're right, somehow it ended up on lp:compiz again :/

On Fri, Apr 8, 2011 at 4:22 PM, Didier Roche <email address hidden> wrote:
> Review: Needs Fixing
> The diff has conflicts, did you propose to the right branch?
>
> It seems an UI change, that will be nice that you do the paper work here: https://wiki.ubuntu.com/FreezeExceptionProcess#UserInterfaceFreeze%20Exceptions
> --
> https://code.launchpad.net/~unity-team/compiz/plugins-main-trunk.fixes-2011-03-04/+merge/56892
> Your team Unity Team is subscribed to branch lp:~unity-team/compiz/trunk.
>

--
Sam Spilsbury

[Sam Spilsbury (smspillaz)]

You're right, somehow it ended up on lp:compiz again :/

On Fri, Apr 8, 2011 at 4:22 PM, Didier Roche <email address hidden> wrote:
> Review: Needs Fixing
> The diff has conflicts, did you propose to the right branch?
>
> It seems an UI change, that will be nice that you do the paper work here: https://wiki.ubuntu.com/FreezeExceptionProcess#UserInterfaceFreeze%20Exceptions
> --
> https://code.launchpad.net/~unity-team/compiz/plugins-main-trunk.fixes-2011-03-04/+merge/56892
> Your team Unity Team is subscribed to branch lp:~unity-team/compiz/trunk.
>

--
Sam Spilsbury

[lp:~unity-team/compiz/plugins-main-trunk.fixes-2011-03-04]

5. By Sam Spilsbury on 2011-04-08

Much better implementation. Default should be X Offset: 64, Y Offset: 24

Unmerged revisions

5. By Sam Spilsbury on 2011-04-08

Much better implementation. Default should be X Offset: 64, Y Offset: 24

4. By Sam Spilsbury on 2011-04-08

Allow distance to be pulled back a bit further, add X and Y offset options for expo

3. By David Barth on 2011-04-06

fix embarassing typo

2. By David Barth on 2011-03-31

merge lp:~unity-team/compiz/plugins-main-trunk.fix_wrong_window_move_expo

1. By David Barth on 2011-03-29

initial import from compiz-plugins-main_0.9.4git20110322.orig.tar.gz

=== added file 'AUTHORS'
--- AUTHORS	1970-01-01 00:00:00 +0000
+++ AUTHORS	2011-04-08 08:14:44 +0000
@@ -0,0 +1,51 @@
+Lead Developers:
+--------------------------------------------
+	Danny Baumann <[e-mail]>
+	David Reveman <[e-mail]>
+	Dennis Kasprzyk <[e-mail]>
+	Erkin Bahceci <[e-mail]>
+	Guillaume Seguin - iXce <[e-mail]>
+	Kristian Lyngstøl <[e-mail]>
+
+Contributors:
+--------------------------------------------
+	Andrew Wedderburn(artwork) <[e-mail]>
+	Treviño - 3v1n0 <[e-mail]>
+	Travis Watkins <[e-mail]>
+	Roland Baer
+	Robert Carr
+	Quinnstorm <[e-mail]>
+	Roi Cohen <[e-mail]>
+	Andrew Riedi <[e-mail]>
+ 	Darryll Truchan - moppsy <[e-mail]>	
+
+Translators:
+--------------------------------------------
+	de 	Patrick Niklaus <[e-mail]>, Danny Baumann <[e-mail]>, Nick Bauermeister <[e-mail]>, Thorsten Sperber <[e-mail]>,  Markus Latarius <[e-mail]>, Johannes Engel <[e-mail]>
+	el 	Δημήτρης (djdoo) <[e-mail]>, Βασίλης (Aneurysm) <[e-mail]>, Κώστας (diafanos) <[e-mail]>, Thodo Mitch (Teddy) <[e-mail]>, Dimman Ramone (dimmanramone) <[e-mail]>
+	fr 	iXce - Guillaume Seguin <[e-mail]>, Sylvain Debray (syldeb35) <[e-mail]>, xsnake - Carl Garand <[e-mail]>
+	gu 	Ankit Patel <[e-mail]>
+	it 	Marco Trevisan (Treviño) <[e-mail]>, Fabio Fiorentini (Ahren / FaBBio) <[e-mail]>, Andrea De Iacovo (Firstbit)<[e-mail]>, Emiliano Perulli <[e-mail]>
+	pl 	Karol Sikora (elektrrrus) <elektrrrus at gmail dot com>, Adam Kremienowski (kremien) <akremien at gmail dot com>, Jakub Chromiak (silverado)<[e-mail]>, Mariusz Fik (fisiu) <[e-mail]> 
+	pt 	Nicolau Goncalves (Excentrik) <[e-mail]>
+	sv 	Daniel Nylander <[e-mail]>, Erik Eloff (Loffe) <[e-mail]>
+	zh 	Thruth Wang <[e-mail]>
+
+Note: 
+-------------------------------------------------------------------------------
+If you have contributed something significant to compiz-plugins 
+and your name is missing here, please email the lead developers 
+with your Full name, email address, country and a brief 
+reminder of what you have done.
+
+Format :
+-------------------------------------------------------------------------------
+In order to parse AUTHORS files some rules must be followed :
+
+1 - Each first chapter line must end by ':'
+The recognized chapter names are :
+"Developer:", "Developers:", "Contributors:", Note:", "Website:", "Documenters:"
+and "Translators:".
+
+2 - Each item of the "Translators" chapter must begin by the locale keyword.
+This keyword must be followed by a space.

=== renamed file 'AUTHORS' => 'AUTHORS.moved'
=== added file 'CMakeLists.txt'
--- CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ CMakeLists.txt	2011-04-08 08:14:44 +0000
@@ -0,0 +1,29 @@
+project (compiz-plugins-main)
+
+cmake_minimum_required (VERSION 2.4)
+
+find_package (Compiz REQUIRED)
+
+include (CompizCommon)
+include (CompizPackage)
+
+set (COMPIZ_VERSION_MAJOR 0)
+set (COMPIZ_VERSION_MINOR 9)
+set (COMPIZ_VERSION_MICRO 2)
+set (COMPIZ_VERSION_MACRO 1)
+set (VERSION ${COMPIZ_VERSION_MAJOR}.${COMPIZ_VERSION_MINOR}.${COMPIZ_VERSION_MICRO}.${COMPIZ_VERSION_MICRO})
+
+set (COMPIZ_PLUGIN_INSTALL_TYPE "package")
+
+set (ALL_LINGUAS af ar bg bn bn_IN bs ca cs cy da de el en_GB en_US es eu et fi fr gl gu he hi hr hu id it ja ka km ko lo lt mk mr nb nl or pa pl pt pt_BR ro ru sk sl sr sv ta tr uk vi xh zh_CN zh_TW zu)
+set (GETTEXT_PACKAGE compiz-plugins-main)
+
+compiz_add_plugins_in_folder ("${CMAKE_SOURCE_DIR}")
+
+compiz_print_configure_header ("Compiz Plugins Main")
+compiz_print_plugin_stats ("${CMAKE_SOURCE_DIR}")
+compiz_print_configure_footer ()
+
+compiz_package_generation ("Compiz Plugins Main")
+compiz_add_git_dist ()
+compiz_add_uninstall ()

=== renamed file 'CMakeLists.txt' => 'CMakeLists.txt.moved'
=== added file 'COPYING'
--- COPYING	1970-01-01 00:00:00 +0000
+++ COPYING	2011-04-08 08:14:44 +0000
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+

+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+

+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+

+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+

+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+

+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

=== renamed file 'COPYING' => 'COPYING.moved'
=== added file 'NEWS'
--- NEWS	1970-01-01 00:00:00 +0000
+++ NEWS	2011-04-08 08:14:44 +0000
@@ -0,0 +1,17 @@
+Release 0.9.2 (2010-10-24 Sam Spilsbury <[e-mail]>)
+==============================================================
+Development release.
+
+Added MultiAnim class to Animation plugin
+
+Added support for KDE 4.5 blur hinting
+
+Added "natural" scale mode
+
+Added fake mninimization support
+
+Use libxml to write the session save file
+
+Release 0.9.2.1 (2010-11-06 Sam Spilsbury <[e-mail]>)
+========================================================================
+Bugfix release.

=== renamed file 'NEWS' => 'NEWS.moved'
=== added directory 'animation'
=== added file 'animation/CMakeLists.txt'
--- animation/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ animation/CMakeLists.txt	2011-04-08 08:14:44 +0000
@@ -0,0 +1,7 @@
+find_package (Compiz REQUIRED)
+include (CompizPlugin)
+include (FindOpenGL)
+
+if (OPENGL_GLU_FOUND)
+    compiz_plugin (animation PLUGINDEPS composite opengl LIBRARIES ${OPENGL_glu_LIBRARY} INCDIRS ${OPENGL_INCLUDE_DIR})
+endif (OPENGL_GLU_FOUND)

=== added file 'animation/animation.xml.in'
--- animation/animation.xml.in	1970-01-01 00:00:00 +0000
+++ animation/animation.xml.in	2011-04-08 08:14:44 +0000
@@ -0,0 +1,757 @@
+<compiz>
+  <!-- animation metadata -->
+  <plugin name="animation" useBcop="true">
+    <_short>Animations</_short>
+    <_long>Use various animations as window effects</_long>
+    <feature>windowanimations</feature>
+    <category>Effects</category>
+    <deps>
+      <requirement>
+	<plugin>opengl</plugin>
+	<plugin>regex</plugin>
+      </requirement>
+      <relation type="after">
+	<plugin>decor</plugin>
+	<plugin>composite</plugin>
+	<plugin>opengl</plugin>
+	<plugin>regex</plugin>
+      </relation>
+      <relation type="before">
+	<plugin>fade</plugin>
+      </relation>
+    </deps>
+
+    <options>
+
+      <group>
+	<_short>Open Animation</_short>
+
+	<subgroup>
+	  <_short>Animation Selection</_short>
+	  <option name="open_effects" type="list">
+	    <_short>Open Effect</_short>
+	    <_long>The animation effect shown when creating a window.</_long>
+	    <type>string</type>
+	    <extensible/>
+	    <sort start="2"/>
+	    <default>
+	      <value>animation:Zoom</value>
+	      <value>animation:Fade</value>
+	      <value>animation:Fade</value>
+	    </default>
+	  </option>
+	  <option name="open_durations" type="list">
+	    <_short>Duration</_short>
+	    <_long>Animation duration in milliseconds for open effect.</_long>
+	    <type>int</type>
+	    <min>50</min>
+	    <max>4000</max>
+	    <default>
+	      <value>200</value>
+	      <value>150</value>
+	      <value>150</value>
+	    </default>
+	  </option>
+	  <option name="open_matches" type="list">
+	    <_short>Window Match</_short>
+	    <_long>The windows that will be animated.</_long>
+	    <type>match</type>
+	    <default>
+	      <value>(type=Normal | Dialog | ModalDialog | Unknown) &amp; !(name=gnome-screensaver)</value>
+	      <value>(type=Menu | PopupMenu | DropdownMenu | Combo)</value>
+	      <value>(type=Tooltip | Notification | Utility) &amp; !(name=compiz) &amp; !(title=notify-osd)</value>
+	    </default>
+	  </option>
+	  <option name="open_options" type="list">
+	    <_short>Options</_short>
+	    <_long>Comma separated list of option value assignments to override effect settings, e.g.: fire_color=#0080ffff, fire_particles=700, fire_smoke=1</_long>
+	    <type>string</type>
+	    <default>
+	      <value></value>
+	      <value></value>
+	      <value></value>
+	    </default>
+	  </option>
+	</subgroup>
+
+	<subgroup>
+	  <_short>Random Effects</_short>
+	  <option name="open_random_effects" type="list">
+	    <_short>Pool</_short>
+	    <_long>Pool of effects to be chosen from if Random effect is selected. Click reset to use all effects.</_long>
+	    <type>string</type>
+	    <extensible/>
+	    <sort start="2"/>
+	    <default>
+	    </default>
+	  </option>
+	</subgroup>
+
+      </group>
+
+      <group>
+	<_short>Close Animation</_short>
+
+	<subgroup>
+	  <_short>Animation Selection</_short>
+	  <option name="close_effects" type="list">
+	    <_short>Close Effect</_short>
+	    <_long>The animation effect shown when closing a window.</_long>
+	    <type>string</type>
+	    <extensible/>
+	    <sort start="2"/>
+	    <default>
+	      <value>animation:Zoom</value>
+	      <value>animation:Fade</value>
+	      <value>animation:Fade</value>
+	    </default>
+	  </option>
+	  <option name="close_durations" type="list">
+	    <_short>Duration</_short>
+	    <_long>Animation duration in milliseconds for close effect.</_long>
+	    <type>int</type>
+	    <min>50</min>
+	    <max>4000</max>
+	    <default>
+	      <value>200</value>
+	      <value>150</value>
+	      <value>150</value>
+	    </default>
+	  </option>
+	  <option name="close_matches" type="list">
+	    <_short>Window Match</_short>
+	    <_long>The windows that will be animated.</_long>
+	    <type>match</type>
+	    <default>
+	      <value>(type=Normal | Dialog | ModalDialog | Unknown) &amp; !(name=gnome-screensaver)</value>
+	      <value>(type=Menu | PopupMenu | DropdownMenu | Combo)</value>
+	      <value>(type=Tooltip | Notification | Utility) &amp; !(name=compiz) &amp; !(title=notify-osd)</value>
+	    </default>
+	  </option>
+	  <option name="close_options" type="list">
+	    <_short>Options</_short>
+	    <_long>Comma separated list of option value assignments to override effect settings, e.g.: fire_color=#0080ffff, fire_particles=700, fire_smoke=1</_long>
+	    <type>string</type>
+	    <default>
+	      <value></value>
+	      <value></value>
+	      <value></value>
+	    </default>
+	  </option>
+	</subgroup>
+
+	<subgroup>
+	  <_short>Random Effects</_short>
+	  <option name="close_random_effects" type="list">
+	    <_short>Pool</_short>
+	    <_long>Pool of effects to be chosen from if Random effect is selected. Click reset to use all effects.</_long>
+	    <type>string</type>
+	    <extensible/>
+	    <sort start="2"/>
+	    <default>
+	    </default>
+	  </option>
+	</subgroup>
+
+      </group>
+
+      <group>
+	<_short>Minimize Animation</_short>
+
+	<subgroup>
+	  <_short>Animation Selection</_short>
+	  <option name="minimize_effects" type="list">
+	    <_short>Minimize Effect</_short>
+	    <_long>The animation effect shown when minimizing a window.</_long>
+	    <type>string</type>
+	    <extensible/>
+	    <sort start="2"/>
+	    <default>
+	      <value>animation:Magic Lamp</value>
+	    </default>
+	  </option>
+	  <option name="minimize_durations" type="list">
+	    <_short>Duration</_short>
+	    <_long>Animation duration in milliseconds for minimize effect.</_long>
+	    <type>int</type>
+	    <min>50</min>
+	    <max>4000</max>
+	    <default>
+	      <value>300</value>
+	    </default>
+	  </option>
+	  <option name="minimize_matches" type="list">
+	    <_short>Window Match</_short>
+	    <_long>The windows that will be animated.</_long>
+	    <type>match</type>
+	    <default>
+	      <value>(type=Normal | Dialog | ModalDialog | Unknown)</value>
+	    </default>
+	  </option>
+	  <option name="minimize_options" type="list">
+	    <_short>Options</_short>
+	    <_long>Comma separated list of option value assignments to override effect settings, e.g.: fire_color=#0080ffff, fire_particles=700, fire_smoke=1</_long>
+	    <type>string</type>
+	    <default>
+	      <value></value>
+	    </default>
+	  </option>
+	</subgroup>
+
+	<subgroup>
+	  <_short>Random Effects</_short>
+	  <option name="minimize_random_effects" type="list">
+	    <_short>Pool</_short>
+	    <_long>Pool of effects to be chosen from if Random effect is selected. Click reset to use all effects.</_long>
+	    <type>string</type>
+	    <extensible/>
+	    <sort start="2"/>
+	    <default>
+	    </default>
+	  </option>
+	</subgroup>
+
+      </group>
+
+      <group>
+	<_short>Shade Animation</_short>
+
+	<subgroup>
+	  <_short>Animation Selection</_short>
+	  <option name="shade_effects" type="list">
+	    <_short>Shade Effect</_short>
+	    <_long>The animation effect shown when shading a window.</_long>
+	    <type>string</type>
+	    <extensible/>
+	    <sort start="2"/>
+	    <default>
+	      <value>animation:Roll Up</value>
+	    </default>
+	  </option>
+	  <option name="shade_durations" type="list">
+	    <_short>Duration</_short>
+	    <_long>Animation duration in milliseconds for shade effect.</_long>
+	    <type>int</type>
+	    <min>50</min>
+	    <max>4000</max>
+	    <default>
+	      <value>300</value>
+	    </default>
+	  </option>
+	  <option name="shade_matches" type="list">
+	    <_short>Window Match</_short>
+	    <_long>Window that should animate with this effect when shaded.</_long>
+	    <type>match</type>
+	    <default>
+	      <value>(type=Normal | Dialog | ModalDialog | Utility | Unknown)</value>
+	    </default>
+	  </option>
+	  <option name="shade_options" type="list">
+	    <_short>Options</_short>
+	    <_long>Comma separated list of option value assignments to override effect settings, e.g.: fire_color=#0080ffff, fire_particles=700, fire_smoke=1</_long>
+	    <type>string</type>
+	    <default>
+	      <value></value>
+	    </default>
+	  </option>
+	</subgroup>
+
+	<subgroup>
+	  <_short>Random Effects</_short>
+	  <option name="shade_random_effects" type="list">
+	    <_short>Pool</_short>
+	    <_long>Pool of effects to be chosen from if Random effect is selected. Click reset to use all effects.</_long>
+	    <type>string</type>
+	    <extensible/>
+	    <sort start="2"/>
+	    <default>
+	    </default>
+	  </option>
+	</subgroup>
+
+      </group>
+
+      <group>
+	<_short>Focus Animation</_short>
+	<subgroup>
+	  <_short>Animation Selection</_short>
+	  <option name="focus_effects" type="list">
+	    <_short>Focus Effect</_short>
+	    <_long>The animation effect shown when focusing a window.</_long>
+	    <type>string</type>
+	    <extensible/>
+	    <sort start="1"/>
+	    <default>
+	      <value>animation:None</value>
+	    </default>
+	  </option>
+	  <option name="focus_durations" type="list">
+	    <_short>Duration</_short>
+	    <_long>Animation duration in milliseconds for focus effect.</_long>
+	    <type>int</type>
+	    <min>50</min>
+	    <max>4000</max>
+	    <default>
+	      <value>300</value>
+	    </default>
+	  </option>
+	  <option name="focus_matches" type="list">
+	    <_short>Window Match</_short>
+	    <_long>Window that should animate with this effect when focused.</_long>
+	    <type>match</type>
+	    <default>
+	      <value>(type=Normal | Dialog | ModalDialog | Utility | Unknown) &amp; !(name=compiz)</value>
+	    </default>
+	  </option>
+	  <option name="focus_options" type="list">
+	    <_short>Options</_short>
+	    <_long>Comma separated list of option value assignments to override effect settings, e.g.: fire_color=#0080ffff, fire_particles=700, fire_smoke=1</_long>
+	    <type>string</type>
+	    <default>
+	      <value></value>
+	    </default>
+	  </option>
+        </subgroup>
+      </group>
+
+      <group>
+	<_short>Effect Settings</_short>
+	<extensible/>
+
+	<option name="all_random" type="bool">
+	  <_short>Random Animations For All Events</_short>
+	  <_long>All effects are chosen randomly, ignoring the selected effect. If None is selected for an event, that event won't be animated.</_long>
+	  <default>false</default>
+	</option>
+	<option name="time_step" type="int">
+	  <_short>Animation Time Step</_short>
+	  <_long>The amount of time in milliseconds between each render of the animation. The higher the number, the jerkier the movements become.</_long>
+	  <default>10</default>
+	  <min>1</min>
+	  <max>400</max>
+	</option>
+
+	<subgroup>
+	  <_short>Curved Fold</_short>
+	  <option name="curved_fold_amp_mult" type="float">
+	    <_short>Amplitude Multiplier</_short>
+	    <_long>Fold amplitude (size) is multiplied by this number. Negative values fold outward.</_long>
+	    <default>1.0</default>
+	    <min>-1.5</min>
+	    <max>2</max>
+	    <precision>0.05</precision>
+	  </option>
+	  <option name="curved_fold_zoom_to_taskbar" type="bool">
+	    <_short>Zoom to TaskBar on Minimize</_short>
+	    <_long>Whether the window should zoom to taskbar when minimized with Curved Fold effect.</_long>
+	    <default>true</default>
+	  </option>
+	</subgroup>
+
+	<subgroup>
+	  <_short>Dodge</_short>
+	  <option name="dodge_mode" type="int">
+	    <_short>Mode</_short>
+	    <_long>Fixed Clicked Window: The window that is clicked on will stay fixed. All Moving: The clicked window will do a dodging action as well.</_long>
+	    <default>1</default>
+	    <min>0</min>
+	    <max>1</max>
+	    <desc>
+	      <value>0</value>
+	      <_name>Fixed Clicked Window</_name>
+	    </desc>
+	    <desc>
+	      <value>1</value>
+	      <_name>All Moving</_name>
+	    </desc>
+	  </option>
+	  <option name="dodge_gap_ratio" type="float">
+	    <_short>Gap Ratio</_short>
+	    <_long>Ratio of gaps between dodge start times to focus duration.</_long>
+	    <default>0.5</default>
+	    <min>0</min>
+	    <max>1</max>
+	    <precision>0.01</precision>
+	  </option>
+	</subgroup>
+
+	<subgroup>
+	  <_short>Dream</_short>
+	  <option name="dream_zoom_to_taskbar" type="bool">
+	    <_short>Zoom to TaskBar on Minimize</_short>
+	    <_long>Whether the window should zoom to taskbar when minimized with Dream effect.</_long>
+	    <default>true</default>
+	  </option>
+	</subgroup>
+
+	<subgroup>
+	  <_short>Glide 1</_short>
+	  <option name="glide1_away_position" type="float">
+	    <_short>Away Position</_short>
+	    <_long>Closeness of window to camera at the end of the animation (1.0: Close to camera, -2.0: Away from camera).</_long>
+	    <default>1</default>
+	    <min>-2</min>
+	    <max>1</max>
+	    <precision>0.05</precision>
+	  </option>
+	  <option name="glide1_away_angle" type="float">
+	    <_short>Away Angle</_short>
+	    <_long>Angle of window at the end of the animation.</_long>
+	    <default>0</default>
+	    <min>-540</min>
+	    <max>540</max>
+	    <precision>5</precision>
+	  </option>
+	  <option name="glide1_zoom_to_taskbar" type="bool">
+	    <_short>Zoom to TaskBar on Minimize</_short>
+	    <_long>Whether the window should zoom to taskbar when minimized with Glide 1 effect.</_long>
+	    <default>false</default>
+	  </option>
+	</subgroup>
+
+	<subgroup>
+	  <_short>Glide 2</_short>
+	  <option name="glide2_away_position" type="float">
+	    <_short>Away Position</_short>
+	    <_long>Closeness of window to camera at the end of the animation (1.0: Close to camera, -2.0: Away from camera).</_long>
+	    <default>-0.4</default>
+	    <min>-2</min>
+	    <max>1</max>
+	    <precision>0.05</precision>
+	  </option>
+	  <option name="glide2_away_angle" type="float">
+	    <_short>Away Angle</_short>
+	    <_long>Angle of window at the end of the animation.</_long>
+	    <default>-45</default>
+	    <min>-540</min>
+	    <max>540</max>
+	    <precision>5</precision>
+	  </option>
+	  <option name="glide2_zoom_to_taskbar" type="bool">
+	    <_short>Zoom to TaskBar on Minimize</_short>
+	    <_long>Whether the window should zoom to taskbar when minimized with Glide 2 effect.</_long>
+	    <default>true</default>
+	  </option>
+	</subgroup>
+
+	<subgroup>
+	  <_short>Horizontal Folds</_short>
+	  <option name="horizontal_folds_amp_mult" type="float">
+	    <_short>Amplitude Multiplier</_short>
+	    <_long>Fold amplitude (size) is multiplied by this number. Negative values fold outward.</_long>
+	    <default>1.0</default>
+	    <min>-1</min>
+	    <max>3</max>
+	    <precision>0.05</precision>
+	  </option>
+	  <option name="horizontal_folds_num_folds" type="int">
+	    <_short>Number of Horizontal Folds</_short>
+	    <_long>The number of horizontal folds that occur in the Horizontal Fold animation.</_long>
+	    <default>3</default>
+	    <min>1</min>
+	    <max>50</max>
+	  </option>
+	  <option name="horizontal_folds_zoom_to_taskbar" type="bool">
+	    <_short>Zoom to TaskBar on Minimize</_short>
+	    <_long>Whether the window should zoom to taskbar when minimized with Horizontal Folds effect.</_long>
+	    <default>true</default>
+	  </option>
+	</subgroup>
+
+	<subgroup>
+	  <_short>Magic Lamp</_short>
+	  <option name="magic_lamp_moving_end" type="bool">
+	    <_short>Open/Close Moving End</_short>
+	    <_long>On open/close, move magic lamp ending point with the mouse pointer.</_long>
+	    <default>true</default>
+	  </option>
+	  <option name="magic_lamp_grid_res" type="int">
+	    <_short>Grid Y Resolution</_short>
+	    <_long>Vertex grid resolution for Magic Lamp (Y dimension only). This is the number of points used to define the curves. The higher the number, the smoother the curves. However there will be a loss of performance (CPU usage increases).</_long>
+	    <default>100</default>
+	    <min>2</min>
+	    <max>200</max>
+	  </option>
+	  <option name="magic_lamp_open_start_width" type="int">
+	    <_short>Open Start Width</_short>
+	    <_long>Starting width of open effect and ending width of close effect for Magic Lamp.</_long>
+	    <default>30</default>
+	    <min>0</min>
+	    <max>500</max>
+	  </option>
+	</subgroup>
+
+	<subgroup>
+	  <_short>Magic Lamp Wavy</_short>
+	  <option name="magic_lamp_wavy_moving_end" type="bool">
+	    <_short>Open/Close Moving End</_short>
+	    <_long>On open/close, move magic lamp ending point with the mouse pointer.</_long>
+	    <default>true</default>
+	  </option>
+	  <option name="magic_lamp_wavy_grid_res" type="int">
+	    <_short>Grid Y Resolution</_short>
+	    <_long>Vertex grid resolution for Magic Lamp Wavy (Y dimension only). This is the number of points used to define the curves. The higher the number, the smoother the curves. However there will be a loss of performance (CPU usage increases).</_long>
+	    <default>100</default>
+	    <min>4</min>
+	    <max>200</max>
+	  </option>
+	  <option name="magic_lamp_wavy_max_waves" type="int">
+	    <_short>Max Waves</_short>
+	    <_long>The maximum number of waves for Magic Lamp Wavy.</_long>
+	    <default>3</default>
+	    <min>1</min>
+	    <max>20</max>
+	  </option>
+	  <option name="magic_lamp_wavy_amp_min" type="float">
+	    <_short>Min Wave Amplitude</_short>
+	    <_long>The minimum wave amplitude (size of the waves) Magic Lamp Wavy will have.</_long>
+	    <default>200</default>
+	    <min>200</min>
+	    <max>2000</max>
+	    <precision>5</precision>
+	  </option>
+	  <option name="magic_lamp_wavy_amp_max" type="float">
+	    <_short>Max Wave Amplitude</_short>
+	    <_long>The maximum wave amplitude (size of the waves) Magic Lamp Wavy will have.</_long>
+	    <default>300</default>
+	    <min>200</min>
+	    <max>2000</max>
+	    <precision>5</precision>
+	  </option>
+	  <option name="magic_lamp_wavy_open_start_width" type="int">
+	    <_short>Open Start Width</_short>
+	    <_long>Starting width of open effect and ending width of close effect for Magic Lamp Wavy.</_long>
+	    <default>30</default>
+	    <min>0</min>
+	    <max>500</max>
+	  </option>
+	</subgroup>
+
+	<subgroup>
+	  <_short>Roll Up</_short>
+	  <option name="rollup_fixed_interior" type="bool">
+	    <_short>Fixed Interior</_short>
+	    <_long>Fixed window interior during the Rollup animation.</_long>
+	    <default>false</default>
+	  </option>
+	</subgroup>
+
+	<subgroup>
+	  <_short>Sidekick</_short>
+	  <option name="sidekick_num_rotations" type="float">
+	    <_short>Number of Rotations</_short>
+	    <_long>Number of rotations for Sidekick (plus or minus 10% for randomness).</_long>
+	    <default>0.5</default>
+	    <min>0</min>
+	    <max>5</max>
+	    <precision>0.01</precision>
+	  </option>
+	  <option name="sidekick_springiness" type="float">
+	    <_short>Springiness</_short>
+	    <_long>How spring-like the Sidekick animation should be.</_long>
+	    <default>0.0</default>
+	    <min>0</min>
+	    <max>1</max>
+	    <precision>0.01</precision>
+	  </option>
+	  <option name="sidekick_zoom_from_center" type="int">
+	    <_short>Zoom from Center</_short>
+	    <_long>Zoom from center when playing the Sidekick animation.</_long>
+	    <default>0</default>
+	    <min>0</min>
+	    <max>3</max>
+	    <desc>
+	      <value>0</value>
+	      <_name>Off</_name>
+	    </desc>
+	    <desc>
+	      <value>1</value>
+	      <_name>Minimize/Unminimize Only</_name>
+	    </desc>
+	    <desc>
+	      <value>2</value>
+	      <_name>Open/Close Only</_name>
+	    </desc>
+	    <desc>
+	      <value>3</value>
+	      <_name>On</_name>
+	    </desc>
+	  </option>
+	</subgroup>
+
+	<subgroup>
+	  <_short>Wave</_short>
+	  <option name="wave_width" type="float">
+	    <_short>Wave Width</_short>
+	    <_long>The width of the wave relative to the window height.</_long>
+	    <default>0.7</default>
+	    <min>0.02</min>
+	    <max>3</max>
+	    <precision>0.01</precision>
+	  </option>
+	  <option name="wave_amp_mult" type="float">
+	    <_short>Wave Amplitude Multiplier</_short>
+	    <_long>Wave amplitude (size) is multiplied by this number. Negative values fold outward.</_long>
+	    <default>1.0</default>
+	    <min>-20</min>
+	    <max>20</max>
+	    <precision>0.1</precision>
+	  </option>
+	</subgroup>
+
+	<subgroup>
+	  <_short>Zoom</_short>
+	  <option name="zoom_from_center" type="int">
+	    <_short>Zoom from Center</_short>
+	    <_long>Zoom from center when playing the Zoom animation.</_long>
+	    <default>0</default>
+	    <min>0</min>
+	    <max>3</max>
+	    <desc>
+	      <value>0</value>
+	      <_name>Off</_name>
+	    </desc>
+	    <desc>
+	      <value>1</value>
+	      <_name>Minimize/Unminimize Only</_name>
+	    </desc>
+	    <desc>
+	      <value>2</value>
+	      <_name>Open/Close Only</_name>
+	    </desc>
+	    <desc>
+	      <value>3</value>
+	      <_name>On</_name>
+	    </desc>
+	  </option>
+	  <option name="zoom_springiness" type="float">
+	    <_short>Springiness</_short>
+	    <_long>How spring-like the Zoom animation should be.</_long>
+	    <default>0.0</default>
+	    <min>0</min>
+	    <max>1</max>
+	    <precision>0.01</precision>
+	  </option>
+	</subgroup>
+      </group> 
+
+    </options>
+
+    <extension base_plugin="animation">
+      <base_option>open_effects</base_option>
+      <base_option>close_effects</base_option>
+      <base_option>minimize_effects</base_option>
+      <base_option>shade_effects</base_option>
+      <restriction>
+	<value>animation:None</value>
+	<_name>None</_name>
+      </restriction>
+      <restriction>
+	<value>animation:Random</value>
+	<_name>Random</_name>
+      </restriction>
+    </extension>
+
+    <extension base_plugin="animation">
+      <base_option>open_effects</base_option>
+      <base_option>open_random_effects</base_option>
+      <base_option>close_effects</base_option>
+      <base_option>close_random_effects</base_option>
+      <base_option>minimize_effects</base_option>
+      <base_option>minimize_random_effects</base_option>
+      <base_option>shade_effects</base_option>
+      <base_option>shade_random_effects</base_option>
+      <restriction>
+	<value>animation:Curved Fold</value>
+	<_name>Curved Fold</_name>
+      </restriction>
+      <restriction>
+	<value>animation:Horizontal Folds</value>
+	<_name>Horizontal Folds</_name>
+      </restriction>
+    </extension>
+
+    <extension base_plugin="animation">
+      <base_option>shade_effects</base_option>
+      <base_option>shade_random_effects</base_option>
+      <restriction>
+	<value>animation:Roll Up</value>
+	<_name>Roll Up</_name>
+      </restriction>
+    </extension>
+
+    <extension base_plugin="animation">
+      <base_option>open_effects</base_option>
+      <base_option>open_random_effects</base_option>
+      <base_option>close_effects</base_option>
+      <base_option>close_random_effects</base_option>
+      <base_option>minimize_effects</base_option>
+      <base_option>minimize_random_effects</base_option>
+      <restriction>
+	<value>animation:Dream</value>
+	<_name>Dream</_name>
+      </restriction>
+      <restriction>
+	<value>animation:Fade</value>
+	<_name>Fade</_name>
+      </restriction>
+      <restriction>
+	<value>animation:Glide 1</value>
+	<_name>Glide 1</_name>
+      </restriction>
+      <restriction>
+	<value>animation:Glide 2</value>
+	<_name>Glide 2</_name>
+      </restriction>
+      <restriction>
+	<value>animation:Magic Lamp</value>
+	<_name>Magic Lamp</_name>
+      </restriction>
+      <restriction>
+	<value>animation:Magic Lamp Wavy</value>
+	<_name>Magic Lamp Wavy</_name>
+      </restriction>
+      <restriction>
+	<value>animation:Sidekick</value>
+	<_name>Sidekick</_name>
+      </restriction>
+      <restriction>
+	<value>animation:Zoom</value>
+	<_name>Zoom</_name>
+      </restriction>
+    </extension>
+
+    <extension base_plugin="animation">
+      <base_option>open_effects</base_option>
+      <base_option>open_random_effects</base_option>
+      <base_option>close_effects</base_option>
+      <base_option>close_random_effects</base_option>
+      <restriction>
+	<value>animation:Wave</value>
+	<_name>Wave</_name>
+      </restriction>
+    </extension>
+
+    <extension base_plugin="animation">
+      <base_option>focus_effects</base_option>
+      <restriction>
+	<value>animation:None</value>
+	<_name>None</_name>
+      </restriction>
+      <restriction>
+	<value>animation:Dodge</value>
+	<_name>Dodge</_name>
+      </restriction>
+      <restriction>
+	<value>animation:Focus Fade</value>
+	<_name>Fade</_name>
+      </restriction>
+      <restriction>
+	<value>animation:Wave</value>
+	<_name>Wave</_name>
+      </restriction>
+    </extension>
+    
+  </plugin>
+</compiz>
+

=== added file 'animation/compiz-animation.pc.in'
--- animation/compiz-animation.pc.in	1970-01-01 00:00:00 +0000
+++ animation/compiz-animation.pc.in	2011-04-08 08:14:44 +0000
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: compiz-animation
+Description: Animation plugin for compiz
+Version: @VERSION@
+
+Requires: compiz compiz-composite compiz-opengl
+Libs: -L${libdir} -lanimation
+Cflags: @COMPIZ_CFLAGS@

=== added directory 'animation/docs'
=== added file 'animation/docs/animation-class-hierarchy.odg'
Binary files animation/docs/animation-class-hierarchy.odg	1970-01-01 00:00:00 +0000 and animation/docs/animation-class-hierarchy.odg	2011-04-08 08:14:44 +0000 differ
=== added directory 'animation/include'
=== added file 'animation/include/.directory'
--- animation/include/.directory	1970-01-01 00:00:00 +0000
+++ animation/include/.directory	2011-04-08 08:14:44 +0000
@@ -0,0 +1,3 @@
+[Dolphin]
+ShowPreview=true
+Timestamp=2010,8,12,5,55,57

=== added directory 'animation/include/animation'
=== added file 'animation/include/animation/animation.h'
--- animation/include/animation/animation.h	1970-01-01 00:00:00 +0000
+++ animation/include/animation/animation.h	2011-04-08 08:14:44 +0000
@@ -0,0 +1,77 @@
+#ifndef _ANIMATION_H
+#define _ANIMATION_H
+
+#define ANIMATION_ABI 20091205
+
+#include <core/pluginclasshandler.h>
+#include <opengl/fragment.h>
+
+typedef enum
+{
+    WindowEventOpen = 0,
+    WindowEventClose,
+    WindowEventMinimize,
+    WindowEventUnminimize,
+    WindowEventShade,
+    WindowEventUnshade,
+    WindowEventFocus,
+    WindowEventNum,
+    WindowEventNone
+} WindowEvent;
+
+typedef enum
+{
+    AnimEventOpen = 0,
+    AnimEventClose,
+    AnimEventMinimize,
+    AnimEventShade,
+    AnimEventFocus,
+    AnimEventNum
+} AnimEvent;
+
+typedef enum
+{
+    AnimDirectionDown = 0,
+    AnimDirectionUp,
+    AnimDirectionLeft,
+    AnimDirectionRight,
+    AnimDirectionRandom,
+    AnimDirectionAuto
+} AnimDirection;
+#define LAST_ANIM_DIRECTION 5
+
+class PrivateAnimScreen;
+class PrivateAnimWindow;
+class Animation;
+class AnimWindow;
+class AnimEffectInfo;
+
+typedef AnimEffectInfo * AnimEffect;
+
+#define RAND_FLOAT() ((float)rand() / RAND_MAX)
+
+#define sigmoid(fx) (1.0f/(1.0f+exp(-5.0f*2*((fx)-0.5))))
+#define sigmoid2(fx, s) (1.0f/(1.0f+exp(-(s)*2*((fx)-0.5))))
+
+#define NUM_OPTIONS(s) (sizeof ((s)->opt) / sizeof (CompOption))
+
+#include "extensionplugin.h"
+#include "animeffect.h"
+#include "point3d.h"
+#include "persistent.h"
+#include "grid.h"
+#include "screen.h"
+#include "window.h"
+#include "transform.h"
+#include "fade.h"
+#include "partialwindow.h"
+#include "gridtransform.h"
+#include "zoom.h"
+#include "multi.h"
+
+
+// ratio of perceived length of animation compared to real duration
+// to make it appear to have the same speed with other animation effects
+
+#endif
+

=== added file 'animation/include/animation/animeffect.h'
--- animation/include/animation/animeffect.h	1970-01-01 00:00:00 +0000
+++ animation/include/animation/animeffect.h	2011-04-08 08:14:44 +0000
@@ -0,0 +1,209 @@
+#ifndef ANIMATION_ANIMEFFECT_H
+#define ANIMATION_ANIMEFFECT_H
+#include "animation.h"
+
+typedef Animation *(*CreateAnimFunc) (CompWindow *w,
+				       WindowEvent curWindowEvent,
+				       float duration,
+				       const AnimEffect info,
+				       const CompRect &icon);
+
+ /// Animation info class that holds the name, the list of supported events, and
+ /// the creator function for a subclass of Animation.
+ /// A pointer to this class is used as an identifier for each implemented
+ /// animation.
+class AnimEffectInfo
+{
+public:
+     AnimEffectInfo (const char *name,
+		     bool usedO, bool usedC, bool usedM, bool usedS, bool usedF,
+		     CreateAnimFunc create, bool isRestackAnim = false);
+     ~AnimEffectInfo () {}
+     
+     bool matchesEffectName (const CompString &animName);
+     
+     bool matchesPluginName (const CompString &pluginName);
+     
+     const char *name; ///< Name of the animation effect, e.g. "animationpack:Implode".
+							       
+    /// To be set to true for the window event animation list(s) that
+    /// the new animation (value) should be added to
+    /// (0: open, 1: close, 2: minimize, 3: shade, 4: focus)
+    bool usedForEvents[AnimEventNum];
+
+    /// Creates an instance of the Animation subclass and returns it as an
+    /// Animation instance.
+    CreateAnimFunc create;
+
+    /// Is it a complex focus animation? (i.e. restacking-related,
+    /// like FocusFade/Dodge)
+    bool isRestackAnim;
+};
+
+template<class T>
+Animation *createAnimation (CompWindow *w,
+			    WindowEvent curWindowEvent,
+			    float duration,
+			    const AnimEffect info,
+			    const CompRect &icon)
+{
+    return new T (w, curWindowEvent, duration, info, icon);
+}
+
+
+/** The base class for all animations.
+ A n*imations should derive from the closest animation class
+ to override as few methods as possible. Also, an animation
+ method should call ancestors' methods instead of duplicating
+ their code.
+ */
+class Animation
+{
+protected:
+    CompWindow *mWindow;
+    AnimWindow *mAWindow;
+    
+    float mTotalTime;
+    float mRemainingTime;
+    float mTimestep;		///< to store anim. timestep at anim. start
+    float mTimeElapsedWithinTimeStep;
+    
+    int mTimeSinceLastPaint;    ///< in milliseconds
+    
+    int mOverrideProgressDir;	///< 0: default dir, 1: forward, 2: backward
+    
+    GLFragment::Attrib mCurPaintAttrib;
+    GLushort mStoredOpacity;
+    WindowEvent mCurWindowEvent;
+    bool mInitialized; ///< whether the animation is initialized (in preparePaint)
+    
+    AnimEffect mInfo; ///< information about the animation class
+    
+    CompRect mIcon;
+    
+    int mDecorTopHeight;
+    int mDecorBottomHeight;
+    
+    GLTexture::List *texturesCache;
+    
+    CompOption::Value &optVal (unsigned int optionId);
+    
+    inline bool       optValB (unsigned int optionId) { return optVal (optionId).b (); }
+    inline int        optValI (unsigned int optionId) { return optVal (optionId).i (); }
+    inline float      optValF (unsigned int optionId) { return optVal (optionId).f (); }
+    inline CompString optValS (unsigned int optionId) { return optVal (optionId).s (); }
+    inline unsigned short *optValC (unsigned int optionId) { return optVal (optionId).c (); }
+    
+public:
+    
+    Animation (CompWindow *w,
+	       WindowEvent curWindowEvent,
+	       float duration,
+	       const AnimEffect info,
+	       const CompRect &icon);
+    virtual ~Animation ();
+    
+    inline AnimEffect info () { return mInfo; }
+    
+    // Overridable animation methods.
+    
+    /// Needed since virtual method calls can't be done in the constructor.
+    virtual void init () {}
+    
+    /// To be called during post-animation clean up.
+    virtual void cleanUp (bool closing,
+			  bool destructing) {}
+			  
+    /// Returns true if frame should be skipped (e.g. due to
+    /// higher timestep values). In that case no drawing is
+    /// needed for that window in current frame.
+    virtual bool shouldSkipFrame (int msSinceLastPaintActual);
+
+    /// Advances the animation time by the given time amount.
+    /// Returns true if more animation time is left.
+    virtual bool advanceTime (int msSinceLastPaint);
+
+    /// Computes new animation state based on remaining time.
+    virtual void step () {}
+    virtual void updateAttrib (GLWindowPaintAttrib &) {}
+    virtual void updateTransform (GLMatrix &) {}
+    virtual void prePaintWindow () {}
+    virtual void postPaintWindow () {}
+    virtual bool postPaintWindowUsed () { return false; }
+
+    /// Returns true if the animation is still in progress.
+    virtual bool prePreparePaint (int msSinceLastPaint) { return false; }
+    virtual void postPreparePaint () {}
+
+    /// Updates the bounding box of damaged region. Should be implemented for
+    /// any animation that doesn't update the whole screen.
+    virtual void updateBB (CompOutput &) {}
+    virtual bool updateBBUsed () { return false; }
+
+    /// Should return true for effects that make use of a region
+    /// instead of just a bounding box for damaged area.
+    virtual bool stepRegionUsed () { return false; }
+
+    virtual bool shouldDamageWindowOnStart ();
+    virtual bool shouldDamageWindowOnEnd ();
+
+    /// Should return false if the animation should be stopped on move
+    virtual bool moveUpdate (int dx, int dy) { return true; }
+
+    /// Should return false if the animation should be stopped on resize
+    virtual bool resizeUpdate (int dx, int dy,
+				int dwidth, int dheight) { return true; }
+
+    virtual void adjustPointerIconSize () {}
+    virtual void addGeometry (const GLTexture::MatrixList &matrix,
+			    const CompRegion            &region,
+			    const CompRegion            &clip,
+			    unsigned int                maxGridWidth,
+			    unsigned int                maxGridHeight);
+    virtual void drawGeometry ();
+
+    virtual bool paintWindowUsed () { return false; }
+    virtual bool paintWindow (GLWindow			*gWindow,
+			    const GLWindowPaintAttrib &attrib,
+			    const GLMatrix		&transform,
+			    const CompRegion		&region,
+			    unsigned int		mask)
+    {
+	return gWindow->glPaint (attrib, transform, region, mask);
+    }
+
+    /// Gets info about the (extension) plugin that implements this animation.
+    /// Should be overriden by a base animation class in every extension plugin.
+    virtual ExtensionPluginInfo *getExtensionPluginInfo ();
+
+    void drawTexture (GLTexture          *texture,
+		      GLFragment::Attrib &attrib,
+		      unsigned int       mask);
+
+    // Utility methods
+
+    void reverse ();
+    inline bool inProgress () { return (mRemainingTime > 0); }
+
+    inline WindowEvent curWindowEvent () { return mCurWindowEvent; }
+    inline float totalTime () { return mTotalTime; }
+    inline float remainingTime () { return mRemainingTime; }
+
+    float progressLinear ();
+    float progressEaseInEaseOut ();
+    float progressDecelerateCustom (float progress,
+				    float minx, float maxx);
+    float progressDecelerate (float progress);
+    AnimDirection getActualAnimDirection (AnimDirection dir,
+					  bool openDir);
+    void perspectiveDistortAndResetZ (GLMatrix &transform);
+
+    static void prepareTransform (CompOutput &output,
+				  GLMatrix &resultTransform,
+				  GLMatrix &transform);
+    void setInitialized () { mInitialized = true; }
+    inline bool initialized () { return mInitialized; }
+    inline void setCurPaintAttrib (GLFragment::Attrib &newAttrib)
+    { mCurPaintAttrib = newAttrib; }
+};
+#endif

=== added file 'animation/include/animation/extensionplugin.h'
--- animation/include/animation/extensionplugin.h	1970-01-01 00:00:00 +0000
+++ animation/include/animation/extensionplugin.h	2011-04-08 08:14:44 +0000
@@ -0,0 +1,71 @@
+#ifndef ANIMATION_EXTENSIONPLUGIN_H
+#define ANIMATION_EXTENSIONPLUGIN_H
+#include "animation.h"
+
+class ExtensionPluginInfo
+{
+public:
+     ExtensionPluginInfo (const CompString &name,
+			  unsigned int nEffects,
+			  AnimEffect *effects,
+			  CompOption::Vector *effectOptions,
+			  unsigned int firstEffectOptionIndex);
+     
+     CompString name;
+     unsigned int nEffects;
+     AnimEffect *effects;
+     
+     /// Plugin options to be used in "effect options" strings.
+     CompOption::Vector *effectOptions;
+     
+     /// Index of first effect option.
+     unsigned int firstEffectOptionIndex;
+     
+     // More general and/or non-window functions (including functions that access
+     // persistent animation data) to be overriden
+     
+     /// To be run at the beginning of glPaintOutput.
+     virtual void prePaintOutput (CompOutput *output) {}
+     
+     /// To be run at the beginning of preparePaint.
+     virtual void prePreparePaintGeneral () {}
+     
+     /// To be run at the end of preparePaint.
+     virtual void postPreparePaintGeneral () {}
+     
+     /// To be run when a CompWindowNotifyRestack is handled.
+     virtual void handleRestackNotify (AnimWindow *aw) {}
+     
+     /// To be run at the beginning of initiateOpenAnim.
+     virtual void preInitiateOpenAnim (AnimWindow *aw) {}
+     
+     /// To be run at the beginning of initiateCloseAnim.
+     virtual void preInitiateCloseAnim (AnimWindow *aw) {}
+     
+     /// To be run at the beginning of initiateMinimizeAnim.
+     virtual void preInitiateMinimizeAnim (AnimWindow *aw) {}
+     
+     /// To be run at the beginning of initiateUnminimizeAnim.
+     virtual void preInitiateUnminimizeAnim (AnimWindow *aw) {}
+     
+     /// Initializes plugin's persistent animation data for a window (if any).
+     virtual void initPersistentData (AnimWindow *aw) {}
+     
+     /// Destroys plugin's persistent animation data for a window (if any).
+     virtual void destroyPersistentData (AnimWindow *aw) {}
+     
+     /// To be run at the end of updateEventEffects.
+     virtual void postUpdateEventEffects (AnimEvent e,
+					  bool forRandom) {}
+					  
+    /// To be run after the startup countdown ends.
+    virtual void postStartupCountdown () {}
+
+    virtual bool paintShouldSkipWindow (CompWindow *w) { return false; }
+
+    virtual void cleanUpAnimation (bool closing,
+				    bool destructing) {}
+
+    virtual void processAllRestacks () {}
+};
+#endif

=== added file 'animation/include/animation/fade.h'
--- animation/include/animation/fade.h	1970-01-01 00:00:00 +0000
+++ animation/include/animation/fade.h	2011-04-08 08:14:44 +0000
@@ -0,0 +1,19 @@
+#ifndef ANIMATION_FADE_H
+#define ANIMATION_FADE_H
+#include "animation.h"
+class FadeAnim :
+virtual public Animation
+{
+public:
+     FadeAnim (CompWindow *w,
+	       WindowEvent curWindowEvent,
+	       float duration,
+	       const AnimEffect info,
+	       const CompRect &icon);
+public:
+     void updateBB (CompOutput &output);
+     bool updateBBUsed () { return true; }
+     void updateAttrib (GLWindowPaintAttrib &wAttrib);
+     virtual float getFadeProgress () { return progressLinear (); }
+};
+#endif

=== added file 'animation/include/animation/grid.h'
--- animation/include/animation/grid.h	1970-01-01 00:00:00 +0000
+++ animation/include/animation/grid.h	2011-04-08 08:14:44 +0000
@@ -0,0 +1,106 @@
+#ifndef ANIMATION_GRID_H
+#define ANIMATION_GRID_H
+#include "animation.h"
+class GridAnim :
+    virtual public Animation
+{
+ public:
+     class GridModel
+     {
+	 friend class GridAnim;
+	 
+     public:
+	 GridModel (CompWindow *w,
+		    WindowEvent curWindowEvent,
+		    int height,
+		    int gridWidth,
+		    int gridHeight,
+		    int decorTopHeight,
+		    int decorBottomHeight);
+	 ~GridModel ();
+	 
+	 void move (float tx, float ty);
+	 
+	 class GridObject
+	 {
+	     friend class GridAnim;
+	     friend class GridZoomAnim;
+	     friend class GridTransformAnim;
+	     
+	 public:
+	     GridObject ();
+	     void setGridPosition (Point &gridPosition);
+	     inline Point3d &position () { return mPosition; }
+	     inline Point &gridPosition () { return mGridPosition; }
+	     
+	     inline Point &offsetTexCoordForQuadBefore ()
+	     { return mOffsetTexCoordForQuadBefore; }
+	     
+	     inline Point &offsetTexCoordForQuadAfter ()
+	     { return mOffsetTexCoordForQuadAfter; }
+	     
+	 private:
+	     Point3d mPosition;	 ///< Position on screen
+	     Point mGridPosition; ///< Position on window in [0,1] range
+	     
+	     Point mOffsetTexCoordForQuadBefore;
+	     Point mOffsetTexCoordForQuadAfter;
+	     ///< Texture x, y coordinates will be offset by given amounts
+	     ///< for quads that fall after and before this object in x and y directions.
+	     ///< Currently only y offset can be used.
+	};
+
+	inline GridObject *objects () { return mObjects; }
+	inline unsigned int numObjects () { return mNumObjects; }
+	inline Point &scale () { return mScale; }
+
+    private:
+	GridObject *mObjects; // TODO: convert to vector
+	unsigned int mNumObjects;
+
+	Point mScale;
+	Point mScaleOrigin;
+
+	void initObjects (WindowEvent curWindowEvent,
+			  int height,
+			  int gridWidth, int gridHeight,
+			  int decorTopHeight, int decorBottomHeight);
+    };
+
+protected:
+    GridModel *mModel;
+
+    int mGridWidth;	///< Number of cells along grid width
+    int mGridHeight;	///< Number of cells along grid height
+
+    /// true if effect needs Q texture coordinates.
+    /// Q texture coordinates are used to avoid jagged-looking quads
+    /// ( http://www.r3.nu/~cass/qcoord/ )
+    bool mUseQTexCoord;
+
+    GLWindow::Geometry mGeometry; ///< geometry for grid mesh
+
+    virtual bool using3D () { return false; }
+
+    virtual void initGrid ();	///< Initializes grid width/height.
+    				///< Default grid size is 2x2.
+				///< Override for custom grid size.
+
+public:
+    GridAnim (CompWindow *w,
+	      WindowEvent curWindowEvent,
+	      float duration,
+	      const AnimEffect info,
+	      const CompRect &icon);
+    ~GridAnim ();
+    void init ();
+    void updateBB (CompOutput &output);
+    bool updateBBUsed () { return true; }
+    void addGeometry (const GLTexture::MatrixList &matrix,
+		      const CompRegion            &region,
+		      const CompRegion            &clip,
+		      unsigned int                maxGridWidth,
+		      unsigned int                maxGridHeight);
+    void drawGeometry ();
+};
+#endif

=== added file 'animation/include/animation/gridtransform.h'
--- animation/include/animation/gridtransform.h	1970-01-01 00:00:00 +0000
+++ animation/include/animation/gridtransform.h	2011-04-08 08:14:44 +0000
@@ -0,0 +1,22 @@
+#ifndef ANIMATION_GRIDTRANSFORM_H
+#define ANIMATION_GRIDTRANSFORM_H
+#include "animation.h"
+class GridTransformAnim :
+public GridAnim,
+virtual public TransformAnim
+{
+public:
+    GridTransformAnim (CompWindow *w,
+		       WindowEvent curWindowEvent,
+		       float duration,
+		       const AnimEffect info,
+		       const CompRect &icon);
+    void init ();
+    void updateTransform (GLMatrix &wTransform);
+    void updateBB (CompOutput &output);
+    bool updateBBUsed () { return true; }
+    
+protected:
+    bool mUsingTransform; ///< whether transform matrix is used (default: true)
+};
+#endif

=== added file 'animation/include/animation/multi.h'
--- animation/include/animation/multi.h	1970-01-01 00:00:00 +0000
+++ animation/include/animation/multi.h	2011-04-08 08:14:44 +0000
@@ -0,0 +1,397 @@
+#ifndef ANIMATION_MULTI_H
+#define ANIMATION_MULTI_H
+#include "animation.h"
+/// Special class, allows multiple copies of an animation to happen
+/// at any one time. Create your "single copy" animation class first
+/// and then create a new animation which derives from this template
+/// class. Each function of your animation will be called since this
+/// class overloads everything in Animation. You will have
+/// access to which number effect is happening. (I think)
+
+template <class SingleAnim, int num>
+class MultiAnim :
+public Animation
+{
+public:
+    static inline int getCurrAnimNumber (AnimWindow *aw)
+    {
+	MultiPersistentData *pd = static_cast <MultiPersistentData *>
+	(aw->persistentData["multi"]);
+	if (!pd)
+	{
+	    pd = new MultiPersistentData ();
+	    aw->persistentData["multi"] = pd;
+	}
+	    if (!pd)
+		return 0;
+	    return pd->num;
+	}
+
+	static inline void setCurrAnimNumber (AnimWindow *aw, int what)
+	{
+	    MultiPersistentData *pd = static_cast <MultiPersistentData *>
+	    (aw->persistentData["multi"]);
+	    if (!pd)
+		pd = new MultiPersistentData ();
+	    if (!pd)
+		return;
+	    pd->num = what;
+	}
+
+    public:
+	MultiAnim (CompWindow *w,
+		   WindowEvent curWindowEvent,
+		   float duration,
+		   const AnimEffect info,
+		   const CompRect &icon) :
+			Animation (w, curWindowEvent, duration, info, icon),
+			currentAnim (0)
+	{
+	    for (unsigned int i = 0; i < num; i++)
+		animList.push_back (new SingleAnim (w,
+						    curWindowEvent,
+						    duration,
+						    info, icon));
+	    mGlPaintAttribs.resize (num);
+	    mGlPaintTransforms.resize (num);
+	}
+	virtual ~MultiAnim () {}
+
+    public:
+
+	/// Overload everything
+
+	/// Needed since virtual method calls can't be done in the constructor.
+	void init ()
+	{
+	    int count = 0;
+	    foreach (SingleAnim *a, animList)
+	    {
+		setCurrAnimNumber (mAWindow, count);
+		count++;
+		a->init ();
+	    }
+	}
+
+	/// To be called during post-animation clean up.
+	void cleanUp (bool closing,
+			  bool destructing)
+	{
+	    int count = 0;
+	    foreach (SingleAnim *a, animList)
+	    {
+		setCurrAnimNumber (mAWindow, count);
+		count++;
+		a->cleanUp (closing,
+			   destructing);
+		delete a;
+	    }
+
+	    animList.clear ();
+	}
+
+	/// Returns true if frame should be skipped (e.g. due to
+	/// higher timestep values). In that case no drawing is
+	/// needed for that window in current frame.
+	bool shouldSkipFrame (int msSinceLastPaintActual)
+	{
+	    int count = 0;
+	    bool skip = false;
+	    foreach (SingleAnim *a, animList)
+	    {
+		setCurrAnimNumber (mAWindow, count);
+		count++;
+		skip |= a->shouldSkipFrame (msSinceLastPaintActual);
+	    }
+	    return skip;
+	}
+
+	/// Advances the animation time by the given time amount.
+	/// Returns true if more animation time is left.
+	bool advanceTime (int msSinceLastPaint)
+	{
+	    int count = 0;
+	    bool advance = false;
+	    advance |= Animation::advanceTime (msSinceLastPaint);
+	    foreach (SingleAnim *a, animList)
+	    {
+		setCurrAnimNumber (mAWindow, count);
+		count++;
+		advance |= a->advanceTime (msSinceLastPaint);
+	    }
+	    return advance;
+	}
+
+	/// Computes new animation state based on remaining time.
+	void step ()
+	{
+	    int count = 0;
+	    foreach (SingleAnim *a, animList)
+	    {
+		setCurrAnimNumber (mAWindow, count);
+		count++;
+		a->step ();
+	    }
+	}
+
+	void updateAttrib (GLWindowPaintAttrib &attrib)
+	{
+	    int count = 0;
+	    foreach (SingleAnim *a, animList)
+	    {
+		setCurrAnimNumber (mAWindow, count);
+		GLWindowPaintAttrib attr (attrib);
+		a->updateAttrib (attr);
+		mGlPaintAttribs.at (count) = attr;
+		count++;
+	    }
+	}
+
+	void updateTransform (GLMatrix &transform)
+	{
+	    int count = 0;
+	    
+	    foreach (SingleAnim *a, animList)
+	    {
+		setCurrAnimNumber (mAWindow, count);
+		GLMatrix mat (transform);
+		a->updateTransform (mat);
+		mGlPaintTransforms.at (count) = mat;
+		count++;
+	    }
+	}
+
+	void prePaintWindow ()
+	{
+	    int count = 0;
+	    foreach (SingleAnim *a, animList)
+	    {
+		setCurrAnimNumber (mAWindow, count);
+		count++;
+		a->prePaintWindow ();
+	    }
+	}
+
+	void postPaintWindow ()
+	{
+	    int count = 0;
+	    foreach (SingleAnim *a, animList)
+	    {
+		setCurrAnimNumber (mAWindow, count);
+		count++;
+		a->postPaintWindow ();
+	    }
+	}
+
+	bool postPaintWindowUsed ()
+	{
+	    int count = 0;
+	    bool used = false;
+	    foreach (SingleAnim *a, animList)
+	    {
+		setCurrAnimNumber (mAWindow, count);
+		count++;
+		used |= a->postPaintWindowUsed ();
+	    }
+	    return used;
+	}
+
+	/// Returns true if the animation is still in progress.
+	bool prePreparePaint (int msSinceLastPaint)
+	{
+	    int count = 0;
+	    bool inProgress = false;
+	    foreach (SingleAnim *a, animList)
+	    {
+		setCurrAnimNumber (mAWindow, count);
+		count++;
+		inProgress |= a->prePreparePaint (msSinceLastPaint);
+	    }
+	    return inProgress;
+	}
+
+	void postPreparePaint ()
+	{
+	    int count = 0;
+	    foreach (SingleAnim *a, animList)
+	    {
+		setCurrAnimNumber (mAWindow, count);
+		count++;
+		a->postPreparePaint ();
+	    }
+	}
+
+	/// Updates the bounding box of damaged region. Should be implemented for
+	/// any animation that doesn't update the whole screen.
+	// NB!!
+	void updateBB (CompOutput &out)
+	{
+	    int count = 0;
+	    foreach (SingleAnim *a, animList)
+	    {
+		setCurrAnimNumber (mAWindow, count);
+		count++;
+		a->updateBB (out);
+	    }
+	}
+
+	bool updateBBUsed ()
+	{
+	    int count = 0;
+	    bool used = false;
+	    foreach (SingleAnim *a, animList)
+	    {
+		setCurrAnimNumber (mAWindow, count);
+		count++;
+		used |= a->updateBBUsed ();
+	    }
+	    return used;
+	}
+
+	/// Should return true for effects that make use of a region
+	/// instead of just a bounding box for damaged area->
+	bool stepRegionUsed ()
+	{
+	    int count = 0;
+	    bool used = false;
+	    foreach (SingleAnim *a, animList)
+	    {
+		setCurrAnimNumber (mAWindow, count);
+		count++;
+		used |= a->stepRegionUsed ();
+	    }
+	    return used;
+	}
+
+	bool shouldDamageWindowOnStart ()
+	{
+	    int count = 0;
+	    bool should = false;
+	    foreach (SingleAnim *a, animList)
+	    {
+		setCurrAnimNumber (mAWindow, count);
+		count++;
+		should |= a->shouldDamageWindowOnStart ();
+	    }
+	    return should;
+	}
+
+	bool shouldDamageWindowOnEnd ()
+	{
+	    int count = 0;
+	    bool should = false;
+	    foreach (SingleAnim *a, animList)
+	    {
+		setCurrAnimNumber (mAWindow, count);
+		count++;
+		should |= a->shouldDamageWindowOnStart ();
+	    }
+	    return should;
+	}
+
+	/// Should return false if the animation should be stopped on move
+	bool moveUpdate (int dx, int dy)
+	{
+	    int count = 0;
+	    bool update;
+	    foreach (SingleAnim *a, animList)
+	    {
+		setCurrAnimNumber (mAWindow, count);
+		count++;
+		update |= a->moveUpdate (dx, dy);
+	    }
+	    return update;
+	}
+
+	/// Should return false if the animation should be stopped on resize
+	bool resizeUpdate (int dx, int dy,
+			   int dwidth, int dheight)
+	{
+	    int count = 0;
+	    bool update;
+	    foreach (SingleAnim *a, animList)
+	    {
+		setCurrAnimNumber (mAWindow, count);
+		count++;
+		update |= a->resizeUpdate (dx, dy, dwidth, dheight);
+	    }
+	    return update;
+	}
+
+	void adjustPointerIconSize ()
+	{
+	    int count = 0;
+	    foreach (SingleAnim *a, animList)
+	    {
+		setCurrAnimNumber (mAWindow, count);
+		count++;
+		a->adjustPointerIconSize ();
+	    }
+	}
+
+	void addGeometry (const GLTexture::MatrixList &matrix,
+			    const CompRegion            &region,
+			    const CompRegion            &clip,
+			    unsigned int                maxGridWidth,
+			    unsigned int                maxGridHeight)
+	{
+	    setCurrAnimNumber (mAWindow, currentAnim);
+	    animList.at (currentAnim)->addGeometry
+		    (matrix, region, clip, maxGridWidth, maxGridHeight);
+	}
+
+	void drawGeometry ()
+	{
+	    setCurrAnimNumber (mAWindow, currentAnim);
+	    animList.at (currentAnim)->drawGeometry ();
+	}
+
+	bool paintWindowUsed ()
+	{
+	    int count = 0;
+	    foreach (SingleAnim *a, animList)
+	    {
+		setCurrAnimNumber (mAWindow, count);
+		count++;
+		a->paintWindowUsed ();
+	    }
+	    /* Always return true because we need to take over painting */
+	    return true;
+	}
+
+	bool paintWindow (GLWindow *gWindow,
+			  const GLWindowPaintAttrib &attrib,
+			  const GLMatrix &transform,
+			  const CompRegion &region,
+			  unsigned int mask)
+	{
+	    int count = 0;
+	    bool status = false;
+
+	    for (currentAnim = 0; currentAnim < animList.size (); currentAnim++)
+	    {
+		GLWindowPaintAttrib wAttrib (mGlPaintAttribs.at (currentAnim));
+		GLMatrix wTransform (mGlPaintTransforms.at (currentAnim));
+
+		setCurrAnimNumber (mAWindow, count);
+		count++;
+
+		if (animList.at (currentAnim)->paintWindowUsed ())
+		    status |= animList.at (currentAnim)->paintWindow
+			    (gWindow, wAttrib, wTransform, region, mask);
+		else
+		    status |= gWindow->glPaint
+			    (wAttrib, wTransform, region, mask);
+	    }
+
+	    return status;
+	}
+
+    private:
+
+	std::vector <GLWindowPaintAttrib>   mGlPaintAttribs;
+	std::vector <GLMatrix>		    mGlPaintTransforms;
+	std::vector <SingleAnim *> animList;
+	unsigned int	    currentAnim;
+};
+#endif

=== added file 'animation/include/animation/partialwindow.h'
--- animation/include/animation/partialwindow.h	1970-01-01 00:00:00 +0000
+++ animation/include/animation/partialwindow.h	2011-04-08 08:14:44 +0000
@@ -0,0 +1,25 @@
+#ifndef ANIMATION_PARTIALWINDOW_H
+#define ANIMATION_PARTIALWINDOW_H
+#include "animation.h"
+class PartialWindowAnim :
+virtual public Animation
+{
+public:
+    PartialWindowAnim (CompWindow *w,
+		       WindowEvent curWindowEvent,
+		       float duration,
+		       const AnimEffect info,
+		       const CompRect &icon);
+    
+    void addGeometry (const GLTexture::MatrixList &matrix,
+		      const CompRegion            &region,
+		      const CompRegion            &clip,
+		      unsigned int                maxGridWidth,
+		      unsigned int                maxGridHeight);
+    
+protected:
+    bool mUseDrawRegion;
+    CompRegion mDrawRegion;
+    
+};
+#endif

=== added file 'animation/include/animation/persistent.h'
--- animation/include/animation/persistent.h	1970-01-01 00:00:00 +0000
+++ animation/include/animation/persistent.h	2011-04-08 08:14:44 +0000
@@ -0,0 +1,18 @@
+#ifndef ANIMATION_PERSISTENT_H
+#define ANIMATION_PERSISTENT_H
+
+#include "animation.h"
+class PersistentData
+{
+};
+
+typedef std::map<std::string, PersistentData *> PersistentDataMap;
+
+class MultiPersistentData :
+public PersistentData
+{
+public:
+    MultiPersistentData () : num (0) {}
+    int num;
+};
+#endif

=== added file 'animation/include/animation/point3d.h'
--- animation/include/animation/point3d.h	1970-01-01 00:00:00 +0000
+++ animation/include/animation/point3d.h	2011-04-08 08:14:44 +0000
@@ -0,0 +1,105 @@
+#ifndef ANIMATION_POINT_H
+#define ANIMATION_POINT_H
+#include "animation.h"
+
+class Point
+{
+public:
+     Point () : mX (0), mY (0) {}
+     Point (float x, float y) : mX (x), mY (y) {}
+     
+     inline float x () const { return mX; }
+     inline float y () const { return mY; }
+     
+     inline void setX (float x) { mX = x; }
+     inline void setY (float y) { mY = y; }
+     
+     void set (float x, float y) { mX = x; mY = y; }
+     
+     inline void add (const Point &p) { mX += p.x (); mY += p.y (); }
+     
+     Point &operator= (const Point &p);
+     bool operator== (const Point &p) const;
+     bool operator!= (const Point &p) const;
+     
+private:
+     float mX, mY;
+};
+
+typedef Point Vector;
+
+class Point3d
+{
+    public:
+	Point3d () : mX (0), mY (0), mZ (0) {}
+	Point3d (float x, float y, float z) : mX (x), mY (y), mZ (z) {}
+
+	inline float x () const { return mX; }
+	inline float y () const { return mY; }
+	inline float z () const { return mZ; }
+
+	inline void setX (float x) { mX = x; }
+	inline void setY (float y) { mY = y; }
+	inline void setZ (float z) { mZ = z; }
+
+	inline void set (float x, float y, float z) { mX = x; mY = y; mZ = z; }
+
+	inline void add (const Point3d &p)
+	{ mX += p.x (); mY += p.y (); mZ += p.z (); }
+	inline void add (float x, float y, float z)
+	{ mX += x; mY += y; mZ += z; }
+
+	Point3d &operator= (const Point3d &p);
+	bool operator== (const Point3d &p) const;
+	bool operator!= (const Point3d &p) const;
+
+    private:
+	float mX, mY, mZ;
+};
+
+typedef Point3d Vector3d;
+
+/* XXX: change this to CompRect */
+typedef struct
+{
+    float x1, x2, y1, y2;
+} Boxf;
+
+inline Point &
+Point::operator= (const Point &p)
+{
+    mX = p.x (); mY = p.y ();
+    return *this;
+}
+
+inline bool
+Point::operator== (const Point &p) const
+{
+    return (mX == p.x () && mY == p.y ());
+}
+
+inline bool
+Point::operator!= (const Point &p) const
+{
+    return !(*this == p);
+}
+
+inline Point3d &
+Point3d::operator= (const Point3d &p)
+{
+    mX = p.x (); mY = p.y (); mZ = p.z ();
+    return *this;
+}
+
+inline bool
+Point3d::operator== (const Point3d &p) const
+{
+    return (mX == p.x () && mY == p.y () && mZ == p.z ());
+}
+
+inline bool
+Point3d::operator!= (const Point3d &p) const
+{
+    return !(*this == p);
+}
+#endif

=== added file 'animation/include/animation/screen.h'
--- animation/include/animation/screen.h	1970-01-01 00:00:00 +0000
+++ animation/include/animation/screen.h	2011-04-08 08:14:44 +0000
@@ -0,0 +1,35 @@
+#ifndef ANIMATION_SCREEN_H
+#define ANIMATION_SCREEN_H
+#include "animation.h"
+class AnimScreen :
+    public PluginClassHandler<AnimScreen, CompScreen, ANIMATION_ABI>,
+    public CompOption::Class
+{
+    friend class ExtensionPluginAnimation;
+    friend class PrivateAnimScreen;
+    friend class PrivateAnimWindow;
+    
+public:
+    AnimScreen (CompScreen *);
+    ~AnimScreen ();
+    
+    void addExtension (ExtensionPluginInfo *extensionPluginInfo);
+    void removeExtension (ExtensionPluginInfo *extensionPluginInfo);
+    bool getMousePointerXY (short *x, short *y);
+    CompOption::Vector &getOptions ();
+    bool setOption (const CompString &name, CompOption::Value &value);
+    CompOutput &output ();
+    AnimEffect getMatchingAnimSelection (CompWindow *w,
+					 AnimEvent e,
+					 int *duration);
+    void enableCustomPaintList (bool enabled);
+    bool isRestackAnimPossible ();
+    bool isAnimEffectPossible (AnimEffect theEffect);
+    bool otherPluginsActive ();
+    bool initiateFocusAnim (AnimWindow *aw);
+    
+private:
+    PrivateAnimScreen *priv;
+    
+};
+#endif

=== added file 'animation/include/animation/transform.h'
--- animation/include/animation/transform.h	1970-01-01 00:00:00 +0000
+++ animation/include/animation/transform.h	2011-04-08 08:14:44 +0000
@@ -0,0 +1,34 @@
+#ifndef ANIMATION_TRANSFORM_H
+#define ANIMATION_TRANSFORM_H
+#include "animation.h"
+class TransformAnim :
+virtual public Animation
+{
+public:
+    TransformAnim (CompWindow *w,
+		   WindowEvent curWindowEvent,
+		   float duration,
+		   const AnimEffect info,
+		   const CompRect &icon);
+    void init ();
+    void step ();
+    void updateTransform (GLMatrix &wTransform);
+    void updateBB (CompOutput &output);
+    bool updateBBUsed () { return true; }
+    
+protected:
+    GLMatrix mTransform;
+    
+    float mTransformStartProgress;
+    float mTransformProgress;
+    
+    void perspectiveDistortAndResetZ (GLMatrix &transform);
+    void applyPerspectiveSkew (CompOutput &output,
+			       GLMatrix &transform,
+			       Point &center);
+    virtual void adjustDuration () {}
+    virtual void applyTransform () {}
+    virtual Point getCenter ();
+    
+};
+#endif

=== added file 'animation/include/animation/window.h'
--- animation/include/animation/window.h	1970-01-01 00:00:00 +0000
+++ animation/include/animation/window.h	2011-04-08 08:14:44 +0000
@@ -0,0 +1,67 @@
+#ifndef ANIMATION_WINDOW_H
+#define ANIMATION_WINDOW_H
+#include "animation.h"
+class AnimWindow :
+    public PluginClassHandler<AnimWindow, CompWindow, ANIMATION_ABI>
+{
+     friend class PrivateAnimScreen;
+     friend class PrivateAnimWindow;
+     friend class AnimScreen;
+     friend class Animation;
+     
+public:
+     AnimWindow (CompWindow *);
+     ~AnimWindow ();
+     
+     BoxPtr BB ();
+     CompRegion &stepRegion ();
+     void resetStepRegionWithBB ();
+     
+     void expandBBWithWindow ();
+     void expandBBWithScreen ();
+     void expandBBWithBox (Box &source);
+     void expandBBWithPoint (float fx, float fy);
+     void expandBBWithPoint2DTransform (GLVector &coords,
+					GLMatrix &transformMat);
+     bool expandBBWithPoints3DTransform (CompOutput     &output,
+					 GLMatrix       &transform,
+					 const float    *points,
+					 GridAnim::GridModel::GridObject *objects,
+					 unsigned int   nPoints);
+     
+     inline bool savedRectsValid () { return mSavedRectsValid; }
+     inline CompRect & saveWinRect () { return mSavedWinRect; }
+     inline CompRect & savedInRect () { return mSavedInRect; }
+     inline CompRect & savedOutRect () { return mSavedOutRect; }
+     inline CompWindowExtents & savedOutExtents () { return mSavedOutExtents; }
+     
+     Animation *curAnimation ();
+     void createFocusAnimation (AnimEffect effect, int duration = 0);
+     
+     void postAnimationCleanUp ();
+     
+     // TODO: Group persistent data for a plugin and allow a plugin to only
+     // delete its own data.
+     void deletePersistentData (const char *name);
+     
+     /// A "string -> persistent data" map for animations that require such data,
+     /// like some focus animations.
+     PersistentDataMap persistentData;
+     
+     CompWindow *mWindow;    ///< Window being animated. // TODO move to private:
+private:
+     PrivateAnimWindow *priv;
+     
+     
+     bool mSavedRectsValid;
+     CompRect mSavedWinRect; ///< Saved window contents geometry
+     CompRect mSavedInRect;   ///< Saved window input geometry
+     CompRect mSavedOutRect;  ///< Saved window output geometry
+     CompWindowExtents mSavedOutExtents; ///< Saved window output extents
+     
+     CompOption::Value &pluginOptVal (ExtensionPluginInfo *pluginInfo,
+				      unsigned int optionId,
+				      Animation *anim);
+     
+};
+#endif

=== added file 'animation/include/animation/zoom.h'
--- animation/include/animation/zoom.h	1970-01-01 00:00:00 +0000
+++ animation/include/animation/zoom.h	2011-04-08 08:14:44 +0000
@@ -0,0 +1,70 @@
+#ifndef ANIMATION_ZOOM_H
+#define ANIMATION_ZOOM_H
+#include "animation.h"
+
+class ZoomAnim :
+    public FadeAnim,
+    virtual public TransformAnim
+{
+public:
+     ZoomAnim (CompWindow *w,
+	       WindowEvent curWindowEvent,
+	       float duration,
+	       const AnimEffect info,
+	       const CompRect &icon);
+
+public:
+     void step () { TransformAnim::step (); }
+     void adjustDuration ();
+     float getFadeProgress ();
+     bool updateBBUsed () { return true; }
+     void updateBB (CompOutput &output) { TransformAnim::updateBB (output); }
+     void applyTransform ();
+protected:
+     float getActualProgress ();
+     Point getCenter ();
+     virtual float getSpringiness ();
+     virtual bool isZoomFromCenter ();
+     virtual bool zoomToIcon () { return true; }
+     virtual bool hasExtraTransform () { return false; }
+     virtual void applyExtraTransform (float progress) {}
+     virtual bool shouldAvoidParallelogramLook () { return false; }
+     virtual bool scaleAroundIcon ();
+     virtual bool neverSpringy () { return false; }
+     void getZoomProgress (float *moveProgress,
+			   float *scaleProgress,
+			   bool neverSpringy);
+
+     static const float kDurationFactor;
+     static const float kSpringyDurationFactor;
+     static const float kNonspringyDurationFactor;
+
+private:
+     void getCenterScaleFull (Point *pCurCenter, Point *pCurScale,
+			      Point *pWinCenter, Point *pIconCenter,
+			      float *pMoveProgress);
+     void getCenterScale (Point *pCurCenter, Point *pCurScale);
+};
+
+class GridZoomAnim :
+    public GridTransformAnim,
+    public ZoomAnim
+{
+public:
+    GridZoomAnim (CompWindow *w,
+		  WindowEvent curWindowEvent,
+		  float duration,
+		  const AnimEffect info,
+		  const CompRect &icon);
+    void init () { GridTransformAnim::init (); }
+    void step () { ZoomAnim::step (); }
+    void updateTransform (GLMatrix &wTransform)
+    { GridTransformAnim::updateTransform (wTransform); }
+    void updateBB (CompOutput &output) { GridTransformAnim::updateBB (output); }
+    bool updateBBUsed () { return true; }
+    bool neverSpringy () { return true; }
+    float getSpringiness () { return 0; }
+    bool scaleAroundIcon () { return false; }
+    void adjustDuration ();
+};
+#endif

=== added directory 'animation/src'
=== added file 'animation/src/animation.cpp'
--- animation/src/animation.cpp	1970-01-01 00:00:00 +0000
+++ animation/src/animation.cpp	2011-04-08 08:14:44 +0000
@@ -0,0 +1,2852 @@
+/**
+ * Animation plugin for compiz/beryl
+ *
+ * animation.c
+ *
+ * Copyright : (C) 2006 Erkin Bahceci
+ * E-mail    : [e-mail]
+ *
+ * Based on Wobbly and Minimize plugins by
+ *           : David Reveman
+ * E-mail    : [e-mail]>
+ *
+ * Airplane added by : Carlo Palma
+ * E-mail            : [e-mail]
+ * Based on code originally written by Mark J. Kilgard
+ *
+ * Beam-Up added by : Florencio Guimaraes
+ * E-mail           : [e-mail]
+ *
+ * Fold and Skewer added by : Tomasz Kolodziejski
+ * E-mail                   : [e-mail]
+ *
+ * Hexagon tessellator added by : Mike Slegeir
+ * E-mail                       : [e-mail]>
+ *
+ * Particle system added by : (C) 2006 Dennis Kasprzyk
+ * E-mail                   : [e-mail]
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ **/
+
+/*
+ * TODO:
+ *
+ * - Custom bounding box update function for Airplane
+ *
+ * - Auto direction option: Close in opposite direction of opening
+ * - Proper side surface normals for lighting
+ * - decoration shadows
+ *   - shadow quad generation
+ *   - shadow texture coords (from clip tex. matrices)
+ *   - draw shadows
+ *   - fade in shadows
+ *
+ * - Voronoi tessellation
+ * - Brick tessellation
+ * - Triangle tessellation
+ * - Hexagonal tessellation
+ *
+ * Effects:
+ * - Circular action for tornado type fx
+ * - Tornado 3D (especially for minimize)
+ * - Helix 3D (hor. strips descend while they rotate and fade in)
+ * - Glass breaking 3D
+ *   - Gaussian distr. points (for gradually increasing polygon size
+ *                           starting from center or near mouse pointer)
+ *   - Drawing cracks
+ *   - Gradual cracking
+ *
+ * - fix slowness during transparent cube with <100 opacity
+ * - fix occasional wrong side color in some windows
+ * - fix on top windows and panels
+ *   (These two only matter for viewing during Rotate Cube.
+ *    All windows should be painted with depth test on
+ *    like 3d-plugin does)
+ * - play better with rotate (fix cube face drawn on top of polygons
+ *   after 45 deg. rotation)
+ *
+ */
+
+#include <GL/glu.h>
+#include <core/atoms.h>
+#include <sys/time.h>
+#include <assert.h>
+#include "private.h"
+
+class AnimPluginVTable :
+    public CompPlugin::VTableForScreenAndWindow<AnimScreen, AnimWindow>
+{
+public:
+    bool init ();
+    void fini ();
+};
+
+COMPIZ_PLUGIN_20090315 (animation, AnimPluginVTable);
+
+#define FAKE_ICON_SIZE 4
+
+const char *eventNames[AnimEventNum] =
+{"Open", "Close", "Minimize", "Shade", "Focus"};
+
+int chosenEffectOptionIds[AnimEventNum] =
+{
+    AnimationOptions::OpenEffects,
+    AnimationOptions::CloseEffects,
+    AnimationOptions::MinimizeEffects,
+    AnimationOptions::ShadeEffects,
+    AnimationOptions::FocusEffects
+};
+
+int randomEffectOptionIds[AnimEventNum] =
+{
+    AnimationOptions::OpenRandomEffects,
+    AnimationOptions::CloseRandomEffects,
+    AnimationOptions::MinimizeRandomEffects,
+    AnimationOptions::ShadeRandomEffects,
+    -1
+};
+
+int customOptionOptionIds[AnimEventNum] =
+{
+    AnimationOptions::OpenOptions,
+    AnimationOptions::CloseOptions,
+    AnimationOptions::MinimizeOptions,
+    AnimationOptions::ShadeOptions,
+    AnimationOptions::FocusOptions
+};
+
+int matchOptionIds[AnimEventNum] =
+{
+    AnimationOptions::OpenMatches,
+    AnimationOptions::CloseMatches,
+    AnimationOptions::MinimizeMatches,
+    AnimationOptions::ShadeMatches,
+    AnimationOptions::FocusMatches
+};
+
+int durationOptionIds[AnimEventNum] =
+{
+    AnimationOptions::OpenDurations,
+    AnimationOptions::CloseDurations,
+    AnimationOptions::MinimizeDurations,
+    AnimationOptions::ShadeDurations,
+    AnimationOptions::FocusDurations
+};
+
+// Bind each effect in the list of chosen effects for every event, to the
+// corresponding animation effect (i.e. effect with that name) if it is
+// provided by a plugin, otherwise set it to None.
+void
+PrivateAnimScreen::updateEventEffects (AnimEvent e,
+				       bool forRandom,
+				       bool callPost)
+{
+    CompOption::Value::Vector *listVal;
+    EffectSet *effectSet;
+    if (forRandom)
+    {
+	listVal = &getOptions ()[(unsigned)randomEffectOptionIds[e]].value ().
+	    list ();
+	effectSet = &mRandomEffects[e];
+    }
+    else
+    {
+	listVal = &getOptions ()[(unsigned)chosenEffectOptionIds[e]].value ().
+	    list ();
+	effectSet = &mEventEffects[e];
+    }
+    unsigned int n = listVal->size ();
+
+    effectSet->effects.clear ();
+    effectSet->effects.reserve (n);
+
+    AnimEffectVector &eventEffectsAllowed = mEventEffectsAllowed[e];
+
+    for (unsigned int r = 0; r < n; r++) // for each row
+    {
+	const CompString &animName = (*listVal)[r].s ();
+
+	// Find the animation effect with matching name
+	AnimEffectVector::iterator it =
+	    find_if (eventEffectsAllowed.begin (),
+		     eventEffectsAllowed.end (),
+		     boost::bind (&AnimEffectInfo::matchesEffectName,
+				  _1, animName));
+
+	effectSet->effects.push_back (it == eventEffectsAllowed.end () ?
+				      AnimEffectNone : *it);
+    }
+
+    if (callPost)
+    {
+    	foreach (ExtensionPluginInfo *extPlugin, mExtensionPlugins)
+	    extPlugin->postUpdateEventEffects (e, forRandom);
+    }
+}
+
+void
+PrivateAnimScreen::updateAllEventEffects ()
+{
+    // for each anim event
+    for (int e = 0; e < AnimEventNum; e++)
+	updateEventEffects ((AnimEvent)e, false);
+
+    // for each anim event except focus
+    for (int e = 0; e < AnimEventNum - 1; e++)
+	updateEventEffects ((AnimEvent)e, true);
+}
+
+bool
+PrivateAnimScreen::isAnimEffectInList (AnimEffect theEffect,
+				       EffectSet &effectList)
+{
+    for (unsigned int i = 0; i < effectList.effects.size (); i++)
+	if (effectList.effects[i] == theEffect)
+	    return true;
+    return false;
+}
+
+bool
+PrivateAnimScreen::isAnimEffectPossibleForEvent (AnimEffect theEffect,
+						 AnimEvent event)
+{
+    // Check all rows to see if the effect is chosen there
+    unsigned int nRows = mEventEffects[event].effects.size ();
+    for (unsigned int i = 0; i < nRows; i++)
+    {
+	AnimEffect chosenEffect = mEventEffects[event].effects[i];
+	// if chosen directly
+	if (chosenEffect == theEffect)
+	    return true;
+	// if chosen in random pool
+	if (mRandomEffects[event].effects.size () &&
+	    chosenEffect == AnimEffectRandom &&
+	    isAnimEffectInList (theEffect, mRandomEffects[event]))
+	    return true;
+    }
+    return false;
+}
+
+bool
+PrivateAnimScreen::isAnimEffectPossible (AnimEffect theEffect)
+{
+    for (int e = 0; e < AnimEventNum; e++)
+	if (isAnimEffectPossibleForEvent (theEffect, (AnimEvent)e))
+	    return true;
+    return false;
+}
+
+bool
+PrivateAnimScreen::isRestackAnimPossible ()
+{
+    // Check all rows to see if the chosen effect is a restack animation
+    unsigned int nRows = mEventEffects[AnimEventFocus].effects.size ();
+
+    for (unsigned int i = 0; i < nRows; i++)
+    {
+	AnimEffect chosenEffect = mEventEffects[(unsigned)AnimEventFocus].
+	    effects[i];
+	if (chosenEffect->isRestackAnim)
+	    return true;
+    }
+    return false;
+}
+
+bool
+AnimScreen::isRestackAnimPossible ()
+{
+    return priv->isRestackAnimPossible ();
+}
+
+// Extension functions
+
+void
+AnimScreen::addExtension (ExtensionPluginInfo *extensionPluginInfo)
+{
+    priv->addExtension (extensionPluginInfo, true);
+}
+
+void
+PrivateAnimScreen::addExtension (ExtensionPluginInfo *extensionPluginInfo,
+				 bool shouldInitPersistentData)
+{
+    mExtensionPlugins.push_back (extensionPluginInfo);
+
+    unsigned int nPluginEffects = extensionPluginInfo->nEffects;
+
+    bool eventEffectsNeedUpdate[AnimEventNum] =
+	{false, false, false, false, false};
+
+    // Put this plugin's effects into mEventEffects and
+    // mEventEffectsAllowed
+    for (unsigned int j = 0; j < nPluginEffects; j++)
+    {
+	const AnimEffect effect = extensionPluginInfo->effects[j];
+
+	// Update allowed effects for each event
+	for (int e = 0; e < AnimEventNum; e++)
+	{
+	    if (effect->usedForEvents[e])
+	    {
+		mEventEffectsAllowed[e].push_back (effect);
+		eventEffectsNeedUpdate[e] = true;
+	    }
+	}
+    }
+
+    for (int e = 0; e < AnimEventNum; e++)
+	if (eventEffectsNeedUpdate[e])
+	{
+	    updateEventEffects ((AnimEvent)e, false, false);
+	    if (e != AnimEventFocus)
+		updateEventEffects ((AnimEvent)e, true, false);
+	}
+
+    if (shouldInitPersistentData)
+    {
+	// Initialize persistent window data for the extension plugin
+	foreach (CompWindow *w, ::screen->windows ())
+	{
+	    AnimWindow *aw = AnimWindow::get (w);
+	    extensionPluginInfo->initPersistentData (aw);
+	}
+    }
+}
+
+void
+AnimScreen::removeExtension (ExtensionPluginInfo *extensionPluginInfo)
+{
+    priv->removeExtension (extensionPluginInfo);
+}
+
+void
+PrivateAnimScreen::removeExtension (ExtensionPluginInfo *extensionPluginInfo)
+{
+    // Stop all ongoing animations
+    foreach (CompWindow *w, ::screen->windows ())
+    {
+	PrivateAnimWindow *aw = AnimWindow::get (w)->priv;
+	if (aw->curAnimation ())
+	    aw->postAnimationCleanUp ();
+    }
+
+    // Find the matching plugin and delete it
+
+    ExtensionPluginVector::iterator it = find (mExtensionPlugins.begin (),
+					       mExtensionPlugins.end (),
+					       extensionPluginInfo);
+
+    if (it == mExtensionPlugins.end ())
+	return; // couldn't find that extension plugin
+
+    mExtensionPlugins.erase (it);
+
+    if (extensionPluginInfo->nEffects == 0)
+	return; // no animation effects -> we're done here
+
+
+    // Also delete the "allowed effect" entries for that plugin
+
+    for (int e = 0; e < AnimEventNum; e++)
+    {
+	AnimEffectVector &eventEffectsAllowed = mEventEffectsAllowed[e];
+
+	// Find the first animation effect with matching name
+	AnimEffectVector::iterator itBeginEffect =
+	    find_if (eventEffectsAllowed.begin (),
+		     eventEffectsAllowed.end (),
+		     boost::bind (&AnimEffectInfo::matchesPluginName,
+				  _1, extensionPluginInfo->name));
+
+	if (itBeginEffect == eventEffectsAllowed.end ())
+	    continue; // plugin didn't provide any effects for this event
+
+	// Find the first animation effect with non-matching name,
+	// starting with itBeginEffect
+	AnimEffectVector::iterator itEndEffect =
+	    find_if (itBeginEffect,
+		     eventEffectsAllowed.end (),
+		     boost::bind (&AnimEffectInfo::matchesPluginName,
+				  _1, extensionPluginInfo->name) == false);
+
+	eventEffectsAllowed.erase (itBeginEffect, itEndEffect);
+
+	// Update event effects to complete removal
+	updateEventEffects ((AnimEvent)e, false);
+	if (e != AnimEventFocus)
+	    updateEventEffects ((AnimEvent)e, true);
+    }
+
+    // Destroy persistent window data for the extension plugin
+    foreach (CompWindow *w, ::screen->windows ())
+    {
+	AnimWindow *aw = AnimWindow::get (w);
+	extensionPluginInfo->destroyPersistentData (aw);
+    }
+}
+
+ExtensionPluginInfo::ExtensionPluginInfo (const CompString &name,
+					  unsigned int nEffects,
+					  AnimEffect *effects,
+					  CompOption::Vector *effectOptions,
+					  unsigned int firstEffectOptionIndex) :
+    name (name),
+    nEffects (nEffects),
+    effects (effects),
+    effectOptions (effectOptions),
+    firstEffectOptionIndex (firstEffectOptionIndex)
+{
+}
+
+// End of extension functions
+
+Animation::Animation (CompWindow *w,
+		      WindowEvent curWindowEvent,
+		      float duration,
+		      const AnimEffect info,
+		      const CompRect &icon) :
+    mWindow (w),
+    mAWindow (AnimWindow::get (w)),
+    mTotalTime (duration),
+    mRemainingTime (duration),
+    mTimeElapsedWithinTimeStep (0),
+    mOverrideProgressDir (0),
+    mCurPaintAttrib (GLWindow::defaultPaintAttrib),
+    mStoredOpacity (CompositeWindow::get (w)->opacity ()),
+    mCurWindowEvent (curWindowEvent),
+    mInitialized (false), // store window opacity
+    mInfo (info),
+    mIcon (icon)
+{
+    if (curWindowEvent == WindowEventShade ||
+	curWindowEvent == WindowEventUnshade)
+    {
+	mDecorTopHeight = w->output ().top;
+	mDecorBottomHeight = w->output ().bottom;
+    }
+
+    texturesCache = new GLTexture::List (GLWindow::get (w)->textures ());
+    PrivateAnimScreen *as = mAWindow->priv->paScreen ();
+
+    mTimestep = as->optionGetTimeStep ();
+}
+
+Animation::~Animation ()
+{
+    delete texturesCache;
+}
+
+CompOption::Value &
+Animation::optVal (unsigned int optionId)
+{
+    return mAWindow->pluginOptVal (getExtensionPluginInfo (), optionId, this);
+}
+
+/// Play the animation effect backwards from where it left off.
+void
+Animation::reverse ()
+{
+    mRemainingTime = mTotalTime - mRemainingTime;
+
+    // avoid window remains
+    if (mRemainingTime <= 0)
+	mRemainingTime = 1;
+
+    switch (mCurWindowEvent) // the old event
+    {
+    case WindowEventOpen:
+	mCurWindowEvent = WindowEventClose;
+	break;
+    case WindowEventClose:
+	mCurWindowEvent = WindowEventOpen;
+	break;
+    case WindowEventMinimize:
+	mCurWindowEvent = WindowEventUnminimize;
+	break;
+    case WindowEventUnminimize:
+	mCurWindowEvent = WindowEventMinimize;
+	break;
+    case WindowEventShade:
+	mCurWindowEvent = WindowEventUnshade;
+	break;
+    case WindowEventUnshade:
+	mCurWindowEvent = WindowEventShade;
+	break;
+    default:
+	break;
+    }
+
+    // 1: forward, 2: backward  (3 - progressDir is opposite direction)
+    int progressDir = 1;
+
+    switch (mCurWindowEvent) // the new event
+    {
+    case WindowEventClose:
+    case WindowEventMinimize:
+    case WindowEventShade:
+	progressDir = 2;
+	break;
+    default:
+	break;
+    }
+
+    if (mOverrideProgressDir == 0)
+	mOverrideProgressDir = progressDir;
+    else if (mOverrideProgressDir == 3 - progressDir)
+	mOverrideProgressDir = 0; // disable override
+}
+
+PartialWindowAnim::PartialWindowAnim (CompWindow *w,
+				      WindowEvent curWindowEvent,
+				      float duration,
+				      const AnimEffect info,
+				      const CompRect &icon) :
+    Animation::Animation (w, curWindowEvent, duration, info, icon),
+    mUseDrawRegion (false),
+    mDrawRegion ()
+{
+}
+
+void
+PrivateAnimWindow::updateSelectionRow (unsigned int r)
+{
+    mPrevAnimSelectionRow = mCurAnimSelectionRow;
+    mCurAnimSelectionRow = (int)r;
+}
+
+// Assumes events in the metadata are in
+// [Open, Close, Minimize, Focus, Shade] order
+// and effects among those are in alphabetical order
+// but with "(Event) None" first and "(Event) Random" last.
+AnimEffect
+PrivateAnimScreen::getMatchingAnimSelection (CompWindow *w,
+					     AnimEvent e,
+					     int *duration)
+{
+    PrivateAnimWindow *aw = AnimWindow::get (w)->priv;
+
+    EffectSet *eventEffects = &mEventEffects[e];
+    CompOption::Value &valMatch =
+	getOptions ()[(unsigned)matchOptionIds[e]].value ();
+    CompOption::Value &valDuration =
+	getOptions ()[(unsigned)durationOptionIds[e]].value ();
+    CompOption::Value &valCustomOptions =
+	getOptions ()[(unsigned)customOptionOptionIds[e]].value ();
+
+    unsigned int nRows = valMatch.list ().size ();
+    if (nRows != eventEffects->effects.size () ||
+	nRows != valDuration.list ().size () ||
+	nRows != valCustomOptions.list ().size ())
+    {
+	compLogMessage ("animation", CompLogLevelError,
+			"Animation settings mismatch in \"Animation "
+			"Selection\" list for %s event.", eventNames[e]);
+	return AnimEffectNone;
+    }
+
+    // Find the first row that matches this window for this event
+    for (unsigned int i = 0; i < nRows; i++)
+    {
+	if (!valMatch.list ()[i].match ().evaluate (w))
+	    continue;
+
+	aw->updateSelectionRow (i);
+
+	if (duration)
+	    *duration = valDuration.list ()[i].i ();
+
+	AnimEffect effect = eventEffects->effects[i];
+
+	return (effect ? effect : AnimEffectNone);
+    }
+
+    return AnimEffectNone;
+}
+
+AnimEffect
+PrivateAnimScreen::getActualEffect (AnimEffect effect,
+				    AnimEvent animEvent)
+{
+    bool allRandom = optionGetAllRandom ();
+    AnimEffectVector *randomEffects = &mRandomEffects[animEvent].effects;
+    unsigned int nRandomEffects = randomEffects->size ();
+    unsigned int nFirstRandomEffect = 0;
+
+    if ((effect == AnimEffectRandom) || allRandom)
+    {
+	if (nRandomEffects == 0) // no random animation selected, assume "all"
+	{
+	    randomEffects = &mEventEffectsAllowed[animEvent];
+
+	    // exclude None and Random
+	    nFirstRandomEffect = 2;
+	    nRandomEffects = randomEffects->size () - 2;
+	}
+	unsigned int index = nFirstRandomEffect +
+	    (unsigned int)(nRandomEffects * (double)rand () / RAND_MAX);
+	return (*randomEffects)[index];
+    }
+    else
+	return effect;
+}
+
+/// Converts animation direction (up, down, left, right, random, auto)
+/// to an actual direction (up, down, left, or right).
+AnimDirection
+Animation::getActualAnimDirection (AnimDirection dir,
+				   bool openDir)
+{
+    if (dir == AnimDirectionRandom)
+    {
+	dir = (AnimDirection)(rand () % 4);
+    }
+    else if (dir == AnimDirectionAuto)
+    {
+	CompRect outRect (mAWindow->savedRectsValid () ?
+			  mAWindow->savedOutRect () :
+			  mWindow->outputRect ());
+
+	// away from icon
+	int centerX = outRect.x () + outRect.width () / 2 ;
+	int centerY = outRect.y () + outRect.height () / 2 ;
+	float relDiffX = ((float)centerX - mIcon.x ()) / outRect.width ();
+	float relDiffY = ((float)centerY - mIcon.y ()) / outRect.height ();
+
+	if (openDir)
+	{
+	    if (mCurWindowEvent == WindowEventMinimize ||
+		mCurWindowEvent == WindowEventUnminimize)
+		// min/unmin. should always result in +/- y direction
+		dir = (mIcon.y () < (int)::screen->height () - mIcon.y ()) ?
+		    AnimDirectionDown : AnimDirectionUp;
+	    else if (fabs (relDiffY) > fabs (relDiffX))
+		dir = relDiffY > 0 ? AnimDirectionDown : AnimDirectionUp;
+	    else
+		dir = relDiffX > 0 ? AnimDirectionRight : AnimDirectionLeft;
+	}
+	else
+	{
+	    if (mCurWindowEvent == WindowEventMinimize ||
+		mCurWindowEvent == WindowEventUnminimize)
+		// min/unmin. should always result in +/- y direction
+		dir = (mIcon.y () < (int)::screen->height () - mIcon.y ()) ?
+		    AnimDirectionUp : AnimDirectionDown;
+	    else if (fabs (relDiffY) > fabs (relDiffX))
+		dir = relDiffY > 0 ? AnimDirectionUp : AnimDirectionDown;
+	    else
+		dir = relDiffX > 0 ? AnimDirectionLeft : AnimDirectionRight;
+	}
+    }
+    return dir;
+}
+
+float
+Animation::progressLinear ()
+{
+    float forwardProgress =
+	1 - mRemainingTime / (mTotalTime - mTimestep);
+    forwardProgress = MIN (forwardProgress, 1);
+    forwardProgress = MAX (forwardProgress, 0);
+
+    if (mCurWindowEvent == WindowEventOpen ||
+	mCurWindowEvent == WindowEventUnminimize ||
+	mCurWindowEvent == WindowEventUnshade ||
+	mCurWindowEvent == WindowEventFocus)
+	forwardProgress = 1 - forwardProgress;
+
+    return forwardProgress;
+}
+
+float
+Animation::progressEaseInEaseOut ()
+{
+    float forwardProgress =
+	1 - mRemainingTime / (mTotalTime - mTimestep);
+    forwardProgress = MIN (forwardProgress, 1);
+    forwardProgress = MAX (forwardProgress, 0);
+
+    // Apply sigmoid and normalize
+    forwardProgress =
+	(sigmoid (forwardProgress) - sigmoid (0)) /
+	(sigmoid (1) - sigmoid (0));
+
+    if (mCurWindowEvent == WindowEventOpen ||
+	mCurWindowEvent == WindowEventUnminimize ||
+	mCurWindowEvent == WindowEventUnshade ||
+	mCurWindowEvent == WindowEventFocus)
+	forwardProgress = 1 - forwardProgress;
+
+    return forwardProgress;
+}
+
+/// Gives some acceleration (when closing a window)
+/// or deceleration (when opening a window).
+/// Applies a sigmoid with slope s,
+/// where minx and maxx are the
+/// starting and ending points on the sigmoid.
+float
+Animation::progressDecelerateCustom (float progress, float minx, float maxx)
+{
+    float x = 1 - progress;
+    float s = 8;
+
+    return
+	1 - ((sigmoid2 (minx + (x * (maxx - minx)), s) - sigmoid2 (minx, s)) /
+	     (sigmoid2 (maxx, s) - sigmoid2 (minx, s)));
+}
+
+float
+Animation::progressDecelerate (float progress)
+{
+    return progressDecelerateCustom (progress, 0.5, 0.75);
+}
+
+BoxPtr
+AnimWindow::BB ()
+{
+    return &priv->mBB;
+}
+
+CompRegion &
+AnimWindow::stepRegion ()
+{
+    return priv->mStepRegion;
+}
+
+void
+PrivateAnimWindow::copyResetStepRegion ()
+{
+    mLastStepRegion = mStepRegion;
+
+    // Reset bounding box for current step
+    mBB.x1 = mBB.y1 = MAXSHORT;
+    mBB.x2 = mBB.y2 = MINSHORT;
+}
+
+void
+AnimWindow::expandBBWithBox (Box &source)
+{
+    Box &target = priv->BB ();
+
+    if (source.x1 < target.x1)
+	target.x1 = source.x1;
+    if (source.x2 > target.x2)
+	target.x2 = source.x2;
+    if (source.y1 < target.y1)
+	target.y1 = source.y1;
+    if (source.y2 > target.y2)
+	target.y2 = source.y2;
+}
+
+void
+AnimWindow::expandBBWithPoint (float fx, float fy)
+{
+    Box &target = priv->BB ();
+
+    short x = MAX (MIN (fx, MAXSHORT - 1), MINSHORT);
+    short y = MAX (MIN (fy, MAXSHORT - 1), MINSHORT);
+
+    if (target.x1 == MAXSHORT)
+    {
+	target.x1 = x;
+	target.y1 = y;
+	target.x2 = x + 1;
+	target.y2 = y + 1;
+	return;
+    }
+    if (x < target.x1)
+	target.x1 = x;
+    else if (x > target.x2)
+	target.x2 = x;
+
+    if (y < target.y1)
+	target.y1 = y;
+    else if (y > target.y2)
+	target.y2 = y;
+}
+
+/// This will work for zoom-like 2D transforms,
+/// but not for glide-like 3D transforms.
+void
+AnimWindow::expandBBWithPoint2DTransform (GLVector &coords,
+					  GLMatrix &transformMat)
+{
+    GLVector coordsTransformed = transformMat * coords;
+    expandBBWithPoint (coordsTransformed[GLVector::x],
+		       coordsTransformed[GLVector::y]);
+}
+
+/// Either points or objects should be non-0.
+bool
+AnimWindow::expandBBWithPoints3DTransform (CompOutput     &output,
+					   GLMatrix       &transform,
+					   const float    *points,
+					   GridAnim::GridModel::GridObject *objects,
+					   unsigned int   nPoints)
+{
+    GLdouble dModel[16];
+    GLdouble dProjection[16];
+    GLdouble x, y, z;
+    for (unsigned int i = 0; i < 16; i++)
+    {
+	dModel[i] = transform[i];
+	dProjection[i] = GLScreen::get (::screen)->projectionMatrix ()[i];
+    }
+    GLint viewport[4] =
+	{output.region ()->extents.x1,
+	 output.region ()->extents.y1,
+	 output.width (),
+	 output.height ()};
+
+    if (points) // use points
+    {
+	for (; nPoints; nPoints--, points += 3)
+	{
+	    if (!gluProject (points[0], points[1], points[2],
+			     dModel, dProjection, viewport,
+			     &x, &y, &z))
+		return false;
+
+	    expandBBWithPoint (x + 0.5, (::screen->height () - y) + 0.5);
+	}
+    }
+    else // use grid model objects
+    {
+	GridAnim::GridModel::GridObject *object = objects;
+	for (; nPoints; nPoints--, object++)
+	{
+	    if (!gluProject (object->position ().x (),
+			     object->position ().y (),
+			     object->position ().z (),
+			     dModel, dProjection, viewport,
+			     &x, &y, &z))
+		return false;
+
+	    expandBBWithPoint (x + 0.5, (::screen->height () - y) + 0.5);
+	}
+    }
+    return true;
+}
+
+void
+AnimWindow::expandBBWithWindow ()
+{
+    CompRect outRect (savedRectsValid () ?
+		      savedOutRect () :
+		      mWindow->outputRect ());
+    Box windowBox = {
+	outRect.x (), outRect.x () + outRect.width (),
+	outRect.y (), outRect.y () + outRect.height ()
+    };
+    expandBBWithBox (windowBox);
+}
+
+void
+AnimWindow::expandBBWithScreen ()
+{
+    Box screenBox = {0, ::screen->width (),
+		     0, ::screen->height ()};
+    expandBBWithBox (screenBox);
+}
+
+void
+Animation::prepareTransform (CompOutput &output,
+			     GLMatrix &resultTransform,
+			     GLMatrix &transform)
+{
+    GLMatrix sTransform;
+    sTransform.toScreenSpace (&output, -DEFAULT_Z_CAMERA);
+    resultTransform = sTransform * transform;
+}
+
+void
+AnimWindow::resetStepRegionWithBB ()
+{
+    // Have a 1 pixel margin to prevent occasional 1 pixel line artifact
+    CompRegion region (priv->mBB.x1 - 1,
+    		       priv->mBB.y1 - 1,
+    		       priv->mBB.x2 - priv->mBB.x1 + 2,
+    		       priv->mBB.y2 - priv->mBB.y1 + 2);
+    priv->mStepRegion = region;
+}
+
+/// Damage the union of window's bounding box
+/// before and after animStepFunc does its job.
+void
+PrivateAnimWindow::damageThisAndLastStepRegion ()
+{
+    // Find union of the regions for this step and last step
+    CompRegion totalRegionToDamage (mStepRegion + mLastStepRegion);
+
+    mPAScreen->cScreen->damageRegion (totalRegionToDamage);
+}
+
+CompOutput &
+AnimScreen::output ()
+{
+    return priv->output ();
+}
+
+bool
+AnimScreen::getMousePointerXY (short *x, short *y)
+{
+    Window w1, w2;
+    int xp, yp, xj, yj;
+    unsigned int m;
+
+    if (XQueryPointer
+	(::screen->dpy (), ::screen->root (), &w1, &w2, &xj, &yj, &xp, &yp, &m))
+    {
+	*x = xp;
+	*y = yp;
+	return true;
+    }
+    return false;
+}
+
+unsigned int
+PrivateAnimWindow::getState ()
+{
+    Atom actual;
+    int result, format;
+    unsigned long n, left;
+    unsigned char *data;
+    unsigned int retval = WithdrawnState;
+
+    result = XGetWindowProperty (::screen->dpy (), mWindow->id (),
+				 Atoms::wmState, 0L,
+				 1L, false,
+				 Atoms::wmState,
+				 &actual, &format, &n, &left, &data);
+
+    if (result == Success && data)
+    {
+	if (n)
+    	    memcpy (&retval, data, sizeof (int));
+
+	XFree ((void *)data);
+    }
+
+    return retval;
+}
+
+CompOption::Vector &
+AnimScreen::getOptions ()
+{
+    return priv->getOptions ();
+}
+
+bool
+AnimScreen::setOption (const CompString  &name,
+		       CompOption::Value &value)
+{
+    return priv->setOption (name, value);
+}
+
+void
+PrivateAnimScreen::eventMatchesChanged (CompOption                *opt,
+					AnimationOptions::Options num)
+{
+    if (mExtensionPlugins.size () == 0)
+	initAnimationList ();
+    foreach (CompOption::Value &val, opt->value ().list ())
+	val.match ().update ();
+}
+
+void
+PrivateAnimScreen::eventOptionsChanged (CompOption                *opt,
+					AnimationOptions::Options num)
+{
+    if (mExtensionPlugins.size () == 0)
+	initAnimationList ();
+    updateOptionSets (getCorrespondingAnimEvent (num));
+}
+
+void
+PrivateAnimScreen::eventEffectsChanged (CompOption                *opt,
+					AnimationOptions::Options num)
+{
+    if (mExtensionPlugins.size () == 0)
+	initAnimationList ();
+    updateEventEffects (getCorrespondingAnimEvent (num), false);
+}
+
+void
+PrivateAnimScreen::eventRandomEffectsChanged (CompOption                *opt,
+					      AnimationOptions::Options num)
+{
+    if (mExtensionPlugins.size () == 0)
+	initAnimationList ();
+    updateEventEffects (getCorrespondingAnimEvent (num), true);
+}
+
+void
+PrivateAnimWindow::postAnimationCleanUpCustom (bool closing,
+					       bool destructing,
+					       bool clearMatchingRow)
+{
+    bool shouldDamageWindow = false;
+    
+    notifyAnimation (false);
+
+    if (mCurAnimation)
+    {
+	if (mCurAnimation->shouldDamageWindowOnEnd ())
+	    shouldDamageWindow = true;
+    }
+    enablePainting (false);
+
+    if (shouldDamageWindow)
+	mAWindow->expandBBWithWindow ();
+
+    if (shouldDamageWindow ||
+	(mCurAnimation &&
+	 !mCurAnimation->stepRegionUsed () &&
+	 mAWindow->BB ()->x1 != MAXSHORT)) // BB intialized
+	mAWindow->resetStepRegionWithBB ();
+
+    damageThisAndLastStepRegion ();
+
+    if (mCurAnimation)
+    {
+	mCurAnimation->cleanUp (closing, destructing);
+	delete mCurAnimation;
+	mCurAnimation = 0;
+    }
+
+    mBB.x1 = mBB.y1 = MAXSHORT;
+    mBB.x2 = mBB.y2 = MINSHORT;
+
+    mState = mNewState;
+
+    if (clearMatchingRow)
+	mCurAnimSelectionRow = -1;
+
+    mFinishingAnim = true;
+    if (!destructing)
+    {
+	mIgnoreDamage = true;
+	while (mUnmapCnt > 0)
+	{
+	    mWindow->unmap ();
+	    mUnmapCnt--;
+	}
+	if (mUnmapCnt < 0)
+	    mUnmapCnt = 0;
+	mIgnoreDamage = false;
+    }
+
+    while (mDestroyCnt)
+    {
+	mWindow->destroy ();
+	mDestroyCnt--;
+    }
+    mFinishingAnim = false;
+
+    foreach (ExtensionPluginInfo *extPlugin, mPAScreen->mExtensionPlugins)
+	extPlugin->cleanUpAnimation (closing, destructing);
+}
+
+void
+AnimWindow::postAnimationCleanUp ()
+{
+    priv->postAnimationCleanUp ();
+}
+
+void
+PrivateAnimWindow::postAnimationCleanUp ()
+{
+    if (mCurAnimation->curWindowEvent () == WindowEventClose)
+	postAnimationCleanUpCustom (true, false, true);
+    else
+	postAnimationCleanUpCustom (false, false, true);
+}
+
+void
+PrivateAnimWindow::postAnimationCleanUpPrev (bool closing,
+					     bool clearMatchingRow)
+{
+    int curAnimSelectionRow = mCurAnimSelectionRow;
+    // Use previous event's anim selection row
+    mCurAnimSelectionRow = mPrevAnimSelectionRow;
+
+    postAnimationCleanUpCustom (closing, false, clearMatchingRow);
+
+    // Restore current event's anim selection row
+    mCurAnimSelectionRow = curAnimSelectionRow;
+}
+
+void
+PrivateAnimScreen::activateEvent (bool activating)
+{
+    if (activating)
+    {
+	if (mAnimInProgress)
+	    return;
+    }
+    else
+    {
+	// Animations have finished for all windows
+	// (Keep preparePaint enabled)
+
+	cScreen->getWindowPaintListSetEnabled (this, false);
+	enablePrePaintWindowsBackToFront (false);
+    }
+    cScreen->donePaintSetEnabled (this, activating);
+    gScreen->glPaintOutputSetEnabled (this, activating);
+
+    mAnimInProgress = activating;
+
+    CompOption::Vector o (0);
+
+    o.push_back (CompOption ("root", CompOption::TypeInt));
+    o.push_back (CompOption ("active", CompOption::TypeBool));
+
+    o[0].value ().set ((int) ::screen->root ());
+    o[1].value ().set (activating);
+
+    ::screen->handleCompizEvent ("animation", "activate", o);
+}
+
+void
+PrivateAnimWindow::notifyAnimation (bool activation)
+{
+    CompOption::Vector o (0);
+    
+    if (!mCurAnimation)
+	return;
+    
+    o.push_back (CompOption ("root", CompOption::TypeInt));
+    o.push_back (CompOption ("window", CompOption::TypeInt));
+    o.push_back (CompOption ("type", CompOption::TypeString));
+    o.push_back (CompOption ("active", CompOption::TypeBool));
+    
+    o[0].value ().set ((int) ::screen->root ());
+    o[1].value ().set ((int) mWindow->id ());
+        
+    switch (mCurAnimation->curWindowEvent ())
+    {
+	case WindowEventOpen:
+	    o[2].value ().set ("open");
+	    break;
+	case WindowEventClose:
+	    o[2].value ().set ("close");
+	    break;
+	case WindowEventMinimize:
+	    o[2].value ().set ("minimize");
+	    break;
+	case WindowEventUnminimize:
+	    o[2].value ().set ("unminimize");
+	    break;
+	case WindowEventShade:
+	    o[2].value ().set ("shade");
+	    break;
+	case WindowEventUnshade:
+	    o[2].value ().set ("unshade");
+	    break;
+	case WindowEventFocus:
+	    o[2].value ().set ("focus");
+	    break;
+	case WindowEventNum:
+	case WindowEventNone:
+	default:
+	    o[2].value ().set ("none");
+	    break;
+    }
+    
+    o[3].value ().set (activation);
+
+    screen->handleCompizEvent ("animation", "window_animation", o);
+}
+
+bool
+PrivateAnimScreen::otherPluginsActive ()
+{
+    for (int i = 0; i < WatchedScreenPluginNum; i++)
+	if (mPluginActive[i])
+	    return true;
+    return false;
+}
+
+bool
+Animation::shouldSkipFrame (int msSinceLastPaintActual)
+{
+    mTimeElapsedWithinTimeStep += msSinceLastPaintActual;
+    if (mTimeElapsedWithinTimeStep < mTimestep) // if timestep not yet completed
+	return true;
+
+    mTimeElapsedWithinTimeStep = fmod (mTimeElapsedWithinTimeStep, mTimestep);
+    return false;
+}
+
+bool
+Animation::advanceTime (int msSinceLastPaint)
+{
+    mRemainingTime -= msSinceLastPaint;
+    mRemainingTime = MAX (mRemainingTime, 0); // avoid sub-zero values
+
+    mTimeSinceLastPaint = msSinceLastPaint;
+
+    return (mRemainingTime > 0);
+}
+
+void
+PrivateAnimScreen::preparePaint (int msSinceLastPaint)
+{
+    // Check and update "switcher post wait" counter
+    if (mSwitcherPostWait > 0)
+    {
+	mSwitcherPostWait++;
+	if (mSwitcherPostWait > 5) // wait over
+	{
+	    mSwitcherPostWait = 0;
+
+	    // Reset stacking related info since it will
+	    // cause problems because of the restacking
+	    // just done by Switcher.
+	    ExtensionPluginAnimation *extPlugin =
+		static_cast<ExtensionPluginAnimation *> (mExtensionPlugins[0]);
+	    extPlugin->resetStackingInfo ();
+	}
+    }
+
+    foreach (ExtensionPluginInfo *extPlugin, mExtensionPlugins)
+	extPlugin->prePreparePaintGeneral ();
+
+    if (mAnimInProgress)
+    {	
+	int msSinceLastPaintActual;
+
+	struct timeval curTime;
+	gettimeofday (&curTime, 0);
+
+	if (mLastRedrawTimeFresh)
+	{
+	    msSinceLastPaintActual = TIMEVALDIFF (&curTime, &mLastRedrawTime);
+	    // handle clock rollback
+	    if (msSinceLastPaintActual < 0)
+		msSinceLastPaintActual = 0;
+	}
+	else
+	    msSinceLastPaintActual = 20; // assume 20 ms passed
+
+	mLastRedrawTime = curTime; // Store current time for next time
+	mLastRedrawTimeFresh = true;
+
+	bool animStillInProgress = false;
+
+	foreach (CompWindow *w, ::screen->windows ())
+	{
+	    AnimWindow *animWin = AnimWindow::get (w);
+	    PrivateAnimWindow *aw = animWin->priv;
+	    Animation *curAnim = aw->curAnimation ();
+
+	    if (curAnim)
+	    {		
+		if (!curAnim->initialized ())
+		    curAnim->init ();
+
+		if (curAnim->prePreparePaint (msSinceLastPaint))
+		    animStillInProgress = true;
+
+		/* TODO optimize grid model by reusing one GridModel
+		if (aw->com.mModel &&
+		    (aw->com.mModel->winWidth != outRect.width () ||
+		     aw->com.mModel->winHeight != outRect.height ()))
+		{
+		    // mModel needs update
+		    // re-create mModel
+		    if (!animEnsureModel (w))
+		    {
+			// Abort this window's animation
+			postAnimationCleanUp (w);
+			continue;
+		    }
+		}*/
+
+		bool animShouldSkipFrame =
+		    (curAnim->shouldSkipFrame (msSinceLastPaintActual) &&
+		     // Skip only if we're not on the first animation frame
+		     curAnim->initialized ());
+
+		// Skip only if we're not on the last animation frame
+		animShouldSkipFrame &=
+		    curAnim->advanceTime (msSinceLastPaint);
+
+		if (!animShouldSkipFrame)
+		{
+		    if (curAnim->updateBBUsed ())
+		    {
+			aw->copyResetStepRegion ();
+
+			if (!curAnim->initialized () &&
+			    curAnim->shouldDamageWindowOnStart ())
+			    aw->aWindow ()->expandBBWithWindow ();
+		    }
+
+		    if (!curAnim->initialized ())
+			curAnim->setInitialized ();
+
+		    curAnim->step ();
+
+		    if (curAnim->updateBBUsed ())
+		    {
+			foreach (CompOutput &output, ::screen->outputDevs ())
+			    curAnim->updateBB (output);
+
+			if (!curAnim->stepRegionUsed () &&
+			    aw->BB ().x1 != MAXSHORT) // BB initialized
+			{
+			    // BB is used instead of step region,
+			    // so reset step region here with BB.
+			    animWin->resetStepRegionWithBB ();
+			}
+			if (!(cScreen->damageMask () &
+			      COMPOSITE_SCREEN_DAMAGE_ALL_MASK))
+			    aw->damageThisAndLastStepRegion ();
+		    }
+		}
+
+		bool finished = (curAnim->remainingTime () <= 0);
+		if (finished) // Animation is done
+		{
+		    aw->notifyAnimation (false);
+		    aw->postAnimationCleanUp ();
+		}
+		else
+		    animStillInProgress = true;
+	    }
+	}
+
+	foreach (CompWindow *w, ::screen->windows ())
+	{
+	    PrivateAnimWindow *aw = AnimWindow::get (w)->priv;
+	    if (aw->curAnimation ())
+		aw->curAnimation ()->postPreparePaint ();
+	}
+
+	if (!animStillInProgress)
+	{
+	    activateEvent (false);
+	    mLastRedrawTimeFresh = false;
+
+	    // Reset stacking related info after all animations are done.
+	    ExtensionPluginAnimation *extPlugin =
+		static_cast<ExtensionPluginAnimation *> (mExtensionPlugins[0]);
+	    extPlugin->resetStackingInfo ();
+	}
+    }
+
+    foreach (ExtensionPluginInfo *extPlugin, mExtensionPlugins)
+	extPlugin->postPreparePaintGeneral ();
+
+    cScreen->preparePaint (msSinceLastPaint);
+
+    if (mStartCountdown)
+    {
+	mStartCountdown--;
+	if (!mStartCountdown)
+	{
+	    foreach (ExtensionPluginInfo *extPlugin, mExtensionPlugins)
+		extPlugin->postStartupCountdown ();
+	}
+    }
+}
+
+void
+PrivateAnimScreen::donePaint ()
+{
+    assert (mAnimInProgress);
+
+    cScreen->damagePending ();
+
+    cScreen->donePaint ();
+}
+
+void
+PrivateAnimWindow::enablePainting (bool enabling)
+{
+    gWindow->glPaintSetEnabled (this, enabling);
+    gWindow->glAddGeometrySetEnabled (this, enabling);
+    gWindow->glDrawGeometrySetEnabled (this, enabling);
+    gWindow->glDrawTextureSetEnabled (this, enabling);
+}
+
+void
+PrivateAnimWindow::glAddGeometry (const GLTexture::MatrixList &matrix,
+				  const CompRegion            &region,
+				  const CompRegion            &clip,
+				  unsigned int                maxGridWidth,
+				  unsigned int                maxGridHeight)
+{
+    // if window is being animated
+    if (mCurAnimation)
+    {
+	if (mCurAnimation->initialized ())
+	    mCurAnimation->addGeometry (matrix, region, clip,
+					maxGridWidth, maxGridHeight);
+    }
+    else
+    {
+	gWindow->glAddGeometry (matrix, region, clip,
+				maxGridWidth, maxGridHeight);
+    }
+}
+
+bool
+Animation::shouldDamageWindowOnStart ()
+{
+    return (mCurWindowEvent == WindowEventClose ||
+	    mCurWindowEvent == WindowEventMinimize ||
+	    mCurWindowEvent == WindowEventShade);
+}
+
+bool
+Animation::shouldDamageWindowOnEnd ()
+{
+    return (mCurWindowEvent == WindowEventOpen ||
+	    mCurWindowEvent == WindowEventUnminimize ||
+	    mCurWindowEvent == WindowEventUnshade);
+}
+
+void
+Animation::addGeometry (const GLTexture::MatrixList &matrix,
+			const CompRegion            &region,
+			const CompRegion            &clip,
+			unsigned int                maxGridWidth,
+			unsigned int                maxGridHeight)
+{
+    mAWindow->priv->gWindow->glAddGeometry (matrix, region, clip,
+					    maxGridWidth, maxGridHeight);
+}
+
+void
+PartialWindowAnim::addGeometry (const GLTexture::MatrixList &matrix,
+				const CompRegion            &region,
+				const CompRegion            &clip,
+				unsigned int                maxGridWidth,
+				unsigned int                maxGridHeight)
+{
+    if (mUseDrawRegion)
+    {
+	CompRegion awRegion (region.intersected (mDrawRegion));
+	Animation::addGeometry (matrix, awRegion, clip,
+				maxGridWidth, maxGridHeight);
+    }
+    else
+    {
+	Animation::addGeometry (matrix, region, clip,
+				maxGridWidth, maxGridHeight);
+    }
+}
+
+void
+PrivateAnimWindow::glDrawTexture (GLTexture          *texture,
+				  GLFragment::Attrib &attrib,
+				  unsigned int       mask)
+{
+    if (mCurAnimation)
+    {
+	mCurAnimation->setCurPaintAttrib (attrib);
+    }
+
+    gWindow->glDrawTexture (texture, attrib, mask);
+}
+
+void
+PrivateAnimWindow::glDrawGeometry ()
+{
+    if (mCurAnimation)
+    {
+	if (mCurAnimation->initialized ())
+	    mCurAnimation->drawGeometry ();
+    }
+    else
+    {
+	gWindow->glDrawGeometry ();
+    }
+}
+
+void
+Animation::drawTexture (GLTexture          *texture,
+			GLFragment::Attrib &attrib,
+			unsigned int       mask)
+{
+    mCurPaintAttrib = attrib;
+}
+
+void
+Animation::drawGeometry ()
+{
+    mAWindow->priv->gWindow->glDrawGeometry ();
+}
+
+bool
+PrivateAnimWindow::glPaint (const GLWindowPaintAttrib &attrib,
+			    const GLMatrix &transform,
+			    const CompRegion &region, unsigned int mask)
+{
+    bool status;
+
+    // Is this the first glPaint call this round
+    // without the mask PAINT_WINDOW_OCCLUSION_DETECTION_MASK?
+    if (mPAScreen->mStartingNewPaintRound &&
+	!(mask & PAINT_WINDOW_OCCLUSION_DETECTION_MASK))
+    {
+	mPAScreen->mStartingNewPaintRound = false;
+
+	// Back-to-front painting of windows is starting now.
+	if (mPAScreen->mPrePaintWindowsBackToFrontEnabled)
+	    mPAScreen->prePaintWindowsBackToFront ();
+    }
+
+    assert (mCurAnimation);
+
+    foreach (ExtensionPluginInfo *extPlugin, mPAScreen->mExtensionPlugins)
+    {
+	if (extPlugin->paintShouldSkipWindow (mWindow))
+	    return false;
+    }
+
+    if (mCurAnimation->curWindowEvent () == WindowEventFocus &&
+	mPAScreen->otherPluginsActive ())
+    {
+	postAnimationCleanUp ();
+	return gWindow->glPaint (attrib, transform, region, mask);
+    }
+
+    GLWindowPaintAttrib wAttrib = attrib;
+    GLMatrix wTransform (transform.getMatrix ());
+
+    /* TODO check if this is still necessary
+    if (mCurAnimation->addCustomGeometryFunc)
+    {
+	// Use slightly smaller brightness to force core
+	// to handle <max saturation case with <max brightness.
+	// Otherwise polygon effects show fully unsaturated colors
+	// in that case.
+	wAttrib.brightness = MAX (0, wAttrib.brightness - 1);
+    } */
+
+    //w->indexCount = 0; // TODO check if this is still necessary
+
+    // TODO: should only happen for distorting effects
+    mask |= PAINT_WINDOW_TRANSFORMED_MASK;
+
+    wAttrib.xScale = 1.0f;
+    wAttrib.yScale = 1.0f;
+
+    mCurAnimation->updateAttrib (wAttrib);
+    mCurAnimation->updateTransform (wTransform);
+    mCurAnimation->prePaintWindow ();
+
+    if (mCurAnimation->paintWindowUsed ())
+	status = mCurAnimation->paintWindow (gWindow, wAttrib, wTransform, region, mask);
+    else
+	status = gWindow->glPaint (wAttrib, wTransform, region, mask);
+
+    if (mCurAnimation->postPaintWindowUsed ())
+    {
+	// Transform to make post-paint coincide with the window
+	glPushMatrix ();
+	glLoadMatrixf (wTransform.getMatrix ());
+
+	mCurAnimation->postPaintWindow ();
+
+	glPopMatrix ();
+    }
+
+    return status;
+}
+
+/// This is enabled only during restack animations.
+const CompWindowList &
+PrivateAnimScreen::getWindowPaintList ()
+{
+    ExtensionPluginAnimation *extPlugin =
+	static_cast<ExtensionPluginAnimation *> (mExtensionPlugins[0]);
+    return extPlugin->getWindowPaintList ();
+}
+
+/// This is enabled only during restack animations.
+void
+PrivateAnimScreen::prePaintWindowsBackToFront ()
+{
+    assert (mAnimInProgress);
+
+    ExtensionPluginAnimation *extPlugin =
+	static_cast<ExtensionPluginAnimation *> (mExtensionPlugins[0]);
+    extPlugin->prePaintWindowsBackToFront ();
+}
+
+void
+PrivateAnimScreen::enablePrePaintWindowsBackToFront (bool enabled)
+{
+    mPrePaintWindowsBackToFrontEnabled = enabled;
+}
+
+void
+AnimScreen::enableCustomPaintList (bool enabled)
+{
+    priv->cScreen->getWindowPaintListSetEnabled (priv, enabled);
+    priv->enablePrePaintWindowsBackToFront (enabled);
+}
+
+static const PluginEventInfo watchedScreenPlugins[] =
+{
+    {"switcher", "activate"},
+    {"ring", "activate"},
+    {"shift", "activate"},
+    {"scale", "activate"},
+    {"group", "tabChangeActivate"},
+    {"fadedesktop", "activate"}
+};
+
+static const PluginEventInfo watchedWindowPlugins[] =
+{
+    {"kdecompat", "slide"},
+};
+
+void
+PrivateAnimScreen::handleCompizEvent (const char         *pluginName,
+				      const char         *eventName,
+				      CompOption::Vector &options)
+{
+    ::screen->handleCompizEvent (pluginName, eventName, options);
+
+    for (int i = 0; i < WatchedScreenPluginNum; i++)
+	if (strcmp (pluginName, watchedScreenPlugins[i].pluginName) == 0)
+	{
+	    if (strcmp (eventName, 
+			watchedScreenPlugins[i].activateEventName) == 0)
+	    {
+		mPluginActive[i] =
+		    CompOption::getBoolOptionNamed (options, "active", false);
+
+		if (!mPluginActive[i] &&
+		    (i == WatchedPluginSwitcher ||
+		     i == WatchedPluginRing ||
+		     i == WatchedPluginShift ||
+		     i == WatchedPluginScale))
+		{
+		    mSwitcherPostWait = 1;
+		}
+	    }
+	    break;
+	}
+
+    for (int i = 0; i < WatchedWindowPluginNum; i++)
+	if (strcmp (pluginName,
+		    watchedWindowPlugins[i].pluginName) == 0)
+	{
+	    if (strcmp (eventName,
+			watchedWindowPlugins[i].activateEventName) == 0)
+	    {
+		Window xid = CompOption::getIntOptionNamed (options,
+							    "window",
+							     0);
+		CompWindow *w = screen->findWindow (xid);
+
+		if (w)
+		{
+		    AnimWindow *aw = AnimWindow::get (w);
+		    PrivateAnimWindow *pw = aw->priv;
+		    pw->mPluginActive[i] = CompOption::getBoolOptionNamed (
+								    options,
+								    "active",
+								    false);
+		}
+	    }
+	    break;
+	}
+}
+
+/// Returns true for windows that don't have a pixmap or certain properties,
+/// like the dimming layer of gksudo and x-session-manager.
+inline bool
+PrivateAnimScreen::shouldIgnoreWindowForAnim (CompWindow *w, bool checkPixmap)
+{
+    AnimWindow *aw = AnimWindow::get (w);
+
+    for (int i = 0; i < WatchedWindowPluginNum; i++)
+	if (aw->priv->mPluginActive[i])
+	    return true;
+
+    return ((checkPixmap && !CompositeWindow::get (w)->pixmap ()) ||
+	    mNeverAnimateMatch.evaluate (w));
+}
+
+void
+PrivateAnimWindow::reverseAnimation ()
+{
+    mCurAnimation->reverse ();
+
+    // Inflict the pending unmaps
+    while (mUnmapCnt > 0)
+    {
+	mWindow->unmap ();
+	mUnmapCnt--;
+    }
+    if (mUnmapCnt < 0)
+	mUnmapCnt = 0;
+}
+
+void
+PrivateAnimScreen::initiateCloseAnim (PrivateAnimWindow *aw)
+{
+    CompWindow *w = aw->mWindow;
+
+    foreach (ExtensionPluginInfo *extPlugin, mExtensionPlugins)
+	extPlugin->preInitiateCloseAnim (aw->mAWindow);
+
+    if (shouldIgnoreWindowForAnim (w, true))
+	return;
+    int duration = 200;
+    AnimEffect chosenEffect =
+	getMatchingAnimSelection (w, AnimEventClose, &duration);
+
+    aw->mState = NormalState;
+    aw->mNewState = WithdrawnState;
+
+    if (chosenEffect != AnimEffectNone)
+    {
+	bool startingNew = true;
+	WindowEvent curWindowEvent = WindowEventNone;
+
+	if (aw->curAnimation ())
+	    curWindowEvent = aw->curAnimation ()->curWindowEvent ();
+
+	if (curWindowEvent != WindowEventNone)
+	{
+	    if (curWindowEvent == WindowEventOpen)
+	    {
+		startingNew = false;
+		aw->reverseAnimation ();
+	    }
+	    /* TODO check if necessary
+	    else if (aw->com.curWindowEvent == WindowEventClose)
+	    {
+		if (aw->com.animOverrideProgressDir == 2)
+		{
+		    aw->com.animRemainingTime = tmpSteps;
+		    startingNew = false;
+		}
+	    }*/
+	    else
+	    {
+		aw->postAnimationCleanUpPrev (true, false);
+	    }
+	}
+
+	if (startingNew)
+	{
+	    AnimEffect effectToBePlayed =
+		getActualEffect (chosenEffect, AnimEventClose);
+
+	    // handle empty random effect list
+	    if (effectToBePlayed && effectToBePlayed == AnimEffectNone)
+	    {
+		aw->mState = aw->mNewState;
+		return;
+	    }
+
+	    aw->mCurAnimation =
+		effectToBePlayed->create (w, WindowEventClose, duration,
+					  effectToBePlayed, getIcon (w, true));
+	    aw->mCurAnimation->adjustPointerIconSize ();
+	    aw->enablePainting (true);
+	}
+
+	activateEvent (true);
+	aw->notifyAnimation (true);
+
+	// Increment 3 times to make sure close animation works
+	// (e.g. for popup menus).
+	for (int i = 0; i < 3; i++)
+	{
+	    aw->mUnmapCnt++;
+	    w->incrementUnmapReference ();
+	}
+	cScreen->damagePending ();
+    }
+    /* TODO check if necessary
+    else if (AnimEffectNone !=
+	     getMatchingAnimSelection (w, AnimEventOpen, &duration))
+    {
+	// stop the current animation and prevent it from rewinding
+
+	if (aw->com.animRemainingTime > 0 &&
+	    aw->com.curWindowEvent != WindowEventOpen)
+	{
+	    aw->com.animRemainingTime = 0;
+	}
+	if ((aw->com.curWindowEvent != WindowEventNone) &&
+	    (aw->com.curWindowEvent != WindowEventClose))
+	{
+	    postAnimationCleanUp (w);
+	}
+	// set some properties to make sure this window will use the
+	// correct open effect the next time it's "opened"
+
+	activateEvent (w->screen, true);
+	aw->com.curWindowEvent = WindowEventClose;
+
+	aw->mUnmapCnt++;
+	w->incrementUnmapRefCnt ();
+
+	damagePendingOnScreen (w->screen);
+    }*/
+    else
+	aw->mState = aw->mNewState;
+
+    // Make sure non-animated closing windows get a damage.
+    if (!aw->curAnimation ())
+    {
+	aw->mAWindow->expandBBWithWindow ();
+    }
+}
+
+CompRect
+PrivateAnimScreen::getIcon (CompWindow *w, bool alwaysUseMouse)
+{
+    CompRect icon;
+
+    if (!alwaysUseMouse)
+    {
+	icon = w->iconGeometry ();
+    }
+    if (alwaysUseMouse ||
+	(icon.x () == 0 &&
+	 icon.y () == 0 &&
+	 icon.width () == 0 &&
+	 icon.height () == 0)) // that is, couldn't get icon from window
+    {
+	// Minimize to mouse pointer if there is no
+	// window list or if the window skips taskbar
+	short x, y;
+	if (!aScreen->getMousePointerXY (&x, &y))
+	{
+	    // Use screen center if can't get mouse coords
+	    x = ::screen->width () / 2;
+	    y = ::screen->height () / 2;
+	}
+	icon.setX (x);
+	icon.setY (y);
+	icon.setWidth (FAKE_ICON_SIZE);
+	icon.setHeight (FAKE_ICON_SIZE);
+    }
+
+    return icon;
+}
+
+void
+PrivateAnimScreen::initiateMinimizeAnim (PrivateAnimWindow *aw)
+{
+    CompWindow *w = aw->mWindow;
+
+    if (aw->mWindow->destroyed ())
+	return;
+
+    // Store window geometry for use during animation.
+    aw->mAWindow->mSavedInRect = w->inputRect ();
+    aw->mAWindow->mSavedOutRect = w->outputRect ();
+    aw->mAWindow->mSavedOutExtents = w->output ();
+    aw->mAWindow->mSavedWinRect = w->geometry ();
+    aw->mAWindow->mSavedRectsValid = true;
+
+    aw->mNewState = IconicState;
+
+    foreach (ExtensionPluginInfo *extPlugin, mExtensionPlugins)
+	extPlugin->preInitiateMinimizeAnim (aw->mAWindow);
+
+    int duration = 200;
+    AnimEffect chosenEffect =
+	getMatchingAnimSelection (w, AnimEventMinimize, &duration);
+
+    if (chosenEffect != AnimEffectNone)
+    {
+	bool startingNew = true;
+	WindowEvent curWindowEvent = WindowEventNone;
+
+	if (aw->curAnimation ())
+	    curWindowEvent = aw->curAnimation ()->curWindowEvent ();
+
+	if (curWindowEvent != WindowEventNone)
+	{
+	    if (curWindowEvent != WindowEventUnminimize)
+	    {
+		aw->postAnimationCleanUpPrev (false, false);
+	    }
+	    else
+	    {
+		startingNew = false;
+		aw->reverseAnimation ();
+	    }
+	}
+
+	if (startingNew)
+	{
+	    AnimEffect effectToBePlayed =
+		getActualEffect (chosenEffect, AnimEventMinimize);
+
+	    // handle empty random effect list
+	    if (effectToBePlayed == AnimEffectNone)
+	    {
+		aw->mState = aw->mNewState;
+		return;
+	    }
+
+	    aw->mCurAnimation =
+		effectToBePlayed->create (w, WindowEventMinimize, duration,
+					  effectToBePlayed, getIcon (w, false));
+	    aw->enablePainting (true);
+	}
+
+	activateEvent (true);
+	aw->notifyAnimation (true);
+
+	aw->mUnmapCnt++;
+	w->incrementUnmapReference ();
+
+	cScreen->damagePending ();
+    }
+    else
+	aw->mState = aw->mNewState;
+}
+
+void
+PrivateAnimScreen::initiateShadeAnim (PrivateAnimWindow *aw)
+{
+    CompWindow *w = aw->mWindow;
+
+    int duration = 200;
+    AnimEffect chosenEffect =
+	getMatchingAnimSelection (w, AnimEventShade, &duration);
+
+    aw->setShaded (true);
+
+    if (chosenEffect != AnimEffectNone)
+    {
+	bool startingNew = true;
+	WindowEvent curWindowEvent = WindowEventNone;
+	if (aw->curAnimation ())
+	    curWindowEvent = aw->curAnimation ()->curWindowEvent ();
+
+	if (curWindowEvent != WindowEventNone)
+	{
+	    if (curWindowEvent != WindowEventUnshade)
+	    {
+		aw->postAnimationCleanUpPrev (false, false);
+	    }
+	    else
+	    {
+		startingNew = false;
+		aw->reverseAnimation ();
+	    }
+	}
+
+	if (startingNew)
+	{
+	    AnimEffect effectToBePlayed =
+		getActualEffect (chosenEffect, AnimEventShade);
+
+	    // handle empty random effect list
+	    if (effectToBePlayed == AnimEffectNone)
+		return;
+
+	    aw->mCurAnimation =
+		effectToBePlayed->create (w, WindowEventShade, duration,
+					  effectToBePlayed, getIcon (w, false));
+	    aw->enablePainting (true);
+	}
+
+	activateEvent (true);
+	aw->notifyAnimation (true);
+
+	aw->mUnmapCnt++;
+	w->incrementUnmapReference ();
+
+	cScreen->damagePending ();
+    }
+}
+
+void
+PrivateAnimScreen::initiateOpenAnim (PrivateAnimWindow *aw)
+{
+    CompWindow *w = aw->mWindow;
+
+    int duration = 200;
+    AnimEffect chosenEffect;
+
+    aw->mNewState = NormalState;
+
+    foreach (ExtensionPluginInfo *extPlugin, mExtensionPlugins)
+	extPlugin->preInitiateOpenAnim (aw->mAWindow);
+
+    WindowEvent curWindowEvent = WindowEventNone;
+    if (aw->curAnimation ())
+	curWindowEvent = aw->curAnimation ()->curWindowEvent ();
+
+    if (!shouldIgnoreWindowForAnim (w, false) &&
+	(AnimEffectNone !=
+	 (chosenEffect =
+	  getMatchingAnimSelection (w, AnimEventOpen, &duration)) ||
+	 // reversing case
+	 curWindowEvent == WindowEventClose))
+    {
+	bool startingNew = true;
+	bool playEffect = true;
+
+	if (curWindowEvent != WindowEventNone)
+	{
+	    if (curWindowEvent != WindowEventClose)
+	    {
+		aw->postAnimationCleanUpPrev (false, false);
+	    }
+	    else
+	    {
+		startingNew = false;
+		aw->reverseAnimation ();
+	    }
+	}
+
+	if (startingNew)
+	{
+	    AnimEffect effectToBePlayed =
+		getActualEffect (chosenEffect, AnimEventOpen);
+
+	    // handle empty random effect list
+	    if (effectToBePlayed == AnimEffectNone)
+		playEffect = false;
+
+	    if (playEffect)
+	    {
+		aw->mCurAnimation =
+		    effectToBePlayed->create (w, WindowEventOpen, duration,
+					      effectToBePlayed,
+					      getIcon (w, true));
+		aw->mCurAnimation->adjustPointerIconSize ();
+		aw->enablePainting (true);
+	    }
+	}
+
+	if (playEffect)
+	{
+	    activateEvent (true);
+	    aw->notifyAnimation (true);
+	    cScreen->damagePending ();
+	}
+    }
+}
+
+void
+PrivateAnimScreen::initiateUnminimizeAnim (PrivateAnimWindow *aw)
+{
+    CompWindow *w = aw->mWindow;
+
+    if (aw->mWindow->destroyed ())
+	return;
+
+    aw->mAWindow->mSavedRectsValid = false;
+
+    int duration = 200;
+    AnimEffect chosenEffect =
+	getMatchingAnimSelection (w, AnimEventMinimize, &duration);
+
+    aw->mNewState = NormalState;
+
+    if (chosenEffect != AnimEffectNone &&
+	!mPluginActive[3]) // fadedesktop
+    {
+	bool startingNew = true;
+	bool playEffect = true;
+
+	foreach (ExtensionPluginInfo *extPlugin, mExtensionPlugins)
+	    extPlugin->preInitiateUnminimizeAnim (aw->mAWindow);
+
+	// TODO Refactor the rest? (almost the same in other initiateX methods)
+	WindowEvent curWindowEvent = WindowEventNone;
+	if (aw->curAnimation ())
+	    curWindowEvent = aw->curAnimation ()->curWindowEvent ();
+
+	if (curWindowEvent != WindowEventNone)
+	{
+	    if (curWindowEvent != WindowEventMinimize)
+	    {
+		aw->postAnimationCleanUpPrev (false, false);
+	    }
+	    else
+	    {
+		startingNew = false;
+		aw->reverseAnimation ();
+	    }
+	}
+
+	if (startingNew)
+	{
+	    AnimEffect effectToBePlayed =
+		getActualEffect (chosenEffect, AnimEventMinimize);
+
+	    // handle empty random effect list
+	    if (effectToBePlayed == AnimEffectNone)
+		playEffect = false;
+
+	    if (playEffect)
+	    {
+		aw->mCurAnimation =
+		    effectToBePlayed->create (w, WindowEventUnminimize,
+					      duration, effectToBePlayed,
+					      getIcon (w, false));
+		aw->enablePainting (true);
+	    }
+	}
+
+	if (playEffect)
+	{
+	    activateEvent (true);
+	    aw->notifyAnimation (true);
+	    cScreen->damagePending ();
+	}
+    }
+}
+
+void
+PrivateAnimScreen::initiateUnshadeAnim (PrivateAnimWindow *aw)
+{
+    CompWindow *w = aw->mWindow;
+
+    aw->mAWindow->mSavedRectsValid = false;
+
+    aw->setShaded (false);
+
+    aw->mNewState = NormalState;
+
+    int duration = 200;
+    AnimEffect chosenEffect =
+	getMatchingAnimSelection (w, AnimEventShade, &duration);
+
+    if (chosenEffect != AnimEffectNone)
+    {
+	bool startingNew = true;
+	bool playEffect = true;
+
+	WindowEvent curWindowEvent = WindowEventNone;
+	if (aw->curAnimation ())
+	    curWindowEvent = aw->curAnimation ()->curWindowEvent ();
+
+	if (curWindowEvent != WindowEventNone)
+	{
+	    if (curWindowEvent != WindowEventShade)
+	    {
+		aw->postAnimationCleanUpPrev (false, false);
+	    }
+	    else
+	    {
+		startingNew = false;
+		aw->reverseAnimation ();
+	    }
+	}
+
+	if (startingNew)
+	{
+	    AnimEffect effectToBePlayed =
+		getActualEffect (chosenEffect, AnimEventShade);
+
+	    // handle empty random effect list
+	    if (effectToBePlayed == AnimEffectNone)
+		playEffect = false;
+
+	    if (playEffect)
+	    {
+		aw->mCurAnimation =
+		    effectToBePlayed->create (w, WindowEventUnshade,
+					      duration, effectToBePlayed,
+					      getIcon (w, false));
+		aw->enablePainting (true);
+	    }
+	}
+
+	if (playEffect)
+	{
+	    activateEvent (true);
+	    aw->notifyAnimation (true);
+	    cScreen->damagePending ();
+	}
+    }
+}
+
+bool
+PrivateAnimScreen::initiateFocusAnim (PrivateAnimWindow *aw)
+{
+    CompWindow *w = aw->mWindow;
+    int duration = 200;
+
+    if (aw->curAnimation () || otherPluginsActive () ||
+	// Check the "switcher post-wait" counter that effectively prevents
+	// focus animation to be initiated when the zoom option value is low
+	// in Switcher.
+	mSwitcherPostWait)
+	return false;
+
+    AnimEffect chosenEffect =
+	getMatchingAnimSelection (w, AnimEventFocus, &duration);
+
+    if (chosenEffect != AnimEffectNone)
+    {
+	aw->createFocusAnimation (chosenEffect, duration);
+
+	if (chosenEffect->isRestackAnim &&
+	    !(dynamic_cast<RestackAnim *> (aw->mCurAnimation)->
+	      initiateRestackAnim (duration)))
+	{
+	    aw->postAnimationCleanUp ();
+	    return false;
+	}
+
+	activateEvent (true);
+	aw->notifyAnimation (true);
+	cScreen->damagePending ();
+	return true;
+    }
+    return false;
+}
+
+void
+PrivateAnimWindow::resizeNotify (int dx,
+				 int dy,
+				 int dwidth,
+				 int dheight)
+{
+    if (mUnshadePending)
+    {
+	mUnshadePending = false;
+	mPAScreen->initiateUnshadeAnim (this);
+    }
+    else if (mCurAnimation && mCurAnimation->inProgress () &&
+	// Don't let transient window open anim be interrupted with a resize notify
+	!(mCurAnimation->curWindowEvent () == WindowEventOpen &&
+	  (mWindow->wmType () &
+	   (CompWindowTypeDropdownMenuMask |
+	    CompWindowTypePopupMenuMask |
+       	    CompWindowTypeMenuMask |
+	    CompWindowTypeTooltipMask |
+	    CompWindowTypeNotificationMask |
+	    CompWindowTypeComboMask |
+	    CompWindowTypeDndMask))) &&
+	// Ignore resize with dx=0, dy=0, dwidth=0, dheight=0
+	!(dx == 0 && dy == 0 && dwidth == 0 && dheight == 0) &&
+	!mCurAnimation->resizeUpdate (dx, dy, dwidth, dheight))
+    {
+	postAnimationCleanUp ();
+	mPAScreen->updateAnimStillInProgress ();
+    }
+
+    mWindow->resizeNotify (dx, dy, dwidth, dheight);
+}
+
+void
+PrivateAnimScreen::updateAnimStillInProgress ()
+{
+    bool animStillInProgress = false;
+    foreach (CompWindow *w, ::screen->windows ())
+    {
+	PrivateAnimWindow *aw = AnimWindow::get (w)->priv;
+	if (aw->curAnimation () &&
+	    aw->curAnimation ()->inProgress ())
+	{
+	    animStillInProgress = true;
+	    break;
+	}
+	else
+	{
+	    aw->notifyAnimation (false);
+	}
+    }
+
+    if (!animStillInProgress)
+	activateEvent (false);
+}
+
+void
+PrivateAnimWindow::moveNotify (int  dx,
+			       int  dy,
+			       bool immediate)
+{
+    if (mCurAnimation && mCurAnimation->inProgress () &&
+    	(mGrabbed || !mCurAnimation->moveUpdate (dx, dy)))
+    {
+	// Stop the animation
+    	postAnimationCleanUp ();
+    	mPAScreen->updateAnimStillInProgress ();
+    }
+
+    mWindow->moveNotify (dx, dy, immediate);
+}
+
+void
+PrivateAnimWindow::grabNotify (int          x,
+			       int          y,
+			       unsigned int state,
+			       unsigned int mask)
+{
+    mGrabbed = true;
+
+    mWindow->grabNotify (x, y, state, mask);
+}
+
+void
+PrivateAnimWindow::ungrabNotify ()
+{
+    mGrabbed = false;
+
+    mWindow->ungrabNotify ();
+}
+
+bool
+PrivateAnimScreen::glPaintOutput (const GLScreenPaintAttrib &attrib,
+				  const GLMatrix            &matrix,
+				  const CompRegion          &region,
+				  CompOutput                *output,
+				  unsigned int               mask)
+{
+    assert (mAnimInProgress);
+
+    mStartingNewPaintRound = true;
+
+    foreach (ExtensionPluginInfo *extPlugin, mExtensionPlugins)
+	extPlugin->prePaintOutput (output);
+
+    mask |= PAINT_SCREEN_WITH_TRANSFORMED_WINDOWS_MASK;
+
+    mOutput = output;
+
+    return gScreen->glPaintOutput (attrib, matrix, region, output, mask);
+}
+
+AnimEffectInfo::AnimEffectInfo (const char *name,
+				bool usedO, bool usedC, bool usedM,
+				bool usedS, bool usedF,
+				CreateAnimFunc create,
+				bool isRestackAnim) :
+    name (name),
+    create (create),
+    isRestackAnim (isRestackAnim)
+{
+    usedForEvents[AnimEventOpen] = usedO;
+    usedForEvents[AnimEventClose] = usedC;
+    usedForEvents[AnimEventMinimize] = usedM;
+    usedForEvents[AnimEventShade] = usedS;
+    usedForEvents[AnimEventFocus] = usedF;
+}
+
+bool
+AnimEffectInfo::matchesEffectName (const CompString &animName)
+{
+    return (0 == strcasecmp (animName.c_str (), name));
+}
+
+bool
+AnimEffectInfo::matchesPluginName (const CompString &pluginName)
+{
+    return (0 == strncmp (pluginName.c_str (), name, pluginName.length ()));
+}
+
+AnimEffect animEffects[NUM_EFFECTS];
+
+ExtensionPluginAnimation animExtensionPluginInfo (CompString ("animation"),
+                                                  NUM_EFFECTS, animEffects, 0,
+						  NUM_NONEFFECT_OPTIONS);
+ExtensionPluginInfo *
+Animation::getExtensionPluginInfo ()
+{
+    return &animExtensionPluginInfo;
+}
+
+AnimEffect AnimEffectNone;
+AnimEffect AnimEffectRandom;
+AnimEffect AnimEffectCurvedFold;
+AnimEffect AnimEffectDodge;
+AnimEffect AnimEffectDream;
+AnimEffect AnimEffectFade;
+AnimEffect AnimEffectFocusFade;
+AnimEffect AnimEffectGlide1;
+AnimEffect AnimEffectGlide2;
+AnimEffect AnimEffectHorizontalFolds;
+AnimEffect AnimEffectMagicLamp;
+AnimEffect AnimEffectMagicLampWavy;
+AnimEffect AnimEffectRollUp;
+AnimEffect AnimEffectSidekick;
+AnimEffect AnimEffectWave;
+AnimEffect AnimEffectZoom;
+
+PrivateAnimScreen::PrivateAnimScreen (CompScreen *s, AnimScreen *as) :
+    cScreen (CompositeScreen::get (s)),
+    gScreen (GLScreen::get (s)),
+    aScreen (as),
+    mLastRedrawTimeFresh (false),