Merge lp:~mniess/ubuntu/precise/compiz-plugins-main/lp953278 into lp:ubuntu/precise/compiz-plugins-main

[Matthias Niess]

Disabled super+r as bad default for fit_to_window_key (LP: #953278)

[lp:~mniess/ubuntu/precise/compiz-plugins-main/lp953278]

31. By Matthias Niess on 2012-03-26

* debian/patches/fix-lp953278.patch:
  - disable bad default of Super+r causing zoom to current window in
    ezoom plugin (LP: #953278)

[Matthias Niess (mniess)]

Changed the branch to not do the change directly in the file but put a patch in debian/patches.

[Didier Roche-Tolomelli (didrocks)]

Hey Matthias.

Thanks a lot for your patch!
However, I can't see it in the below diff (looked for a fix-lp953278.patch file).
The idea of the change is good, so I committed it under your name in the correct branch: http://bazaar.launchpad.net/~compiz/compcomm-plugins-main/ubuntu
(look at the Vcs-Bzr tag in debian/control, the command "debcheckout <package_name>" should bzr branch from the right branch).

Also, you will notice I merged your change to debian/patches/ubuntu_config.patch as it's really where this change should be.

Thanks again for your contribution :)
I'm marking this branch as merged then.

review: Approve

[Matthias Niess (mniess)]

Hi Didier. I'll do better next time! ;) I already know where things went wrong (i.e. I followed the Fixing Ubuntu bugs guide to the letter and edit-patch changed behavior). Thanks for the tips.

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2012-03-21 11:46:41 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-expo.patch
-fix_clipping_issues_in_expo.patch
-ubuntu_config.patch
-expo_api_931927.patch
-workarounds_923087.patch
-workarounds_931473.patch
-shift_954079.patch
-fix_broken_build.patch
-vpswitch_953834.patch
-fix_930192.patch

=== removed directory '.pc/expo.patch'
=== removed directory '.pc/expo.patch/expo'
=== removed file '.pc/expo.patch/expo/CMakeLists.txt'
--- .pc/expo.patch/expo/CMakeLists.txt	2012-02-13 15:30:29 +0000
+++ .pc/expo.patch/expo/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-find_package (Compiz REQUIRED)
-include (FindOpenGL)
-include (CompizPlugin)
-
-if (OPENGL_GLU_FOUND)
-    compiz_plugin (expo PLUGINDEPS composite opengl LIBRARIES ${OPENGL_glu_LIBRARY} INCDIRS ${OPENGL_INCLUDE_DIR})
-endif (OPENGL_GLU_FOUND)

=== removed file '.pc/expo.patch/expo/expo.xml.in'
--- .pc/expo.patch/expo/expo.xml.in	2012-02-13 15:30:29 +0000
+++ .pc/expo.patch/expo/expo.xml.in	1970-01-01 00:00:00 +0000
@@ -1,257 +0,0 @@
-<?xml version="1.0"?>
-<compiz>
-    <plugin name="expo" useBcop="true">
-	<_short>Expo</_short>
-	<_long>Expo Plugin</_long>
-	<category>Desktop</category>
-	<deps>
-	    <requirement>
-		<plugin>opengl</plugin>
-	    </requirement>
-	    <relation type="after">
-		<plugin>composite</plugin>
-		<plugin>opengl</plugin>
-		<plugin>decor</plugin>
-		<plugin>cube</plugin>
-		<plugin>cubeaddon</plugin>
-		<plugin>wobbly</plugin>
-		<plugin>animation</plugin>
-		<plugin>wallpaper</plugin>
-	    </relation>
-	</deps>
-	<options>
-	    <group>
-		<_short>Bindings</_short>
-		<option name="expo_key" type="key">
-		    <_short>Expo key</_short>
-		    <_long>Engage wall expo mode key binding</_long>
-		    <default>&lt;Super&gt;e</default>
-		</option>
-		<option name="expo_button" type="button">
-		    <_short>Expo button</_short>
-		    <_long>Engage wall expo mode button binding</_long>
-		    <default></default>
-		</option>
-		<option name="expo_edge" type="edge">
-		    <_short>Expo edge</_short>
-		    <_long>Engage wall expo mode edge binding</_long>
-		    <default>
-			<edge name="TopLeft"/>
-		    </default>
-		</option>
-		<option name="double_click_time" type="int">
-		    <_short>Double click time</_short>
-		    <_long>Timeframe to execute a double click</_long>
-		    <default>500</default>
-		    <min>50</min>
-		    <max>2000</max>
-		</option>
-		<option name="dnd_button" type="button">
-		    <_short>Drag&amp;drop</_short>
-		    <_long>Button binding for drag &amp; drop of windows</_long>
-		    <default>Button1</default>
-		    <passive_grab>false</passive_grab>
-		    <internal/>
-		</option>
-		<option name="exit_button" type="button">
-		    <_short>Exit expo</_short>
-		    <_long>Button binding to exit expo</_long>
-		    <default>Button3</default>
-		    <passive_grab>false</passive_grab>
-		    <internal/>
-		</option>
-		<option name="next_vp_button" type="button">
-		    <_short>Next viewport</_short>
-		    <_long>Button binding to switch to next viewport in expo</_long>
-		    <default>Button5</default>
-		    <passive_grab>false</passive_grab>
-		    <internal/>
-		</option>
-		<option name="prev_vp_button" type="button">
-		    <_short>Previous viewport</_short>
-		    <_long>Button binding to switch to next viewport in expo</_long>
-		    <default>Button4</default>
-		    <passive_grab>false</passive_grab>
-		    <internal/>
-		</option>
-	    </group>
-	    <group>
-		<_short>Behaviour</_short>
-		<option name="zoom_time" type="float">
-		    <_short>Zoom time</_short>
-		    <_long>Duration of the zoomout animation</_long>
-		    <default>0.5</default>
-		    <min>0.1</min>
-		    <max>5.0</max>
-		    <precision>0.1</precision>
-		</option>
-		<option name="expo_immediate_move" type="bool">
-		    <_short>Immediate moves</_short>
-		    <_long>Selects if windows movements in expo mode should be immediate - this among other things disables wobbliness</_long>
-		    <default>false</default>
-		</option>
-		<option name="expo_animation" type="int">
-		    <_short>Expo Animation</_short>
-		    <_long>Animation used when switching to expo mode</_long>
-		    <default>0</default>
-		    <min>0</min>
-		    <max>2</max>
-		    <desc>
-			<value>0</value>
-			<_name>Zoom</_name>
-		    </desc>
-		    <desc>
-			<value>1</value>
-			<_name>Fade + Zoom</_name>
-		    </desc>
-		    <desc>
-			<value>2</value>
-			<_name>Vortex</_name>
-		    </desc>
-		</option>
-	    </group>
-	    <group>
-		<_short>Appearance</_short>
-		<option name="deform" type="int">
-		    <_short>Deformation</_short>
-		    <_long>Deformation of the expo wall</_long>
-		    <default>0</default>
-		    <min>0</min>
-		    <max>2</max>
-		    <desc>
-			<value>0</value>
-			<_name>None</_name>
-		    </desc>
-		    <desc>
-			<value>1</value>
-			<_name>Tilt</_name>
-		    </desc>
-		    <desc>
-			<value>2</value>
-			<_name>Curve</_name>
-		    </desc>
-		</option>
-		<option name="distance" type="float">
-		    <_short>Distance</_short>
-		    <_long>Distance of the expo wall</_long>
-		    <default>0.0</default>
-		    <min>0.0</min>
-		    <max>1.0</max>
-		    <precision>0.01</precision>
-		</option>
-		<option name="vp_distance" type="float">
-		    <_short>Viewport distance</_short>
-		    <_long>Distance between viewports</_long>
-		    <default>0.10</default>
-		    <min>0.0</min>
-		    <max>1.0</max>
-		    <precision>0.01</precision>
-		</option>
-		<option name="aspect_ratio" type="float">
-		    <_short>Aspect Ratio</_short>
-		    <_long>Expo mode aspect ratio</_long>
-		    <default>1.0</default>
-		    <min>0.0</min>
-		    <max>1.0</max>
-		    <precision>0.1</precision>
-		</option>
-		<option name="curve" type="float">
-		    <_short>Curve strength</_short>
-		    <_long>Strength of the deformation in curve mode</_long>
-		    <default>0.50</default>
-		    <min>0.0</min>
-		    <max>1.0</max>
-		    <precision>0.01</precision>
-		</option>
-		<option name="hide_docks" type="bool">
-		    <_short>Hide panels/docks in expo</_short>
-		    <_long>Hide panels/docks in expo.</_long>
-		    <default>false</default>
-		</option>
-		<option name="mipmaps" type="bool">
-		    <_short>Mipmaps</_short>
-		    <_long>Generate mipmaps in expo mode</_long>
-		    <default>false</default>
-		</option>
-		<option name="multioutput_mode" type="int">
-		    <_short>Multi Output Mode</_short>
-		    <_long>Selects how the expo wall is displayed if multiple output devices are used.</_long>
-		    <min>0</min>
-		    <max>1</max>
-		    <default>0</default>
-		    <desc>
-			<value>0</value>
-			<_name>One big wall</_name>
-		    </desc>
-		    <desc>
-			<value>1</value>
-			<_name>One wall per output</_name>
-		    </desc>
-		</option>
-		<subgroup>
-		    <short>Inactive viewports</short>
-		    <option name="vp_brightness" type="float">
-			<_short>Brightness</_short>
-			<_long>Inactive viewport brightness.</_long>
-			<default>75.0</default>
-			<min>0.0</min>
-			<max>100.0</max>
-			<precision>0.1</precision>
-		    </option>
-		    <option name="vp_saturation" type="float">
-			<_short>Saturation</_short>
-			<_long>Inactive viewport saturation.</_long>
-			<default>100.0</default>
-			<min>0.0</min>
-			<max>100.0</max>
-			<precision>0.1</precision>
-		    </option>
-		</subgroup>
-		<subgroup>
-		    <short>Reflection</short>
-		    <option name="reflection" type="bool">
-			<_short>Reflection</_short>
-			<_long>Show a reflection of the viewports on the ground</_long>
-			<default>true</default>
-		    </option>
-		    <option name="ground_color1" type="color">
-			<_short>Ground color(near)</_short>
-			<_long>Color of the ground (near).</_long>
-			<default>
-			    <red>0xb333</red>
-			    <green>0xb333</green>
-			    <blue>0xb333</blue>
-			    <alpha>0xcccc</alpha>
-			</default>
-		    </option>
-		    <option name="ground_color2" type="color">
-			<_short>Ground color(far)</_short>
-			<_long>Color of the ground (far).</_long>
-			<default>
-			    <red>0xb333</red>
-			    <green>0xb333</green>
-			    <blue>0xb333</blue>
-			    <alpha>0x0000</alpha>
-			</default>
-		    </option>
-		    <option name="ground_size" type="float">
-			<_short>Reflection ground size</_short>
-			<_long>Reflection ground size.</_long>
-			<default>0.5</default>
-			<min>0.0</min>
-			<max>1.0</max>
-			<precision>0.01</precision>
-		    </option>
-		    <option name="scale_factor" type="float">
-			<_short>Reflection Scale</_short>
-			<_long>Scale factor of the expo wall reflection</_long>
-			<default>0.75</default>
-			<min>0.0</min>
-			<max>2.0</max>
-			<precision>0.01</precision>
-		    </option>
-		</subgroup>
-	    </group>
-	</options>
-    </plugin>
-</compiz>

=== removed directory '.pc/expo.patch/expo/src'
=== removed file '.pc/expo.patch/expo/src/expo.cpp'
--- .pc/expo.patch/expo/src/expo.cpp	2012-02-13 15:30:29 +0000
+++ .pc/expo.patch/expo/src/expo.cpp	1970-01-01 00:00:00 +0000
@@ -1,1382 +0,0 @@
-/**
- *
- * Compiz expo plugin
- *
- * expo.c
- *
- * Copyright (c) 2008 Dennis Kasprzyk <[e-mail]>
- * Copyright (c) 2006 Robert Carr <[e-mail]>
- *
- * Authors:
- * Robert Carr <[e-mail]>
- * Dennis Kasprzyk <[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.
- *
- **/
-
-#include "expo.h"
-#include <math.h>
-#include <GL/glu.h>
-
-COMPIZ_PLUGIN_20090315 (expo, ExpoPluginVTable);
-
-#define sigmoid(x) (1.0f / (1.0f + exp (-5.5f * 2 * ((x) - 0.5))))
-#define sigmoidProgress(x) ((sigmoid (x) - sigmoid (0)) / \
-			    (sigmoid (1) - sigmoid (0)))
-
-#define interpolate(a, b, val) (((val) * (a)) + ((1 - (val)) * (b)))
-
-bool
-ExpoScreen::dndInit (CompAction          *action,
-		     CompAction::State   state,
-		     CompOption::Vector& options)
-{
-    Window xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid != screen->root ())
-	return false;
-
-    if (expoMode)
-    {
-	dndState = DnDStart;
-	action->setState (action->state () | CompAction::StateTermButton);
-	cScreen->damageScreen ();
-
-	return true;
-    }
-
-    return false;
-}
-
-bool
-ExpoScreen::dndFini (CompAction          *action,
-		     CompAction::State   state,
-		     CompOption::Vector& options)
-{
-    Window xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid != screen->root ())
-	return false;
-
-    if (dndState == DnDDuring || dndState == DnDStart)
-    {
-	if (dndWindow)
-	    finishWindowMovement ();
-
-	dndState  = DnDNone;
-	dndWindow = NULL;
-
-	action->setState (action->state () & CompAction::StateInitButton);
-	cScreen->damageScreen ();
-
-	return true;
-    }
-
-    return false;
-}
-
-bool
-ExpoScreen::doExpo (CompAction          *action,
-		    CompAction::State   state,
-		    CompOption::Vector& options)
-{
-    Window xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid != screen->root ())
-	return false;
-
-    if (screen->otherGrabExist ("expo", NULL))
-	return false;
-
-    if (!expoMode)
-    {
-	if (!grabIndex)
-	    grabIndex = screen->pushGrab (None, "expo");
-
-	updateWraps (true);
-
-	expoMode    = true;
-	anyClick    = false;
-	doubleClick = false;
-	clickTime   = 0;
-
-	dndState  = DnDNone;
-	dndWindow = NULL;
-
-	selectedVp = screen->vp ();
-	lastSelectedVp = screen->vp ();
-	origVp     = screen->vp ();
-
-	screen->addAction (&optionGetDndButton ());
-	screen->addAction (&optionGetExitButton ());
-	screen->addAction (&optionGetNextVpButton ());
-	screen->addAction (&optionGetPrevVpButton ());
-
-	cScreen->damageScreen ();
-    }
-    else
-    {
-	termExpo (action, state, options);
-    }
-
-    return true;
-}
-
-bool
-ExpoScreen::termExpo (CompAction          *action,
-		      CompAction::State   state,
-		      CompOption::Vector& options)
-{
-    Window xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid && xid != screen->root ())
-	return false;
-
-    if (!expoMode)
-	return true;
-
-    expoMode = false;
-
-    if (dndState != DnDNone)
-	dndFini (action, state, options);
-
-    if (state & CompAction::StateCancel)
-	vpUpdateMode = VPUpdatePrevious;
-    else
-	vpUpdateMode = VPUpdateMouseOver;
-
-    dndState  = DnDNone;
-    dndWindow = NULL;
-
-    screen->removeAction (&optionGetDndButton ());
-    screen->removeAction (&optionGetExitButton ());
-    screen->removeAction (&optionGetNextVpButton ());
-    screen->removeAction (&optionGetPrevVpButton ());
-
-    cScreen->damageScreen ();
-    screen->focusDefaultWindow ();
-
-    return true;
-}
-
-bool
-ExpoScreen::exitExpo (CompAction          *action,
-		      CompAction::State   state,
-		      CompOption::Vector& options)
-{
-    Window xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid != screen->root ())
-	return false;
-
-    if (!expoMode)
-	return false;
-
-    termExpo (action, 0, noOptions);
-    anyClick = true;
-    cScreen->damageScreen ();
-
-    return true;
-}
-
-bool
-ExpoScreen::nextVp (CompAction          *action,
-		    CompAction::State   state,
-		    CompOption::Vector& options)
-{
-    unsigned int newX, newY;
-    Window       xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid != screen->root ())
-	return false;
-
-    if (!expoMode)
-	return false;
-
-    newX = selectedVp.x () + 1;
-    newY = selectedVp.y ();
-
-    if (newX >= (unsigned int) screen->vpSize ().width ())
-    {
-	newX = 0;
-	newY = newY + 1;
-	if (newY >= (unsigned int) screen->vpSize ().height ())
-	    newY = 0;
-    }
-
-    moveFocusViewport (newX - selectedVp.x (),
-		       newY - selectedVp.y ());
-    cScreen->damageScreen ();
-
-    return true;
-}
-
-bool
-ExpoScreen::prevVp (CompAction          *action,
-		    CompAction::State   state,
-		    CompOption::Vector& options)
-{
-    unsigned int newX, newY;
-    Window       xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid != screen->root ())
-	return false;
-
-    if (!expoMode)
-	return false;
-
-    newX = selectedVp.x () - 1;
-    newY = selectedVp.y ();
-
-    if (newX < 0)
-    {
-	newX = screen->vpSize ().width () - 1;
-	newY = newY - 1;
-	if (newY < 0)
-	    newY = screen->vpSize ().height () - 1;
-    }
-
-    moveFocusViewport (newX - selectedVp.x (),
-		       newY - selectedVp.y ());
-    cScreen->damageScreen ();
-
-    return true;
-}
-
-void
-ExpoScreen::moveFocusViewport (int dx,
-			       int dy)
-{
-    int newX, newY;
-
-    lastSelectedVp = selectedVp;
-
-    newX = selectedVp.x () + dx;
-    newY = selectedVp.y () + dy;
-
-    newX = MAX (0, MIN ((int) screen->vpSize ().width () - 1, newX));
-    newY = MAX (0, MIN ((int) screen->vpSize ().height () - 1, newY));
-
-    selectedVp.set (newX, newY);
-    cScreen->damageScreen ();
-}
-
-void
-ExpoScreen::finishWindowMovement ()
-{
-    dndWindow->syncPosition ();
-    dndWindow->ungrabNotify ();
-
-    screen->moveViewport (screen->vp ().x () - selectedVp.x (),
-			  screen->vp ().y () - selectedVp.y (), true);
-
-    /* update saved window attributes in case we moved the
-       window to a new viewport */
-    if (dndWindow->saveMask () & CWX)
-    {
-	dndWindow->saveWc ().x = dndWindow->saveWc ().x % screen->width ();
-	if (dndWindow->saveWc ().x < 0)
-	    dndWindow->saveWc ().x += screen->width ();
-    }
-    if (dndWindow->saveMask () & CWY)
-    {
-	dndWindow->saveWc ().y = dndWindow->saveWc ().y % screen->height ();
-	if (dndWindow->saveWc ().y < 0)
-	    dndWindow->saveWc ().y += screen->height ();
-    }
-
-    /* update window attibutes to make sure a moved maximized window
-       is properly snapped to the work area */
-    if (dndWindow->state () & MAXIMIZE_STATE)
-	dndWindow->updateAttributes (CompStackingUpdateModeNone);
-
-#if 0 /* FIXME: obsolete in the meantime? */
-    {
-	int lastOutput;
-	int centerX, centerY;
-
-	/* make sure we snap to the correct output */
-	lastOutput = s->currentOutputDev;
-	centerX = (WIN_X (w) + WIN_W (w) / 2) % s->width;
-	if (centerX < 0)
-	    centerX += s->width;
-	centerY = (WIN_Y (w) + WIN_H (w) / 2) % s->height;
-	if (centerY < 0)
-	    centerY += s->height;
-
-	s->currentOutputDev = outputDeviceForPoint (s, centerX, centerY);
-
-	updateWindowAttributes (w, CompStackingUpdateModeNone);
-
-	s->currentOutputDev = lastOutput;
-    }
-#endif
-}
-
-void
-ExpoScreen::handleEvent (XEvent *event)
-{
-    switch (event->type) {
-    case KeyPress:
-	if (expoMode && event->xkey.root == screen->root ())
-	{
-	    if (event->xkey.keycode == leftKey)
-		moveFocusViewport (-1, 0);
-	    else if (event->xkey.keycode == rightKey)
-		moveFocusViewport (1, 0);
-	    else if (event->xkey.keycode == upKey)
-		moveFocusViewport (0, -1);
-	    else if (event->xkey.keycode == downKey)
-		moveFocusViewport (0, 1);
-	}
-	break;
-
-    case ButtonPress:
-	if (expoMode && event->xbutton.button == Button1 &&
-	    event->xbutton.root == screen->root ())
-	{
-	    anyClick = true;
-	    if (clickTime == 0)
-	    {
-		clickTime = event->xbutton.time;
-	    }
-	    else if (event->xbutton.time - clickTime <=
-		     (unsigned int) optionGetDoubleClickTime () && lastSelectedVp == selectedVp)
-	    {
-		doubleClick = true;
-	    }
-	    else
-	    {
-		clickTime   = event->xbutton.time;
-		doubleClick = false;
-	    }
-	    cScreen->damageScreen ();
-	}
-	break;
-
-    case ButtonRelease:
-	if (expoMode && event->xbutton.button == Button1 &&
-	    event->xbutton.root == screen->root ())
-	{
-	    if (event->xbutton.time - clickTime >
-		(unsigned int) optionGetDoubleClickTime ())
-	    {
-		clickTime   = 0;
-		doubleClick = false;
-	    }
-	    else if (doubleClick)
-	    {
-		CompAction& action = optionGetExpoKey ();
-
-		clickTime   = 0;
-		doubleClick = false;
-
-		termExpo (&action, 0, noOptions);
-		anyClick = true;
-	    }
-	}
-	break;
-    }
-
-    screen->handleEvent (event);
-}
-
-void
-ExpoScreen::preparePaint (int msSinceLastPaint)
-{
-    float val = ((float) msSinceLastPaint / 1000.0) / optionGetZoomTime ();
-
-    if (expoMode)
-	expoCam = MIN (1.0, expoCam + val);
-    else
-	expoCam = MAX (0.0, expoCam - val);
-
-    if (expoCam)
-    {
-	unsigned int i, j, vp;
-	unsigned int vpCount = screen->vpSize ().width () *
-	                       screen->vpSize ().height ();
-
-	if (vpActivity.size () < vpCount)
-	{
-	    vpActivity.resize (vpCount);
-	    foreach (float& activity, vpActivity)
-		activity = 1.0f;
-	}
-
-	for (i = 0; i < (unsigned int) screen->vpSize ().width (); i++)
-	{
-	    for (j = 0; j < (unsigned int) screen->vpSize ().height (); j++)
-	    {
-		vp = (j * screen->vpSize ().width ()) + i;
-
-		if (CompPoint (i, j) == selectedVp)
-		    vpActivity[vp] = MIN (1.0, vpActivity[vp] + val);
-		else
-		    vpActivity[vp] = MAX (0.0, vpActivity[vp] - val);
-	    }
-	}
-
-	for (i = 0; i < 360; i++)
-	{
-	    float fi = (float) i;
-
-	    vpNormals[i * 3] = (-sin (fi * (M_PI / 180.0f)) / screen->width ()) *
-			       expoCam;
-	    vpNormals[(i * 3) + 1] = 0.0;
-	    vpNormals[(i * 3) + 2] = (-cos (fi * (M_PI / 180.0f)) * expoCam) -
-		                     (1 - expoCam);
-	}
-    }
-
-    cScreen->preparePaint (msSinceLastPaint);
-}
-
-void
-ExpoScreen::updateWraps (bool enable)
-{
-    screen->handleEventSetEnabled (this, enable);
-    cScreen->preparePaintSetEnabled (this, enable);
-    cScreen->paintSetEnabled (this, enable);
-    cScreen->donePaintSetEnabled (this, enable);
-    gScreen->glPaintOutputSetEnabled (this, enable);
-    gScreen->glPaintTransformedOutputSetEnabled (this, enable);
-
-    foreach (CompWindow *w, screen->windows ())
-    {
-	ExpoWindow *ew = ExpoWindow::get (w);
-
-	ew->cWindow->damageRectSetEnabled (ew, enable);
-	ew->gWindow->glPaintSetEnabled (ew, enable);
-	ew->gWindow->glDrawSetEnabled (ew, enable);
-	ew->gWindow->glAddGeometrySetEnabled (ew, enable);
-	ew->gWindow->glDrawTextureSetEnabled (ew, enable);
-    }
-}
-
-void
-ExpoScreen::paint (CompOutput::ptrList& outputs,
-		   unsigned int         mask)
-{
-    int width = outputs.front ()->width ();
-    int height = outputs.front ()->height ();
-    bool sizeDiff = false;
-
-    /* "One big wall" does not make sense where outputs are different
-     * sizes, so force multiple walls in this case
-     *
-     * TODO: Is it possible to re-create "one big wall" using
-     * independent output painting in this case? */
-
-    foreach (CompOutput *o, outputs)
-    {
-	if (o->width () != width || o->height () != height)
-	{
-	    sizeDiff = true;
-	    break;
-	}
-    }
-
-    if (expoCam > 0.0 && outputs.size () > 1 &&
-        optionGetMultioutputMode () == MultioutputModeOneBigWall &&
-	!sizeDiff)
-    {
-	outputs.clear ();
-	outputs.push_back (&screen->fullscreenOutput ());
-    }
-
-    cScreen->paint (outputs, mask);
-}
-
-void
-ExpoScreen::donePaint ()
-{
-    switch (vpUpdateMode) {
-    case VPUpdateMouseOver:
-	screen->moveViewport (screen->vp ().x () - selectedVp.x (),
-			      screen->vp ().y () - selectedVp.y (), true);
-	screen->focusDefaultWindow ();
-	vpUpdateMode = VPUpdateNone;
-	break;
-    case VPUpdatePrevious:
-	screen->moveViewport (screen->vp ().x () - origVp.x (),
-			      screen->vp ().y () - origVp.y (), true);
-	lastSelectedVp = selectedVp;
-	selectedVp = origVp;
-	screen->focusDefaultWindow ();
-	vpUpdateMode = VPUpdateNone;
-	break;
-    default:
-	break;
-    }
-
-    if ((expoCam > 0.0f && expoCam < 1.0f) || dndState != DnDNone)
-	cScreen->damageScreen ();
-
-    if (expoCam == 1.0f)
-    {
-	foreach (float& vp, vpActivity)
-	    if (vp != 0.0 && vp != 1.0)
-		cScreen->damageScreen ();
-    }
-
-    if (grabIndex && expoCam <= 0.0f && !expoMode)
-    {
-	screen->removeGrab (grabIndex, NULL);
-	grabIndex = 0;
-	updateWraps (false);
-    }
-
-    cScreen->donePaint ();
-
-    switch (dndState) {
-    case DnDDuring:
-	{
-	    if (dndWindow)
-		dndWindow->move (newCursor.x () - prevCursor.x (),
-				 newCursor.y () - prevCursor.y (),
-				 optionGetExpoImmediateMove ());
-
-	    prevCursor = newCursor;
-	    cScreen->damageScreen ();
-	}
-	break;
-
-    case DnDStart:
-	{
-	    int                              xOffset, yOffset;
-	    CompWindowList::reverse_iterator iter;
-
-	    xOffset = screen->vpSize ().width () * screen->width ();
-	    yOffset = screen->vpSize ().height () * screen->height ();
-
-	    dndState = DnDNone;
-
-	    for (iter = screen->windows ().rbegin ();
-		 iter != screen->windows ().rend (); ++iter)
-	    {
-		CompWindow *w = *iter;
-		CompRect   input (w->inputRect ());
-		bool       inWindow;
-		int        nx, ny;
-
-		if (w->destroyed ())
-		    continue;
-
-		if (!w->shaded () && !w->isViewable ())
-		    continue;
-
-		if (w->onAllViewports ())
-		{
-		    nx = (newCursor.x () + xOffset) % screen->width ();
-		    ny = (newCursor.y () + yOffset) % screen->height ();
-		}
-		else
-		{
-		    nx = newCursor.x () -
-			 (screen->vp ().x () * screen->width ());
-		    ny = newCursor.y () -
-			 (screen->vp ().y () * screen->height ());
-		}
-
-		inWindow = (nx >= input.left () && nx <= input.right ()) ||
-			   (nx >= (input.left () + xOffset) &&
-			    nx <= (input.right () + xOffset));
-
-		inWindow &= (ny >= input.top () && ny <= input.bottom ()) ||
-			    (ny >= (input.top () + yOffset) &&
-			     ny <= (input.bottom () + yOffset));
-
-		if (!inWindow)
-		    continue;
-
-		/* make sure we never move windows we're not allowed to move */
-		if (!w->managed ())
-		    break;
-		else if (!(w->actions () & CompWindowActionMoveMask))
-		    break;
-		else if (w->type () & (CompWindowTypeDockMask |
-				       CompWindowTypeDesktopMask))
-		    break;
-
-		dndState  = DnDDuring;
-		dndWindow = w;
-
-		w->grabNotify (nx, ny, 0,
-			       CompWindowGrabMoveMask |
-			       CompWindowGrabButtonMask);
-
-		w->raise ();
-		w->moveInputFocusTo ();
-		break;
-	    }
-
-	    prevCursor = newCursor;
-	}
-	break;
-    default:
-	break;
-    }
-}
-
-void
-ExpoScreen::invertTransformedVertex (const GLScreenPaintAttrib& attrib,
-				     const GLMatrix&            transform,
-				     CompOutput                 *output,
-				     int                        vertex[2])
-{
-    GLMatrix sTransform (transform);
-    GLdouble p1[3], p2[3], v[3], alpha;
-    GLdouble mvm[16], pm[16];
-    GLint    viewport[4];
-    int      i;
-
-    gScreen->glApplyTransform (attrib, output, &sTransform);
-    sTransform.toScreenSpace (output, -attrib.zTranslate);
-
-    glGetIntegerv (GL_VIEWPORT, viewport);
-    for (i = 0; i < 16; i++)
-    {
-	mvm[i] = sTransform[i];
-	pm[i]  = gScreen->projectionMatrix ()[i];
-    }
-
-    gluUnProject (vertex[0], screen->height () - vertex[1], 0, mvm, pm,
-		  viewport, &p1[0], &p1[1], &p1[2]);
-    gluUnProject (vertex[0], screen->height () - vertex[1], -1.0, mvm, pm,
-		  viewport, &p2[0], &p2[1], &p2[2]);
-
-    for (i = 0; i < 3; i++)
-	v[i] = p1[i] - p2[i];
-
-    alpha = -p1[2] / v[2];
-
-    if (optionGetDeform () == DeformCurve && screen->desktopWindowCount ())
-    {
-	const float sws = screen->width () * screen->width ();
-	const float rs = (curveDistance * curveDistance) + 0.25;
-	const float p = ((2.0 * sws * (p1[2] - curveDistance) * v[2]) +
-			 (2.0 * p1[0] * v[0]) -
-			 (v[0] * (float) screen->width ())) /
-	                ((v[2] * v[2] * sws) + (v[0] * v[0]));
-	const float q = (-(sws * rs) + (sws * (p1[2] - curveDistance) *
-					(p1[2] - curveDistance)) +
-			 (0.25 * sws) + (p1[0] * p1[0]) -
-			 (p1[0] * (float) screen->width ())) /
-	                ((v[2] * v[2] * sws) + (v[0] * v[0]));
-
-	const float rq = (0.25 * p * p) - q;
-	const float ph = -p * 0.5;
-
-	if (rq < 0.0)
-	{
-	    vertex[0] = -1000;
-	    vertex[1] = -1000;
-	    return;
-	}
-	else
-	{
-	    alpha = ph + sqrt(rq);
-	    if (p1[2] + (alpha * v[2]) > 0.0)
-	    {
-		vertex[0] = -1000;
-		vertex[1] = -1000;
-		return;
-	    }
-	}
-    }
-
-    vertex[0] = ceil (p1[0] + (alpha * v[0]));
-    vertex[1] = ceil (p1[1] + (alpha * v[1]));
-}
-
-void
-ExpoScreen::paintWall (const GLScreenPaintAttrib& attrib,
-		       const GLMatrix&            transform,
-		       const CompRegion&          region,
-		       CompOutput                 *output,
-		       unsigned int               mask,
-		       bool                       reflection)
-{
-    GLMatrix sTransformW, sTransform (transform);
-    int      i, j, vp;
-    GLenum   oldFilter = gScreen->textureFilter ();
-
-    float     sx = (float) screen->width () / output->width ();
-    float     sy = (float) screen->height () / output->height ();
-    float     biasZ;
-    float     oScale, rotation = 0.0f, progress, vpp;
-    float     aspectX = 1.0f, aspectY = 1.0f;
-    GLVector  cam;
-    CompPoint vpSize (screen->vpSize ().width (), screen->vpSize ().height ());
-
-    /* amount of gap between viewports */
-    const float gapY = optionGetVpDistance () * 0.1f * expoCam;
-    const float gapX = optionGetVpDistance () * 0.1f * screen->height () /
-		       screen->width () * expoCam;
-
-    int      glPaintTransformedOutputIndex =
-	gScreen->glPaintTransformedOutputGetCurrentIndex ();
-
-    // Make sure that the base glPaintTransformedOutput function is called
-    gScreen->glPaintTransformedOutputSetCurrentIndex (MAXSHORT);
-
-    /* Zoom animation stuff */
-    /* camera position for the selected viewport */
-    GLVector vpCamPos (0, 0, 0, 0);
-
-    /* camera position during expo mode */
-    GLVector expoCamPos (0, 0, 0, 0);
-
-    if (optionGetDeform () == DeformCurve)
-    {
-	vpCamPos[GLVector::x] = -sx * (0.5 - (((float) output->x () +
-					       (output->width () / 2.0)) /
-					      (float) screen->width ()));
-    }
-    else
-    {
-	vpCamPos[GLVector::x] = (screen->vp ().x () * sx) + 0.5 +
-				(output->x () / output->width ()) -
-	                        (vpSize.x () * 0.5 * sx) +
-				gapX * screen->vp ().x ();
-    }
-    vpCamPos[GLVector::y] = -((screen->vp ().y () * sy) + 0.5 +
-			      (output->y () / output->height ())) +
-	                     (vpSize.y () * 0.5 * sy) -
-			     gapY * screen->vp ().y ();
-
-    biasZ = MAX (vpSize.x () * sx, vpSize.y () * sy);
-    if (optionGetDeform () == DeformTilt || optionGetReflection ())
-	biasZ *= (0.15 + optionGetDistance ());
-    else
-	biasZ *= optionGetDistance ();
-
-    progress = sigmoidProgress (expoCam);
-
-    if (optionGetDeform () != DeformCurve)
-	expoCamPos[GLVector::x] = gapX * (vpSize.x () - 1) * 0.5;
-
-    expoCamPos[GLVector::y] = -gapY * (vpSize.y () - 1) * 0.5;
-    expoCamPos[GLVector::z] = -DEFAULT_Z_CAMERA + DEFAULT_Z_CAMERA *
-	                      (MAX (vpSize.x () + (vpSize.x () - 1) * gapX,
-				    vpSize.y () + (vpSize.y () - 1) * gapY) +
-			       biasZ);
-
-    /* interpolate between vpCamPos and expoCamPos */
-    cam[GLVector::x] = vpCamPos[GLVector::x] * (1 - progress) +
-	               expoCamPos[GLVector::x] * progress;
-    cam[GLVector::y] = vpCamPos[GLVector::y] * (1 - progress) +
-	               expoCamPos[GLVector::y] * progress;
-    cam[GLVector::z] = vpCamPos[GLVector::z] * (1 - progress) +
-	               expoCamPos[GLVector::z] * progress;
-
-    if (vpSize.x () > vpSize.y ())
-    {
-	aspectY = (float) vpSize.x () / (float) vpSize.y ();
-	aspectY -= 1.0;
-	aspectY *= -optionGetAspectRatio () + 1.0;
-	aspectY *= progress;
-	aspectY += 1.0;
-    }
-    else
-    {
-	aspectX = (float) vpSize.y () / (float) vpSize.x ();
-	aspectX -= 1.0;
-	aspectX *= -optionGetAspectRatio () + 1.0;
-	aspectX *= progress;
-	aspectX += 1.0;
-    }
-
-    /* End of Zoom animation stuff */
-
-    if (optionGetDeform () == DeformTilt)
-    {
-	if (optionGetExpoAnimation () == ExpoAnimationZoom)
-	    rotation = 10.0 * sigmoidProgress (expoCam);
-	else
-	    rotation = 10.0 * expoCam;
-    }
-
-    if (optionGetMipmaps ())
-	gScreen->setTextureFilter (GL_LINEAR_MIPMAP_LINEAR);
-
-    /* ALL TRANSFORMATION ARE EXECUTED FROM BOTTOM TO TOP */
-
-    oScale = 1 / (1 + ((MAX (sx, sy) - 1) * progress));
-
-    sTransform.scale (oScale, oScale, 1.0);
-
-    /* zoom out */
-    oScale = DEFAULT_Z_CAMERA / (cam[GLVector::z] + DEFAULT_Z_CAMERA);
-    sTransform.scale (oScale, oScale, oScale);
-    glNormal3f (0.0, 0.0, -oScale);
-    sTransform.translate (-cam[GLVector::x], -cam[GLVector::y],
-			  -cam[GLVector::z] - DEFAULT_Z_CAMERA);
-
-    if (reflection)
-    {
-	float scaleFactor = optionGetScaleFactor ();
-
-	sTransform.translate (0.0,
-			      (vpSize.y () + ((vpSize.y () - 1) * gapY * 2)) *
-			      -sy * aspectY,
-			      0.0);
-	sTransform.scale (1.0, -1.0, 1.0);
-	sTransform.translate (0.0,
-			      - (1 - scaleFactor) / 2 * sy * aspectY *
-			      (vpSize.y () + ((vpSize.y () - 1) * gapY * 2)),
-			      0.0);
-	sTransform.scale (1.0, scaleFactor, 1.0);
-	glCullFace (GL_FRONT);
-    }
-
-    /* rotate */
-    sTransform.rotate (rotation, 0.0f, 1.0f, 0.0f);
-    sTransform.scale (aspectX, aspectY, 1.0);
-
-    /* translate expo to center */
-    sTransform.translate (vpSize.x () * sx * -0.5,
-			  vpSize.y () * sy * 0.5, 0.0f);
-
-    if (optionGetDeform () == DeformCurve)
-	sTransform.translate ((vpSize.x () - 1) * sx * 0.5, 0.0, 0.0);
-
-    sTransformW = sTransform;
-
-    /* revert prepareXCoords region shift. Now all screens display the same */
-    sTransform.translate (0.5f, -0.5f, DEFAULT_Z_CAMERA);
-
-    if (vpSize.x () > 2)
-	/* we can't have 90 degree for the left/right most viewport */
-	curveAngle = interpolate (359 / ((vpSize.x () - 1) * 2), 1,
-				  optionGetCurve ());
-    else
-	curveAngle = interpolate (180 / vpSize.x (), 1, optionGetCurve ());
-
-    curveDistance = ((0.5f * sx) + (gapX / 2.0)) /
-	            tanf ((M_PI / 180.0f) * curveAngle / 2.0);
-    curveRadius   = ((0.5f * sx) + (gapX / 2.0)) /
-		    sinf ((M_PI / 180.0f) * curveAngle / 2.0);
-
-    expoActive = true;
-
-    for (j = 0; j < vpSize.y (); j++)
-    {
-	GLMatrix sTransform2 (sTransform), sTransform3;
-
-	for (i = 0; i < vpSize.x (); i++)
-	{
-	    if (optionGetExpoAnimation () == ExpoAnimationVortex)
-		sTransform2.rotate (360 * expoCam,
-				    0.0f, 1.0f, 2.0f * expoCam);
-
-	    sTransform3 = sTransform2;
-
-	    sTransform3.translate (output->x () / output->width (),
-				   -output->y () / output->height (), 0.0);
-
-	    cScreen->setWindowPaintOffset ((screen->vp ().x () - i) *
-					   screen->width (),
-					   (screen->vp ().y () - j) *
-					   screen->height ());
-
-	    vp = (j * vpSize.x ()) + i;
-
-	    vpp = (expoCam * vpActivity[vp]) + (1 - expoCam);
-	    vpp = sigmoidProgress (vpp);
-
-	    vpBrightness = vpp + ((1.0 - vpp) *
-				  optionGetVpBrightness () / 100.0);
-	    vpSaturation = vpp + ((1.0 - vpp) *
-				  optionGetVpSaturation () / 100.0);
-
-	    paintingVp.set (i, j);
-
-	    if (optionGetDeform () == DeformCurve)
-	    {
-		float rotateX;
-
-		sTransform3.translate (-vpCamPos[GLVector::x], 0.0f,
-				       curveDistance - DEFAULT_Z_CAMERA);
-
-		rotateX = -i + interpolate (((float) vpSize.x () / 2.0) - 0.5,
-					    screen->vp ().x (), progress);
-
-		sTransform3.rotate (curveAngle * rotateX, 0.0, 1.0, 0.0);
-
-		sTransform3.translate (vpCamPos[GLVector::x], 0.0f,
-				       DEFAULT_Z_CAMERA - curveDistance);
-	    }
-
-	    gScreen->glPaintTransformedOutput (attrib, sTransform3,
-					       screen->region (), output,
-					       mask);
-
-	    if (!reflection)
-	    {
-		int cursor[2] = { pointerX, pointerY };
-
-		invertTransformedVertex (attrib, sTransform3,
-					 output, cursor);
-
-		if ((cursor[0] > 0) && (cursor[0] < (int) screen->width ()) &&
-		    (cursor[1] > 0) && (cursor[1] < (int) screen->height ()))
-		{
-		    newCursor.setX (i * screen->width () + cursor[0]);
-		    newCursor.setY (j * screen->height () + cursor[1]);
-
-		    if (anyClick || dndState != DnDNone)
-		    {
-			/* Used to save last viewport interaction was in */
-			lastSelectedVp = selectedVp;
-			selectedVp.set (i, j);
-			anyClick = false;
-		    }
-		}
-	    }
-
-	    /* not sure this will work with different resolutions */
-	    if (optionGetDeform () != DeformCurve)
-		sTransform2.translate (sx + gapX, 0.0f, 0.0);
-	}
-
-	/* not sure this will work with different resolutions */
-	sTransform.translate (0.0, -(sy + gapY), 0.0f);
-    }
-
-    glNormal3f (0.0, 0.0, -1.0);
-
-    if (reflection)
-    {
-	glEnable (GL_BLEND);
-	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-	glPushMatrix ();
-
-	if (optionGetDeform () != DeformCurve)
-	{
-	    glLoadMatrixf (sTransformW.getMatrix ());
-
-	    glBegin (GL_QUADS);
-	    glColor4f (0.0, 0.0, 0.0, 1.0);
-	    glVertex2f (0.0, 0.0);
-	    glColor4f (0.0, 0.0, 0.0, 0.5);
-	    glVertex2f (0.0, -vpSize.y () * (sy + gapY));
-	    glVertex2f (vpSize.x () * sx * (1.0 + gapX),
-			-vpSize.y () * sy * (1.0 + gapY));
-	    glColor4f (0.0, 0.0, 0.0, 1.0);
-	    glVertex2f (vpSize.x () * sx * (1.0 + gapX), 0.0);
-	    glEnd ();
-	}
-	else
-	{
-	    glCullFace (GL_BACK);
-	    glLoadIdentity ();
-	    glTranslatef (0.0, 0.0, -DEFAULT_Z_CAMERA);
-
-	    glBegin (GL_QUADS);
-	    glColor4f (0.0, 0.0, 0.0, 1.0 * expoCam);
-	    glVertex2f (-0.5, -0.5);
-	    glVertex2f (0.5, -0.5);
-	    glColor4f (0.0, 0.0, 0.0, 0.5 * expoCam);
-	    glVertex2f (0.5, 0.0);
-	    glVertex2f (-0.5, 0.0);
-	    glColor4f (0.0, 0.0, 0.0, 0.5 * expoCam);
-	    glVertex2f (-0.5, 0.0);
-	    glVertex2f (0.5, 0.0);
-	    glColor4f (0.0, 0.0, 0.0, 0.0);
-	    glVertex2f (0.5, 0.5);
-	    glVertex2f (-0.5, 0.5);
-	    glEnd ();
-	}
-	glCullFace (GL_BACK);
-
-	glLoadIdentity ();
-	glTranslatef (0.0, 0.0, -DEFAULT_Z_CAMERA);
-
-	if (optionGetGroundSize () > 0.0)
-	{
-	    glBegin (GL_QUADS);
-	    glColor4usv (optionGetGroundColor1 ());
-	    glVertex2f (-0.5, -0.5);
-	    glVertex2f (0.5, -0.5);
-	    glColor4usv (optionGetGroundColor2 ());
-	    glVertex2f (0.5, -0.5 + optionGetGroundSize ());
-	    glVertex2f (-0.5, -0.5 + optionGetGroundSize ());
-	    glEnd ();
-	}
-
-	glColor4usv (defaultColor);
-
-	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-	glDisable (GL_BLEND);
-	glPopMatrix ();
-    }
-
-    expoActive = false;
-
-    cScreen->setWindowPaintOffset (0, 0);
-
-    gScreen->glPaintTransformedOutputSetCurrentIndex (glPaintTransformedOutputIndex);
-    gScreen->setTextureFilter (oldFilter);
-}
-
-bool
-ExpoScreen::glPaintOutput (const GLScreenPaintAttrib& attrib,
-			   const GLMatrix&            transform,
-			   const CompRegion&          region,
-			   CompOutput                 *output,
-			   unsigned int               mask)
-{
-    if (expoCam > 0.0)
-	mask |= PAINT_SCREEN_TRANSFORMED_MASK | PAINT_SCREEN_CLEAR_MASK;
-
-    return gScreen->glPaintOutput (attrib, transform, region, output, mask);
-}
-
-void
-ExpoScreen::glPaintTransformedOutput (const GLScreenPaintAttrib& attrib,
-				      const GLMatrix&            transform,
-				      const CompRegion&          region,
-				      CompOutput                 *output,
-				      unsigned int               mask)
-{
-    expoActive = false;
-
-    if (expoCam > 0)
-	mask |= PAINT_SCREEN_CLEAR_MASK;
-
-    if (expoCam <= 0 || (expoCam > 0.0 && expoCam < 1.0 &&
-			 optionGetExpoAnimation () != ExpoAnimationZoom))
-    {
-	gScreen->glPaintTransformedOutput (attrib, transform, region,
-					   output, mask);
-    }
-    else
-    {
-	gScreen->clearOutput (output, GL_COLOR_BUFFER_BIT);
-    }
-
-    mask &= ~PAINT_SCREEN_CLEAR_MASK;
-
-    if (expoCam > 0.0)
-    {
-	if (optionGetReflection ())
-	    paintWall (attrib, transform, region, output, mask, true);
-
-	paintWall (attrib, transform, region, output, mask, false);
-	anyClick = false;
-    }
-}
-
-bool
-ExpoWindow::glDraw (const GLMatrix&     transform,
-		    GLFragment::Attrib& fragment,
-		    const CompRegion&   region,
-		    unsigned int        mask)
-{
-    if (eScreen->expoCam == 0.0f)
-	return gWindow->glDraw (transform, fragment, region, mask);
-
-    GLFragment::Attrib fA (fragment);
-    int                expoAnimation;
-
-    expoAnimation = eScreen->optionGetExpoAnimation ();
-
-    if (eScreen->expoActive)
-    {
-	if (expoAnimation != ExpoScreen::ExpoAnimationZoom)
-	    fA.setOpacity (fragment.getOpacity () * eScreen->expoCam);
-
-	if (window->wmType () & CompWindowTypeDockMask &&
-	    eScreen->optionGetHideDocks ())
-	{
-	    if (expoAnimation == ExpoScreen::ExpoAnimationZoom &&
-		eScreen->paintingVp == eScreen->selectedVp)
-	    {
-		fA.setOpacity (fragment.getOpacity () *
-			       (1 - sigmoidProgress (eScreen->expoCam)));
-	    }
-	    else
-	    {
-		fA.setOpacity (0);
-	    }
-	}
-
-	fA.setBrightness (fragment.getBrightness () * eScreen->vpBrightness);
-	fA.setSaturation (fragment.getSaturation () * eScreen->vpSaturation);
-    }
-    else
-    {
-	if (expoAnimation == ExpoScreen::ExpoAnimationZoom)
-	    fA.setBrightness (0);
-	else
-	    fA.setBrightness (fragment.getBrightness () *
-			      (1 - sigmoidProgress (eScreen->expoCam)));
-    }
-
-    return gWindow->glDraw (transform, fA, region, mask);
-}
-
-#define EXPO_GRID_SIZE 100
-
-void
-ExpoWindow::glAddGeometry (const GLTexture::MatrixList& matrices,
-			   const CompRegion&            region,
-			   const CompRegion&            clip,
-			   unsigned int                 maxGridWidth,
-			   unsigned int                 maxGridHeight)
-{
-    if (eScreen->expoCam > 0.0        &&
-	screen->desktopWindowCount () &&
-	eScreen->optionGetDeform () == ExpoScreen::DeformCurve)
-    {
-	int         i, oldVCount = gWindow->geometry ().vCount;
-	GLfloat     *v;
-	CompPoint   offset;
-	float       lastX, lastZ = 0.0;
-	const float radSquare = pow (eScreen->curveDistance, 2) + 0.25;
-	float       ang;
-
-	gWindow->glAddGeometry (matrices, region, clip,
-				MIN(maxGridWidth , EXPO_GRID_SIZE),
-				maxGridHeight);
-
-	v  = gWindow->geometry ().vertices;
-	v += gWindow->geometry ().vertexStride - 3;
-	v += gWindow->geometry ().vertexStride * oldVCount;
-
-	if (!window->onAllViewports ())
-	{
-	    offset = eScreen->cScreen->windowPaintOffset ();
-	    offset = window->getMovementForOffset (offset);
-	}
-
-	lastX = -1000000000.0;
-
-	for (i = oldVCount; i < gWindow->geometry ().vCount; i++)
-	{
-	    if (v[0] == lastX)
-	    {
-		v[2] = lastZ;
-	    }
-	    else if (v[0] + offset.x () >= -EXPO_GRID_SIZE &&
-		     v[0] + offset.x () < screen->width () + EXPO_GRID_SIZE)
-	    {
-		ang = (((v[0] + offset.x ()) / (float) screen->width ()) - 0.5);
-		ang *= ang;
-		if (ang < radSquare)
-		{
-		    v[2] = eScreen->curveDistance - sqrt (radSquare - ang);
-		    v[2] *= sigmoidProgress (eScreen->expoCam);
-		}
-	    }
-
-	    lastX = v[0];
-	    lastZ = v[2];
-
-	    v += gWindow->geometry ().vertexStride;
-	}
-    }
-    else
-    {
-	gWindow->glAddGeometry (matrices, region, clip, maxGridWidth, maxGridHeight);
-    }
-}
-
-void
-ExpoWindow::glDrawTexture (GLTexture           *texture,
-			   GLFragment::Attrib& attrib,
-			   unsigned int        mask)
-{
-    if (eScreen->expoCam > 0.0                                 &&
-	eScreen->optionGetDeform () == ExpoScreen::DeformCurve &&
-	eScreen->gScreen->lighting ()                          &&
-	screen->desktopWindowCount ())
-    {
-	unsigned int i, idx, vCount;
-	CompPoint    offset;
-	float        x;
-	GLfloat      *v;
-
-	vCount = gWindow->geometry ().vCount;
-
-	if (eScreen->winNormals.size () < vCount * 3)
-	    eScreen->winNormals.resize (vCount * 3);
-
-	if (!window->onAllViewports ())
-	{
-	    offset = eScreen->cScreen->windowPaintOffset ();
-	    offset = window->getMovementForOffset (offset);
-	}
-
-	v = gWindow->geometry ().vertices +
-	    (gWindow->geometry ().vertexStride - 3);
-
-	for (i = 0; i < vCount; i++)
-	{
-	    x = (float) (v[0] + offset.x () - screen->width () / 2) *
-		        eScreen->curveAngle / screen->width ();
-
-	    while (x < 0)
-		x += 360.0;
-
-	    idx = floor (x);
-
-	    eScreen->winNormals[i * 3] = -eScreen->vpNormals[idx * 3];
-	    eScreen->winNormals[(i * 3) + 1] =
-		eScreen->vpNormals[(idx * 3) + 1];
-	    eScreen->winNormals[(i * 3) + 2] =
-		eScreen->vpNormals[(idx * 3) + 2];
-
-	    v += gWindow->geometry ().vertexStride;
-	}
-
-	glEnable (GL_NORMALIZE);
-	glNormalPointer (GL_FLOAT,0, &eScreen->winNormals.at (0));
-
-	glEnableClientState (GL_NORMAL_ARRAY);
-
-	gWindow->glDrawTexture (texture, attrib, mask);
-
-	glDisable (GL_NORMALIZE);
-	glDisableClientState (GL_NORMAL_ARRAY);
-	glNormal3f (0.0, 0.0, -1.0);
-    }
-    else
-    {
-	glEnable (GL_NORMALIZE);
-	gWindow->glDrawTexture (texture, attrib, mask);
-	glDisable (GL_NORMALIZE);
-    }
-}
-
-bool
-ExpoWindow::glPaint (const GLWindowPaintAttrib& attrib,
-		     const GLMatrix&            transform,
-		     const CompRegion&          region,
-		     unsigned int               mask)
-{
-    if (eScreen->expoActive)
-    {
-	float opacity = 1.0;
-	bool  hide;
-	bool  zoomAnim;
-
-	zoomAnim = eScreen->optionGetExpoAnimation () ==
-	           ExpoScreen::ExpoAnimationZoom;
-	hide     = eScreen->optionGetHideDocks () &&
-	           (window->wmType () & CompWindowTypeDockMask);
-
-	if (eScreen->expoCam > 0.0)
-	{
-	    if (eScreen->expoCam < 1.0 && !zoomAnim)
-		mask |= PAINT_WINDOW_TRANSLUCENT_MASK;
-	    else if (hide)
-		mask |= PAINT_WINDOW_TRANSLUCENT_MASK;
-	}
-
-	if (!zoomAnim)
-	    opacity = attrib.opacity * eScreen->expoCam;
-
-	if (hide)
-	{
-	    if (zoomAnim && eScreen->paintingVp == eScreen->selectedVp)
-		opacity = attrib.opacity *
-			  (1 - sigmoidProgress (eScreen->expoCam));
-	    else
-		opacity = 0;
-	}
-
-	if (opacity <= 0)
-	    mask |= PAINT_WINDOW_NO_CORE_INSTANCE_MASK;
-    }
-
-    return gWindow->glPaint (attrib, transform, region, mask);
-}
-
-bool
-ExpoWindow::damageRect (bool            initial,
-			const CompRect& rect)
-{
-    if (eScreen->expoCam > 0.0f)
-	eScreen->cScreen->damageScreen ();
-
-    return cWindow->damageRect (initial, rect);
-}
-
-#define EXPOINITBIND(opt, func)                                \
-    optionSet##opt##Initiate (boost::bind (&ExpoScreen::func,  \
-					   this, _1, _2, _3));
-#define EXPOTERMBIND(opt, func)                                \
-    optionSet##opt##Terminate (boost::bind (&ExpoScreen::func, \
-					    this, _1, _2, _3));
-
-ExpoScreen::ExpoScreen (CompScreen *s) :
-    PluginClassHandler<ExpoScreen, CompScreen> (s),
-    ExpoOptions (),
-    cScreen (CompositeScreen::get (s)),
-    gScreen (GLScreen::get (s)),
-    expoCam (0.0f),
-    expoActive (false),
-    expoMode (false),
-    dndState (DnDNone),
-    dndWindow (NULL),
-    origVp (s->vp ()),
-    selectedVp (s->vp ()),
-    lastSelectedVp (s->vp ()),
-    vpUpdateMode (VPUpdateNone),
-    clickTime (0),
-    doubleClick (false),
-    vpNormals (360 * 3),
-    grabIndex (0)
-{
-    leftKey  = XKeysymToKeycode (s->dpy (), XStringToKeysym ("Left"));
-    rightKey = XKeysymToKeycode (s->dpy (), XStringToKeysym ("Right"));
-    upKey    = XKeysymToKeycode (s->dpy (), XStringToKeysym ("Up"));
-    downKey  = XKeysymToKeycode (s->dpy (), XStringToKeysym ("Down"));
-
-    EXPOINITBIND (ExpoKey, doExpo);
-    EXPOTERMBIND (ExpoKey, termExpo);
-    EXPOINITBIND (ExpoButton, doExpo);
-    EXPOTERMBIND (ExpoButton, termExpo);
-    EXPOINITBIND (ExpoEdge, doExpo);
-    EXPOTERMBIND (ExpoButton, termExpo);
-
-    EXPOINITBIND (DndButton, dndInit);
-    EXPOTERMBIND (DndButton, dndFini);
-    EXPOINITBIND (ExitButton, exitExpo);
-    EXPOINITBIND (NextVpButton, nextVp);
-    EXPOINITBIND (PrevVpButton, prevVp);
-
-    ScreenInterface::setHandler (screen, false);
-    CompositeScreenInterface::setHandler (cScreen, false);
-    GLScreenInterface::setHandler (gScreen, false);
-}
-
-ExpoWindow::ExpoWindow (CompWindow *w) :
-    PluginClassHandler<ExpoWindow, CompWindow> (w),
-    window (w),
-    cWindow (CompositeWindow::get (w)),
-    gWindow (GLWindow::get (w)),
-    eScreen (ExpoScreen::get (screen))
-{
-    CompositeWindowInterface::setHandler (cWindow, false);
-    GLWindowInterface::setHandler (gWindow, false);
-}
-
-bool
-ExpoPluginVTable::init ()
-{
-    if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
-	!CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
-	!CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
-	return false;
-
-    return true;
-}
-
-

=== removed file '.pc/expo.patch/expo/src/expo.h'
--- .pc/expo.patch/expo/src/expo.h	2012-02-13 15:30:29 +0000
+++ .pc/expo.patch/expo/src/expo.h	1970-01-01 00:00:00 +0000
@@ -1,163 +0,0 @@
-/**
- *
- * Compiz expo plugin
- *
- * expo.c
- *
- * Copyright (c) 2008 Dennis Kasprzyk <[e-mail]>
- * Copyright (c) 2006 Robert Carr <[e-mail]>
- *
- * Authors:
- * Robert Carr <[e-mail]>
- * Dennis Kasprzyk <[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.
- *
- **/
-
-#include <core/core.h>
-#include <core/pluginclasshandler.h>
-
-#include <composite/composite.h>
-#include <opengl/opengl.h>
-
-#include "expo_options.h"
-
-class ExpoScreen :
-    public ScreenInterface,
-    public CompositeScreenInterface,
-    public GLScreenInterface,
-    public PluginClassHandler<ExpoScreen, CompScreen>,
-    public ExpoOptions
-{
-    public:
-	ExpoScreen (CompScreen *);
-
-	void handleEvent (XEvent *);
-
-	void preparePaint (int);
-	void paint (CompOutput::ptrList&, unsigned int);
-	void donePaint ();
-
-	bool glPaintOutput (const GLScreenPaintAttrib&, const GLMatrix&,
-			    const CompRegion&, CompOutput *, unsigned int);
-	void glPaintTransformedOutput (const GLScreenPaintAttrib&,
-				       const GLMatrix&, const CompRegion&,
-				       CompOutput *, unsigned int);
-
-	bool dndInit (CompAction *, CompAction::State, CompOption::Vector&);
-	bool dndFini (CompAction *, CompAction::State, CompOption::Vector&);
-	bool doExpo (CompAction *, CompAction::State, CompOption::Vector&);
-	bool exitExpo (CompAction *, CompAction::State, CompOption::Vector&);
-	bool termExpo (CompAction *, CompAction::State, CompOption::Vector&);
-	bool nextVp (CompAction *, CompAction::State, CompOption::Vector&);
-	bool prevVp (CompAction *, CompAction::State, CompOption::Vector&);
-
-	typedef enum {
-	    DnDNone,
-	    DnDDuring,
-	    DnDStart
-	} DnDState;
-
-	typedef enum {
-	    VPUpdateNone,
-	    VPUpdateMouseOver,
-	    VPUpdatePrevious
-	} VPUpdateMode;
-
-	CompositeScreen *cScreen;
-	GLScreen        *gScreen;
-
-	float expoCam;
-	bool  expoActive;
-	bool  expoMode;
-
-	DnDState   dndState;
-	CompWindow *dndWindow;
-
-	CompPoint prevCursor;
-	CompPoint newCursor;
-
-	CompPoint origVp;
-	CompPoint selectedVp;
-	CompPoint lastSelectedVp;
-	CompPoint paintingVp;
-
-	std::vector<float> vpActivity;
-	float              vpBrightness;
-	float              vpSaturation;
-
-	VPUpdateMode vpUpdateMode;
-
-	bool         anyClick;
-	unsigned int clickTime;
-	bool         doubleClick;
-
-	CompRegion tmpRegion;
-
-	float curveAngle;
-	float curveDistance;
-	float curveRadius;
-
-	std::vector<GLfloat> vpNormals;
-	std::vector<GLfloat> winNormals;
-
-	CompScreen::GrabHandle grabIndex;
-
-    private:
-	void moveFocusViewport (int, int);
-	void finishWindowMovement ();
-	void updateWraps (bool);
-
-	void invertTransformedVertex (const GLScreenPaintAttrib&,
-				      const GLMatrix&, CompOutput *, int[2]);
-	void paintWall (const GLScreenPaintAttrib&, const GLMatrix&,
-			const CompRegion&, CompOutput *, unsigned int, bool);
-
-	KeyCode leftKey;
-	KeyCode rightKey;
-	KeyCode upKey;
-	KeyCode downKey;
-};
-
-class ExpoWindow :
-    public CompositeWindowInterface,
-    public GLWindowInterface,
-    public PluginClassHandler<ExpoWindow, CompWindow>
-{
-    public:
-	ExpoWindow (CompWindow *);
-
-	bool damageRect (bool, const CompRect&);
-
-	bool glDraw (const GLMatrix&, GLFragment::Attrib&,
-		     const CompRegion&, unsigned int);
-	bool glPaint (const GLWindowPaintAttrib&, const GLMatrix&,
-		      const CompRegion&, unsigned int);
-	void glAddGeometry (const GLTexture::MatrixList&,
-			    const CompRegion&, const CompRegion&,
-			    unsigned int, unsigned int);
-	void glDrawTexture (GLTexture *, GLFragment::Attrib& attrib,
-			    unsigned int);
-
-	CompWindow      *window;
-	CompositeWindow *cWindow;
-	GLWindow        *gWindow;
-	ExpoScreen      *eScreen;
-};
-
-class ExpoPluginVTable :
-    public CompPlugin::VTableForScreenAndWindow<ExpoScreen, ExpoWindow>
-{
-    public:
-	bool init ();
-};
-

=== removed file '.pc/expo.patch/expo/src/glow.cpp'
=== removed file '.pc/expo.patch/expo/src/glow.h'
=== removed file '.pc/expo.patch/expo/src/group_glow.h'
=== removed file '.pc/expo.patch/glow.cpp'
=== removed file '.pc/expo.patch/glow.h'
=== removed file '.pc/expo.patch/group_glow.h'
=== removed directory '.pc/expo_api_931927.patch'
=== removed directory '.pc/expo_api_931927.patch/expo'
=== removed directory '.pc/expo_api_931927.patch/expo/src'
=== removed file '.pc/expo_api_931927.patch/expo/src/expo.cpp'
--- .pc/expo_api_931927.patch/expo/src/expo.cpp	2012-02-16 15:14:05 +0000
+++ .pc/expo_api_931927.patch/expo/src/expo.cpp	1970-01-01 00:00:00 +0000
@@ -1,1692 +0,0 @@
-/**
- *
- * Compiz expo plugin
- *
- * expo.c
- *
- * Copyright (c) 2008 Dennis Kasprzyk <[e-mail]>
- * Copyright (c) 2006 Robert Carr <[e-mail]>
- *
- * Authors:
- * Robert Carr <[e-mail]>
- * Dennis Kasprzyk <[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.
- *
- **/
-
-#include "expo.h"
-#include <math.h>
-#include <GL/glu.h>
-#include <X11/cursorfont.h>
-
-COMPIZ_PLUGIN_20090315 (expo, ExpoPluginVTable);
-
-#define sigmoid(x) (1.0f / (1.0f + exp (-5.5f * 2 * ((x) - 0.5))))
-#define sigmoidProgress(x) ((sigmoid (x) - sigmoid (0)) / \
-			    (sigmoid (1) - sigmoid (0)))
-
-#define interpolate(a, b, val) (((val) * (a)) + ((1 - (val)) * (b)))
-
-bool
-ExpoScreen::dndInit (CompAction          *action,
-		     CompAction::State   state,
-		     CompOption::Vector& options)
-{
-    Window xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid != screen->root ())
-	return false;
-
-    if (expoMode)
-    {
-	dndState = DnDStart;
-	action->setState (action->state () | CompAction::StateTermButton);
-	cScreen->damageScreen ();
-
-	return true;
-    }
-
-    return false;
-}
-
-bool
-ExpoScreen::dndFini (CompAction          *action,
-		     CompAction::State   state,
-		     CompOption::Vector& options)
-{
-    Window xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid != screen->root ())
-	return false;
-
-    if (dndState == DnDDuring || dndState == DnDStart)
-    {
-	if (dndWindows.size ())
-	    finishWindowMovement ();
-
-	dndState  = DnDNone;
-
-	action->setState (action->state () & CompAction::StateInitButton);
-	cScreen->damageScreen ();
-
-	return true;
-    }
-
-    return false;
-}
-
-bool
-ExpoScreen::doExpo (CompAction          *action,
-		    CompAction::State   state,
-		    CompOption::Vector& options)
-{
-    Window xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid != screen->root ())
-	return false;
-
-    if (screen->otherGrabExist ("expo", NULL))
-	return false;
-
-    if (!expoMode)
-    {
-	if (!grabIndex)
-	    grabIndex = screen->pushGrab (None, "expo");
-
-	updateWraps (true);
-
-	expoMode    = true;
-	anyClick    = false;
-	doubleClick = false;
-	clickTime   = 0;
-
-	dndState  = DnDNone;
-
-	selectedVp = screen->vp ();
-	origVp     = screen->vp ();
-
-	screen->addAction (&optionGetDndButton ());
-	screen->addAction (&optionGetExitButton ());
-	screen->addAction (&optionGetNextVpButton ());
-	screen->addAction (&optionGetPrevVpButton ());
-
-	cScreen->damageScreen ();
-    }
-    else
-    {
-	termExpo (action, state, options);
-    }
-
-    return true;
-}
-
-bool
-ExpoScreen::termExpo (CompAction          *action,
-		      CompAction::State   state,
-		      CompOption::Vector& options)
-{
-    Window xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid && xid != screen->root ())
-	return false;
-
-    if (!expoMode)
-	return true;
-
-    expoMode = false;
-
-    if (dndState != DnDNone)
-	dndFini (action, state, options);
-
-    if (state & CompAction::StateCancel)
-	vpUpdateMode = VPUpdatePrevious;
-    else
-	vpUpdateMode = VPUpdateMouseOver;
-
-    screen->removeAction (&optionGetDndButton ());
-    screen->removeAction (&optionGetExitButton ());
-    screen->removeAction (&optionGetNextVpButton ());
-    screen->removeAction (&optionGetPrevVpButton ());
-
-    cScreen->damageScreen ();
-    screen->focusDefaultWindow ();
-
-    return true;
-}
-
-bool
-ExpoScreen::exitExpo (CompAction          *action,
-		      CompAction::State   state,
-		      CompOption::Vector& options)
-{
-    Window xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid != screen->root ())
-	return false;
-
-    if (!expoMode)
-	return false;
-
-    termExpo (action, 0, noOptions);
-    anyClick = true;
-    cScreen->damageScreen ();
-
-    return true;
-}
-
-bool
-ExpoScreen::nextVp (CompAction          *action,
-		    CompAction::State   state,
-		    CompOption::Vector& options)
-{
-    unsigned int newX, newY;
-    Window       xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid != screen->root ())
-	return false;
-
-    if (!expoMode)
-	return false;
-
-    newX = selectedVp.x () + 1;
-    newY = selectedVp.y ();
-
-    if (newX >= (unsigned int) screen->vpSize ().width ())
-    {
-	newX = 0;
-	newY = newY + 1;
-	if (newY >= (unsigned int) screen->vpSize ().height ())
-	    newY = 0;
-    }
-
-    moveFocusViewport (newX - selectedVp.x (),
-		       newY - selectedVp.y ());
-    cScreen->damageScreen ();
-
-    return true;
-}
-
-bool
-ExpoScreen::prevVp (CompAction          *action,
-		    CompAction::State   state,
-		    CompOption::Vector& options)
-{
-    unsigned int newX, newY;
-    Window       xid = CompOption::getIntOptionNamed (options, "root", 0);
-    if (xid != screen->root ())
-	return false;
-
-    if (!expoMode)
-	return false;
-
-    newX = selectedVp.x () - 1;
-    newY = selectedVp.y ();
-
-    if (newX < 0)
-    {
-	newX = screen->vpSize ().width () - 1;
-	newY = newY - 1;
-	if (newY < 0)
-	    newY = screen->vpSize ().height () - 1;
-    }
-
-    moveFocusViewport (newX - selectedVp.x (),
-		       newY - selectedVp.y ());
-    cScreen->damageScreen ();
-
-    return true;
-}
-
-void
-ExpoScreen::moveFocusViewport (int dx,
-			       int dy)
-{
-    int newX, newY;
-
-    newX = selectedVp.x () + dx;
-    newY = selectedVp.y () + dy;
-
-    newX = MAX (0, MIN ((int) screen->vpSize ().width () - 1, newX));
-    newY = MAX (0, MIN ((int) screen->vpSize ().height () - 1, newY));
-
-    selectedVp.set (newX, newY);
-    cScreen->damageScreen ();
-}
-
-void
-ExpoScreen::finishWindowMovement ()
-{
-    foreach (CompWindow *dndWindow, dndWindows)
-    {
-	if (dndWindow->grabbed ())
-	{
-	    dndWindow->syncPosition ();
-	    dndWindow->ungrabNotify ();
-
-	    screen->updateGrab (grabIndex, None);
-
-	    screen->moveViewport (screen->vp ().x () - selectedVp.x (),
-				  screen->vp ().y () - selectedVp.y (), true);
-
-	    /* update saved window attributes in case we moved the
-    window to a new viewport */
-	    if (dndWindow->saveMask () & CWX)
-	    {
-		dndWindow->saveWc ().x = dndWindow->saveWc ().x % screen->width ();
-		if (dndWindow->saveWc ().x < 0)
-		    dndWindow->saveWc ().x += screen->width ();
-	    }
-	    if (dndWindow->saveMask () & CWY)
-	    {
-		dndWindow->saveWc ().y = dndWindow->saveWc ().y % screen->height ();
-		if (dndWindow->saveWc ().y < 0)
-		    dndWindow->saveWc ().y += screen->height ();
-	    }
-
-	    /* update window attibutes to make sure a moved maximized window
-	   is properly snapped to the work area */
-	    if (dndWindow->state () & MAXIMIZE_STATE)
-		dndWindow->updateAttributes (CompStackingUpdateModeNone);
-	}
-    }
-}
-
-void
-ExpoScreen::handleEvent (XEvent *event)
-{
-    switch (event->type) {
-    case KeyPress:
-	if (expoMode && event->xkey.root == screen->root ())
-	{
-	    if (event->xkey.keycode == leftKey)
-		moveFocusViewport (-1, 0);
-	    else if (event->xkey.keycode == rightKey)
-		moveFocusViewport (1, 0);
-	    else if (event->xkey.keycode == upKey)
-		moveFocusViewport (0, -1);
-	    else if (event->xkey.keycode == downKey)
-		moveFocusViewport (0, 1);
-	}
-	break;
-
-    case ButtonPress:
-	if (expoMode && event->xbutton.button == Button1 &&
-	    event->xbutton.root == screen->root ())
-	{
-	    anyClick = true;
-	    if (clickTime == 0)
-	    {
-		clickTime = event->xbutton.time;
-	    }
-	    else if (event->xbutton.time - clickTime <=
-		     (unsigned int) optionGetDoubleClickTime ())
-	    {
-		doubleClick = true;
-	    }
-	    else
-	    {
-		clickTime   = event->xbutton.time;
-		doubleClick = false;
-	    }
-	    cScreen->damageScreen ();
-	}
-	break;
-
-    case ButtonRelease:
-	if (expoMode && event->xbutton.button == Button1 &&
-	    event->xbutton.root == screen->root ())
-	{
-	    if (event->xbutton.time - clickTime >
-		(unsigned int) optionGetDoubleClickTime ())
-	    {
-		clickTime   = 0;
-		doubleClick = false;
-	    }
-	    else if (doubleClick)
-	    {
-		CompAction& action = optionGetExpoKey ();
-
-		clickTime   = 0;
-		doubleClick = false;
-
-		termExpo (&action, 0, noOptions);
-		anyClick = true;
-	    }
-	}
-	break;
-    }
-
-    screen->handleEvent (event);
-}
-
-bool
-ExpoScreen::windowsOnVp (CompPoint &p)
-{
-    foreach (CompWindow *w, screen->clientList (true))
-    {
-	CompPoint viewport;
-
-	screen->viewportForGeometry (w->geometry (), viewport);
-
-	if (viewport == p&&
-	    w->type () != CompWindowTypeDesktopMask &&
-	    w->type () != CompWindowTypeDockMask)
-	{
-	    return true;
-	}
-    }
-
-    return false;
-}
-
-void
-ExpoScreen::preparePaint (int msSinceLastPaint)
-{
-    float val = ((float) msSinceLastPaint / 1000.0) / optionGetZoomTime ();
-
-    if (expoMode)
-	expoCam = MIN (1.0, expoCam + val);
-    else
-	expoCam = MAX (0.0, expoCam - val);
-
-    if (dndState == DnDDuring)
-    {
-	foreach (CompWindow *w, dndWindows)
-	    ExpoWindow::get (w)->dndOpacity = MIN (1.0, ExpoWindow::get (w)->dndOpacity + val);
-    }
-    else if (dndState == DnDNone)
-    {
-	CompWindowList::iterator it = dndWindows.begin ();
-
-	while (it != dndWindows.end ())
-	{
-	    ExpoWindow::get ((*it))->dndOpacity = MAX (0.0, ExpoWindow::get ((*it))->dndOpacity - val);
-
-	    if (ExpoWindow::get ((*it))->dndOpacity <= 0.0f)
-	    {
-		dndWindows.erase (it);
-		it = dndWindows.begin ();
-	    }
-	    else
-		it++;
-	}
-    }
-
-    if (expoCam)
-    {
-	unsigned int i, j, vp;
-	unsigned int vpCount = screen->vpSize ().width () *
-	                       screen->vpSize ().height ();
-
-	if (vpActivity.size () < vpCount)
-	{
-	    vpActivity.resize (vpCount);
-	    foreach (float& activity, vpActivity)
-		activity = 1.0f;
-	}
-
-	for (i = 0; i < (unsigned int) screen->vpSize ().width (); i++)
-	{
-	    for (j = 0; j < (unsigned int) screen->vpSize ().height (); j++)
-	    {
-		vp = (j * screen->vpSize ().width ()) + i;
-		CompPoint vpPos = CompPoint (i, j);
-
-		if (windowsOnVp (vpPos))
-		    vpActivity[vp] = MIN (1.0, vpActivity[vp] + val);
-		else
-		    vpActivity[vp] = MAX (0.0, vpActivity[vp] - val);
-	    }
-	}
-
-	for (i = 0; i < 360; i++)
-	{
-	    float fi = (float) i;
-
-	    vpNormals[i * 3] = (-sin (fi * (M_PI / 180.0f)) / screen->width ()) *
-			       expoCam;
-	    vpNormals[(i * 3) + 1] = 0.0;
-	    vpNormals[(i * 3) + 2] = (-cos (fi * (M_PI / 180.0f)) * expoCam) -
-		                     (1 - expoCam);
-	}
-    }
-
-    cScreen->preparePaint (msSinceLastPaint);
-}
-
-void
-ExpoScreen::updateWraps (bool enable)
-{
-    screen->handleEventSetEnabled (this, enable);
-    cScreen->preparePaintSetEnabled (this, enable);
-    cScreen->paintSetEnabled (this, enable);
-    cScreen->donePaintSetEnabled (this, enable);
-    gScreen->glPaintOutputSetEnabled (this, enable);
-    gScreen->glPaintTransformedOutputSetEnabled (this, enable);
-
-    foreach (CompWindow *w, screen->windows ())
-    {
-	ExpoWindow *ew = ExpoWindow::get (w);
-
-	ew->cWindow->damageRectSetEnabled (ew, enable);
-	ew->gWindow->glPaintSetEnabled (ew, enable);
-	ew->gWindow->glDrawSetEnabled (ew, enable);
-	ew->gWindow->glAddGeometrySetEnabled (ew, enable);
-	ew->gWindow->glDrawTextureSetEnabled (ew, enable);
-    }
-}
-
-void
-ExpoScreen::paint (CompOutput::ptrList& outputs,
-		   unsigned int         mask)
-{
-    int width = outputs.front ()->width ();
-    int height = outputs.front ()->height ();
-    bool sizeDiff = false;
-
-    /* "One big wall" does not make sense where outputs are different
-     * sizes, so force multiple walls in this case
-     *
-     * TODO: Is it possible to re-create "one big wall" using
-     * independent output painting in this case? */
-
-    foreach (CompOutput *o, outputs)
-    {
-	if (o->width () != width || o->height () != height)
-	{
-	    sizeDiff = true;
-	    break;
-	}
-    }
-
-    if (expoCam > 0.0 && outputs.size () > 1 &&
-        optionGetMultioutputMode () == MultioutputModeOneBigWall &&
-	!sizeDiff)
-    {
-	outputs.clear ();
-	outputs.push_back (&screen->fullscreenOutput ());
-    }
-
-    cScreen->paint (outputs, mask);
-}
-
-void
-ExpoScreen::donePaint ()
-{
-    switch (vpUpdateMode) {
-    case VPUpdateMouseOver:
-	screen->moveViewport (screen->vp ().x () - selectedVp.x (),
-			      screen->vp ().y () - selectedVp.y (), true);
-	screen->focusDefaultWindow ();
-	vpUpdateMode = VPUpdateNone;
-	break;
-    case VPUpdatePrevious:
-	screen->moveViewport (screen->vp ().x () - origVp.x (),
-			      screen->vp ().y () - origVp.y (), true);
-	selectedVp = origVp;
-	screen->focusDefaultWindow ();
-	vpUpdateMode = VPUpdateNone;
-	break;
-    default:
-	break;
-    }
-
-    if ((expoCam > 0.0f && expoCam < 1.0f) || dndState != DnDNone)
-	cScreen->damageScreen ();
-
-    if (expoCam == 1.0f)
-    {
-	foreach (float& vp, vpActivity)
-	    if (vp != 0.0 && vp != 1.0)
-		cScreen->damageScreen ();
-
-	foreach (CompWindow *w, dndWindows)
-	    if (ExpoWindow::get (w)->dndOpacity != 0.0f &&
-		ExpoWindow::get (w)->dndOpacity != 1.0f)
-		cScreen->damageScreen ();
-    }
-
-    if (grabIndex && expoCam <= 0.0f && !expoMode)
-    {
-	screen->removeGrab (grabIndex, NULL);
-	grabIndex = 0;
-	updateWraps (false);
-    }
-
-    cScreen->donePaint ();
-
-    switch (dndState) {
-    case DnDDuring:
-	{
-	    if (dndWindows.size ())
-	    {
-		foreach (CompWindow *dndWindow, dndWindows)
-		{
-		    if (dndWindow->grabbed ())
-		    {
-			dndWindow->move (newCursor.x () - prevCursor.x (),
-					 newCursor.y () - prevCursor.y (),
-					 optionGetExpoImmediateMove ());
-		    }
-		}
-	    }
-
-	    prevCursor = newCursor;
-	    cScreen->damageScreen ();
-	}
-	break;
-
-    case DnDStart:
-	{
-	    int                              xOffset, yOffset;
-	    CompWindowList::reverse_iterator iter;
-
-	    xOffset = screen->vpSize ().width () * screen->width ();
-	    yOffset = screen->vpSize ().height () * screen->height ();
-
-	    dndState = DnDNone;
-
-	    for (iter = screen->windows ().rbegin ();
-		 iter != screen->windows ().rend (); ++iter)
-	    {
-		CompWindow *w = *iter;
-		CompRect   input (w->inputRect ());
-		bool       inWindow;
-		int        nx, ny;
-
-		if (w->destroyed ())
-		    continue;
-
-		if (!w->shaded () && !w->isViewable ())
-		    continue;
-
-		if (w->onAllViewports ())
-		{
-		    nx = (newCursor.x () + xOffset) % screen->width ();
-		    ny = (newCursor.y () + yOffset) % screen->height ();
-		}
-		else
-		{
-		    nx = newCursor.x () -
-			 (screen->vp ().x () * screen->width ());
-		    ny = newCursor.y () -
-			 (screen->vp ().y () * screen->height ());
-		}
-
-		inWindow = (nx >= input.left () && nx <= input.right ()) ||
-			   (nx >= (input.left () + xOffset) &&
-			    nx <= (input.right () + xOffset));
-
-		inWindow &= (ny >= input.top () && ny <= input.bottom ()) ||
-			    (ny >= (input.top () + yOffset) &&
-			     ny <= (input.bottom () + yOffset));
-
-		if (!inWindow)
-		    continue;
-
-		/* make sure we never move windows we're not allowed to move */
-		if (!w->managed ())
-		    break;
-		else if (!(w->actions () & CompWindowActionMoveMask))
-		    break;
-		else if (w->type () & (CompWindowTypeDockMask |
-				       CompWindowTypeDesktopMask))
-		    break;
-
-		dndState  = DnDDuring;
-		dndWindows.push_back (w);
-
-		w->grabNotify (nx, ny, 0,
-			       CompWindowGrabMoveMask |
-			       CompWindowGrabButtonMask);
-
-		screen->updateGrab (grabIndex, mMoveCursor);
-
-		w->raise ();
-		w->moveInputFocusTo ();
-		break;
-	    }
-
-	    prevCursor = newCursor;
-	}
-	break;
-    default:
-	break;
-    }
-}
-
-void
-ExpoScreen::invertTransformedVertex (const GLScreenPaintAttrib& attrib,
-				     const GLMatrix&            transform,
-				     CompOutput                 *output,
-				     int                        vertex[2])
-{
-    GLMatrix sTransform (transform);
-    GLdouble p1[3], p2[3], v[3], alpha;
-    GLdouble mvm[16], pm[16];
-    GLint    viewport[4];
-    int      i;
-
-    gScreen->glApplyTransform (attrib, output, &sTransform);
-    sTransform.toScreenSpace (output, -attrib.zTranslate);
-
-    glGetIntegerv (GL_VIEWPORT, viewport);
-    for (i = 0; i < 16; i++)
-    {
-	mvm[i] = sTransform[i];
-	pm[i]  = gScreen->projectionMatrix ()[i];
-    }
-
-    gluUnProject (vertex[0], screen->height () - vertex[1], 0, mvm, pm,
-		  viewport, &p1[0], &p1[1], &p1[2]);
-    gluUnProject (vertex[0], screen->height () - vertex[1], -1.0, mvm, pm,
-		  viewport, &p2[0], &p2[1], &p2[2]);
-
-    for (i = 0; i < 3; i++)
-	v[i] = p1[i] - p2[i];
-
-    alpha = -p1[2] / v[2];
-
-    if (optionGetDeform () == DeformCurve && screen->desktopWindowCount ())
-    {
-	const float sws = screen->width () * screen->width ();
-	const float rs = (curveDistance * curveDistance) + 0.25;
-	const float p = ((2.0 * sws * (p1[2] - curveDistance) * v[2]) +
-			 (2.0 * p1[0] * v[0]) -
-			 (v[0] * (float) screen->width ())) /
-	                ((v[2] * v[2] * sws) + (v[0] * v[0]));
-	const float q = (-(sws * rs) + (sws * (p1[2] - curveDistance) *
-					(p1[2] - curveDistance)) +
-			 (0.25 * sws) + (p1[0] * p1[0]) -
-			 (p1[0] * (float) screen->width ())) /
-	                ((v[2] * v[2] * sws) + (v[0] * v[0]));
-
-	const float rq = (0.25 * p * p) - q;
-	const float ph = -p * 0.5;
-
-	if (rq < 0.0)
-	{
-	    vertex[0] = -1000;
-	    vertex[1] = -1000;
-	    return;
-	}
-	else
-	{
-	    alpha = ph + sqrt(rq);
-	    if (p1[2] + (alpha * v[2]) > 0.0)
-	    {
-		vertex[0] = -1000;
-		vertex[1] = -1000;
-		return;
-	    }
-	}
-    }
-
-    vertex[0] = ceil (p1[0] + (alpha * v[0]));
-    vertex[1] = ceil (p1[1] + (alpha * v[1]));
-}
-
-void
-ExpoScreen::paintViewport (const GLScreenPaintAttrib& attrib,
-			   const GLMatrix&            transform,
-			   const CompRegion&          region,
-			   CompOutput                 *output,
-			   unsigned int               mask,
-			   CompPoint                  vpPos,
-			   GLVector                   &vpCamPos,
-			   bool                       reflection)
-{
-    GLMatrix     sTransform (transform);
-    GLMatrix     sTransform2, sTransform3;
-    float        sx = (float) screen->width () / output->width ();
-    float        sy = (float) screen->height () / output->height ();
-    float        vpp;
-    float        progress = sigmoidProgress (expoCam);
-    unsigned int vp;
-    CompPoint    vpSize (screen->vpSize ().width (), screen->vpSize ().height ());
-
-    const float gapY = optionGetVpDistance () * 0.1f * expoCam;
-    const float gapX = optionGetVpDistance () * 0.1f * screen->height () /
-		       screen->width () * expoCam;
-
-    /* not sure this will work with different resolutions */
-    sTransform.translate (0.0, MAX (0, vpPos.y ()) * -(sy + gapY), 0.0f);
-
-    sTransform2 = sTransform;
-
-    /* not sure this will work with different resolutions */
-    if (optionGetDeform () != DeformCurve)
-	sTransform2.translate (MAX (0, vpPos.x ()) * (sx + gapX), 0.0f, 0.0);
-
-
-    if (optionGetExpoAnimation () == ExpoAnimationVortex)
-	sTransform2.rotate (360 * expoCam,
-			    0.0f, 1.0f, 2.0f * expoCam);
-
-    sTransform3 = sTransform2;
-
-    sTransform3.translate (output->x () / output->width (),
-			   -output->y () / output->height (), 0.0);
-
-    cScreen->setWindowPaintOffset ((screen->vp ().x () - vpPos.x ()) *
-				   screen->width (),
-				   (screen->vp ().y () - vpPos.y ()) *
-				   screen->height ());
-
-    vp = (vpPos.y () * vpSize.x ()) + vpPos.x ();
-
-    vpp = (expoCam * vpActivity[vp]) + (1 - expoCam);
-    vpp = sigmoidProgress (vpp);
-
-    vpBrightness = vpp + ((1.0 - vpp) *
-			  optionGetVpBrightness () / 100.0);
-    vpSaturation = vpp + ((1.0 - vpp) *
-			  optionGetVpSaturation () / 100.0);
-
-    paintingVp = vpPos;
-
-    if (optionGetDeform () == DeformCurve)
-    {
-	float rotateX;
-
-	sTransform3.translate (-vpCamPos[GLVector::x], 0.0f,
-			       curveDistance - DEFAULT_Z_CAMERA);
-
-	rotateX = -vpPos.x () + interpolate (((float) vpSize.x () / 2.0) - 0.5,
-				    screen->vp ().x (), progress);
-
-	sTransform3.rotate (curveAngle * rotateX, 0.0, 1.0, 0.0);
-
-	sTransform3.translate (vpCamPos[GLVector::x], 0.0f,
-			       DEFAULT_Z_CAMERA - curveDistance);
-    }
-
-    if (paintingDndWindow)
-	cScreen->getWindowPaintListSetEnabled (this, true);
-    gScreen->glPaintTransformedOutput (attrib, sTransform3,
-				       screen->region (), output,
-				       mask);
-
-    if (paintingDndWindow)
-	cScreen->getWindowPaintListSetEnabled (this, false);
-
-    if (!reflection && !paintingDndWindow)
-    {
-	int cursor[2] = { pointerX, pointerY };
-
-	invertTransformedVertex (attrib, sTransform3,
-				 output, cursor);
-
-	if ((cursor[0] > 0) && (cursor[0] < (int) screen->width ()) &&
-		(cursor[1] > 0) && (cursor[1] < (int) screen->height ()))
-	{
-	    newCursor.setX (vpPos.x () * screen->width () + cursor[0]);
-	    newCursor.setY (vpPos.y () * screen->height () + cursor[1]);
-
-	    if (anyClick || dndState != DnDNone)
-	    {
-		/* Used to save last viewport interaction was in */
-		selectedVp = vpPos;
-		anyClick = false;
-	    }
-	}
-    }
-
-    /* Calculate the current viewport size */
-    int tl[2] = { 0, 0 };
-    int br[2] = { screen->width (), screen->height () };
-
-    invertTransformedVertex (attrib, sTransform3, output, tl);
-    invertTransformedVertex (attrib, sTransform3, output, br);
-
-    viewport_size = CompSize (br[0] - tl[0], br[1] - tl[1]);
-
-    cScreen->setWindowPaintOffset (0, 0);
-}
-
-void
-ExpoScreen::paintWall (const GLScreenPaintAttrib& attrib,
-		       const GLMatrix&            transform,
-		       const CompRegion&          region,
-		       CompOutput                 *output,
-		       unsigned int               mask,
-		       bool                       reflection)
-{
-    GLMatrix sTransformW, sTransform (transform);
-    GLenum   oldFilter = gScreen->textureFilter ();
-    float        sx = (float) screen->width () / output->width ();
-    float        sy = (float) screen->height () / output->height ();
-    float     biasZ;
-    float     oScale, rotation = 0.0f, progress;
-    float     aspectX = 1.0f, aspectY = 1.0f;
-    GLVector  cam;
-    CompPoint vpSize (screen->vpSize ().width (), screen->vpSize ().height ());
-
-    /* amount of gap between viewports */
-    const float gapY = optionGetVpDistance () * 0.1f * expoCam;
-    const float gapX = optionGetVpDistance () * 0.1f * screen->height () /
-		       screen->width () * expoCam;
-
-    int      glPaintTransformedOutputIndex =
-	gScreen->glPaintTransformedOutputGetCurrentIndex ();
-
-    // Make sure that the base glPaintTransformedOutput function is called
-    gScreen->glPaintTransformedOutputSetCurrentIndex (MAXSHORT);
-
-    /* Zoom animation stuff */
-    /* camera position for the selected viewport */
-    GLVector vpCamPos (0, 0, 0, 0);
-
-    /* camera position during expo mode */
-    GLVector expoCamPos (0, 0, 0, 0);
-
-    if (optionGetDeform () == DeformCurve)
-    {
-	vpCamPos[GLVector::x] = -sx * (0.5 - (((float) output->x () +
-					       (output->width () / 2.0)) /
-					      (float) screen->width ()));
-    }
-    else
-    {
-	vpCamPos[GLVector::x] = (screen->vp ().x () * sx) + 0.5 +
-				(output->x () / output->width ()) -
-	                        (vpSize.x () * 0.5 * sx) +
-				gapX * screen->vp ().x ();
-    }
-    vpCamPos[GLVector::y] = -((screen->vp ().y () * sy) + 0.5 +
-			      (output->y () / output->height ())) +
-	                     (vpSize.y () * 0.5 * sy) -
-			     gapY * screen->vp ().y ();
-
-    biasZ = MAX (vpSize.x () * sx, vpSize.y () * sy);
-    if (optionGetDeform () == DeformTilt || optionGetReflection ())
-	biasZ *= (0.15 + optionGetDistance ());
-    else
-	biasZ *= optionGetDistance ();
-
-    progress = sigmoidProgress (expoCam);
-
-    if (optionGetDeform () != DeformCurve)
-	expoCamPos[GLVector::x] = gapX * (vpSize.x () - 1) * 0.5;
-
-    expoCamPos[GLVector::y] = -gapY * (vpSize.y () - 1) * 0.5;
-    expoCamPos[GLVector::z] = -DEFAULT_Z_CAMERA + DEFAULT_Z_CAMERA *
-	                      (MAX (vpSize.x () + (vpSize.x () - 1) * gapX,
-				    vpSize.y () + (vpSize.y () - 1) * gapY) +
-			       biasZ);
-
-    /* interpolate between vpCamPos and expoCamPos */
-    cam[GLVector::x] = vpCamPos[GLVector::x] * (1 - progress) +
-	               expoCamPos[GLVector::x] * progress;
-    cam[GLVector::y] = vpCamPos[GLVector::y] * (1 - progress) +
-	               expoCamPos[GLVector::y] * progress;
-    cam[GLVector::z] = vpCamPos[GLVector::z] * (1 - progress) +
-	               expoCamPos[GLVector::z] * progress;
-
-    if (vpSize.x () > vpSize.y ())
-    {
-	aspectY = (float) vpSize.x () / (float) vpSize.y ();
-	aspectY -= 1.0;
-	aspectY *= -optionGetAspectRatio () + 1.0;
-	aspectY *= progress;
-	aspectY += 1.0;
-    }
-    else
-    {
-	aspectX = (float) vpSize.y () / (float) vpSize.x ();
-	aspectX -= 1.0;
-	aspectX *= -optionGetAspectRatio () + 1.0;
-	aspectX *= progress;
-	aspectX += 1.0;
-    }
-
-    /* End of Zoom animation stuff */
-
-    if (optionGetDeform () == DeformTilt)
-    {
-	if (optionGetExpoAnimation () == ExpoAnimationZoom)
-	    rotation = 10.0 * sigmoidProgress (expoCam);
-	else
-	    rotation = 10.0 * expoCam;
-    }
-
-    if (optionGetMipmaps ())
-	gScreen->setTextureFilter (GL_LINEAR_MIPMAP_LINEAR);
-
-    /* ALL TRANSFORMATION ARE EXECUTED FROM BOTTOM TO TOP */
-
-    oScale = 1 / (1 + ((MAX (sx, sy) - 1) * progress));
-
-    sTransform.scale (oScale, oScale, 1.0);
-
-    /* zoom out */
-    oScale = DEFAULT_Z_CAMERA / (cam[GLVector::z] + DEFAULT_Z_CAMERA);
-    sTransform.scale (oScale, oScale, oScale);
-    glNormal3f (0.0, 0.0, -oScale);
-    sTransform.translate (-cam[GLVector::x], -cam[GLVector::y],
-			  -cam[GLVector::z] - DEFAULT_Z_CAMERA);
-
-    if (reflection)
-    {
-	float scaleFactor = optionGetScaleFactor ();
-
-	sTransform.translate (0.0,
-			      (vpSize.y () + ((vpSize.y () - 1) * gapY * 2)) *
-			      -sy * aspectY,
-			      0.0);
-	sTransform.scale (1.0, -1.0, 1.0);
-	sTransform.translate (0.0,
-			      - (1 - scaleFactor) / 2 * sy * aspectY *
-			      (vpSize.y () + ((vpSize.y () - 1) * gapY * 2)),
-			      0.0);
-	sTransform.scale (1.0, scaleFactor, 1.0);
-	glCullFace (GL_FRONT);
-    }
-
-    /* rotate */
-    sTransform.rotate (rotation, 0.0f, 1.0f, 0.0f);
-    sTransform.scale (aspectX, aspectY, 1.0);
-
-    float xoffset = 0.0;
-    float yoffset = 0.0;
-    float xadjs = 1.0f;
-    float yadjs = 1.0f;
-
-    if (output->left () == 0)
-    {
-        xoffset = ((vpSize.x () * sx) / ((float) output->width ()) * (optionGetXOffset ()) * sigmoidProgress (expoCam));
-	xadjs = 1.0f - ((float) (optionGetXOffset ()) / (float) (output->width ())) * sigmoidProgress (expoCam);
-    }
-
-    if (output->top () == 0)
-    {
-	yoffset = ((vpSize.y () * sy) / ((float) output->height ()) * (optionGetYOffset ()) * sigmoidProgress (expoCam));
-
-	yadjs = 1.0f - ((float) (optionGetYOffset ()) / (float) output->height ()) * sigmoidProgress (expoCam);
-    }
-
-    /* translate expo to center */
-    sTransform.translate (vpSize.x () * sx * -0.5 + xoffset,
-			  vpSize.y () * sy * 0.5 - yoffset, 0.0f);
-    sTransform.scale (xadjs, yadjs, 1.0f);
-
-    if (optionGetDeform () == DeformCurve)
-	sTransform.translate ((vpSize.x () - 1) * sx * 0.5, 0.0, 0.0);
-
-    sTransformW = sTransform;
-
-    /* revert prepareXCoords region shift. Now all screens display the same */
-    sTransform.translate (0.5f, -0.5f, DEFAULT_Z_CAMERA);
-
-    if (vpSize.x () > 2)
-	/* we can't have 90 degree for the left/right most viewport */
-	curveAngle = interpolate (359 / ((vpSize.x () - 1) * 2), 1,
-				  optionGetCurve ());
-    else
-	curveAngle = interpolate (180 / vpSize.x (), 1, optionGetCurve ());
-
-    curveDistance = ((0.5f * sx) + (gapX / 2.0)) /
-	            tanf ((M_PI / 180.0f) * curveAngle / 2.0);
-    curveRadius   = ((0.5f * sx) + (gapX / 2.0)) /
-		    sinf ((M_PI / 180.0f) * curveAngle / 2.0);
-
-    expoActive = true;
-
-    for (int j = 0; j < screen->vpSize ().height (); j++)
-	for (int i = 0; i < screen->vpSize().width (); i++)
-	    paintViewport (attrib, sTransform, region, output, mask, CompPoint (i, j), vpCamPos, reflection);
-
-    paintingDndWindow = true;
-
-    foreach (CompWindow *dndWindow, dndWindows)
-    {
-	CompPoint vp;
-
-	screen->viewportForGeometry (dndWindow->geometry (), vp);
-
-	while (vp.x () < 0)
-	    vp.setX (screen->vpSize ().width () + vp.x ());
-
-	while (vp.y () < 0)
-	    vp.setY (screen->vpSize ().height () + vp.y ());
-
-	paintViewport (attrib, sTransform, infiniteRegion, output, mask, vp, vpCamPos, reflection);
-    }
-
-    paintingDndWindow = false;
-
-    glNormal3f (0.0, 0.0, -1.0);
-
-    if (reflection)
-    {
-	glEnable (GL_BLEND);
-	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-	glPushMatrix ();
-
-	if (optionGetDeform () != DeformCurve)
-	{
-	    glLoadMatrixf (sTransformW.getMatrix ());
-
-	    glBegin (GL_QUADS);
-	    glColor4f (0.0, 0.0, 0.0, 1.0);
-	    glVertex2f (0.0, 0.0);
-	    glColor4f (0.0, 0.0, 0.0, 0.5);
-	    glVertex2f (0.0, -vpSize.y () * (sy + gapY));
-	    glVertex2f (vpSize.x () * sx * (1.0 + gapX),
-			-vpSize.y () * sy * (1.0 + gapY));
-	    glColor4f (0.0, 0.0, 0.0, 1.0);
-	    glVertex2f (vpSize.x () * sx * (1.0 + gapX), 0.0);
-	    glEnd ();
-	}
-	else
-	{
-	    glCullFace (GL_BACK);
-	    glLoadIdentity ();
-	    glTranslatef (0.0, 0.0, -DEFAULT_Z_CAMERA);
-
-	    glBegin (GL_QUADS);
-	    glColor4f (0.0, 0.0, 0.0, 1.0 * expoCam);
-	    glVertex2f (-0.5, -0.5);
-	    glVertex2f (0.5, -0.5);
-	    glColor4f (0.0, 0.0, 0.0, 0.5 * expoCam);
-	    glVertex2f (0.5, 0.0);
-	    glVertex2f (-0.5, 0.0);
-	    glColor4f (0.0, 0.0, 0.0, 0.5 * expoCam);
-	    glVertex2f (-0.5, 0.0);
-	    glVertex2f (0.5, 0.0);
-	    glColor4f (0.0, 0.0, 0.0, 0.0);
-	    glVertex2f (0.5, 0.5);
-	    glVertex2f (-0.5, 0.5);
-	    glEnd ();
-	}
-	glCullFace (GL_BACK);
-
-	glLoadIdentity ();
-	glTranslatef (0.0, 0.0, -DEFAULT_Z_CAMERA);
-
-	if (optionGetGroundSize () > 0.0)
-	{
-	    glBegin (GL_QUADS);
-	    glColor4usv (optionGetGroundColor1 ());
-	    glVertex2f (-0.5, -0.5);
-	    glVertex2f (0.5, -0.5);
-	    glColor4usv (optionGetGroundColor2 ());
-	    glVertex2f (0.5, -0.5 + optionGetGroundSize ());
-	    glVertex2f (-0.5, -0.5 + optionGetGroundSize ());
-	    glEnd ();
-	}
-
-	glColor4usv (defaultColor);
-
-	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-	glDisable (GL_BLEND);
-	glPopMatrix ();
-    }
-
-    expoActive = false;
-
-    gScreen->glPaintTransformedOutputSetCurrentIndex (glPaintTransformedOutputIndex);
-    gScreen->setTextureFilter (oldFilter);
-}
-
-const CompWindowList &
-ExpoScreen::getWindowPaintList ()
-{
-    return dndWindows;
-}
-
-bool
-ExpoScreen::glPaintOutput (const GLScreenPaintAttrib& attrib,
-			   const GLMatrix&            transform,
-			   const CompRegion&          region,
-			   CompOutput                 *output,
-			   unsigned int               mask)
-{
-    if (expoCam > 0.0)
-	mask |= PAINT_SCREEN_TRANSFORMED_MASK | PAINT_SCREEN_CLEAR_MASK;
-
-    return gScreen->glPaintOutput (attrib, transform, region, output, mask);
-}
-
-void
-ExpoScreen::glPaintTransformedOutput (const GLScreenPaintAttrib& attrib,
-				      const GLMatrix&            transform,
-				      const CompRegion&          region,
-				      CompOutput                 *output,
-				      unsigned int               mask)
-{
-    expoActive = false;
-
-    if (expoCam > 0)
-	mask |= PAINT_SCREEN_CLEAR_MASK;
-
-    if (expoCam <= 0 || (expoCam > 0.0 && expoCam < 1.0 &&
-			 optionGetExpoAnimation () != ExpoAnimationZoom))
-    {
-	gScreen->glPaintTransformedOutput (attrib, transform, region,
-					   output, mask);
-    }
-    else
-    {
-	gScreen->clearOutput (output, GL_COLOR_BUFFER_BIT);
-    }
-
-    mask &= ~PAINT_SCREEN_CLEAR_MASK;
-
-    if (expoCam > 0.0)
-    {
-	if (optionGetReflection ())
-	    paintWall (attrib, transform, region, output, mask, true);
-
-	paintWall (attrib, transform, region, output, mask, false);
-	anyClick = false;
-    }
-}
-
-bool
-ExpoWindow::glDraw (const GLMatrix&     transform,
-		    GLFragment::Attrib& fragment,
-		    const CompRegion&   region,
-		    unsigned int        mask)
-{
-    GLMatrix wTransform (transform);
-    CompPoint vp;
-
-    screen->viewportForGeometry (window->geometry (), vp);
-
-    if (eScreen->expoCam == 0.0f)
-	return gWindow->glDraw (transform, fragment, region, mask);
-
-    GLFragment::Attrib fA (fragment);
-    int                expoAnimation;
-
-    expoAnimation = eScreen->optionGetExpoAnimation ();
-
-    if (eScreen->expoActive)
-    {
-	if (expoAnimation != ExpoScreen::ExpoAnimationZoom)
-	    fA.setOpacity (fragment.getOpacity () * eScreen->expoCam);
-
-	if (window->wmType () & CompWindowTypeDockMask &&
-	    eScreen->optionGetHideDocks ())
-	{
-	    if (expoAnimation == ExpoScreen::ExpoAnimationZoom &&
-		eScreen->paintingVp == eScreen->selectedVp)
-	    {
-		fA.setOpacity (fragment.getOpacity () *
-			       (1 - sigmoidProgress (eScreen->expoCam)));
-	    }
-	    else
-	    {
-		fA.setOpacity (0);
-	    }
-	}
-
-	if (vp == eScreen->paintingVp || window->onAllViewports ())
-	{
-	    fA.setBrightness (fragment.getBrightness () * eScreen->vpBrightness);
-	    fA.setSaturation (fragment.getSaturation () * eScreen->vpSaturation);
-	}
-    }
-    else
-    {
-	if (expoAnimation == ExpoScreen::ExpoAnimationZoom)
-	    fA.setBrightness (0);
-	else
-	    fA.setBrightness (fragment.getBrightness () *
-			      (1 - sigmoidProgress (eScreen->expoCam)));
-    }
-
-    bool status = gWindow->glDraw (wTransform, fA, region, mask);
-
-    if (window->type () & CompWindowTypeDesktopMask)
-    {
-	/* We want to set the geometry of the polka dots to the window
-	 * region */
-	CompRegion reg = CompRegion (0, 0, window->width (), window->height ());
-
-	foreach(GLTexture * tex, eScreen->polkadots_texture)
-	{
-	    GLTexture::MatrixList matl;
-	    GLTexture::Matrix     mat = tex->matrix();
-	    CompRegion            paintRegion(region);
-
-	    /* We can reset the window geometry since it will be
-	     * re-added later */
-	    gWindow->geometry().reset();
-
-	    float xScale = screen->width () / (float) eScreen->viewport_size.width ();
-	    float yScale = screen->height () / (float) eScreen->viewport_size.height ();
-
-	    mat.xx *= xScale;
-	    mat.yy *= yScale;
-
-	    /* Not sure what this does, but it is necessary
-	     * (adjusts for scale?) */
-	    mat.x0 -= mat.xx * reg.boundingRect().x1();
-	    mat.y0 -= mat.yy * reg.boundingRect().y1();
-
-	    matl.push_back(mat);
-
-	    if (mask & PAINT_WINDOW_TRANSFORMED_MASK)
-		paintRegion = infiniteRegion;
-
-	    /* Now allow plugins to mess with the geometry of our
-	     * dim (so we get a nice render for things like
-	     * wobbly etc etc */
-	    gWindow->glAddGeometry(matl, reg, paintRegion);
-
-	    /* Did it succeed? */
-	    if (gWindow->geometry().vertices)
-	    {
-		unsigned int glDrawTextureIndex = gWindow->glDrawTextureGetCurrentIndex();
-		fA.setOpacity (fragment.getOpacity () * (((1.0 - eScreen->vpBrightness) + (1.0 - eScreen->vpSaturation) / 2.0)));
-		/* Texture rendering set-up */
-		eScreen->gScreen->setTexEnvMode(GL_MODULATE);
-		glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-		/* Draw the dim texture with all of it's modified
-		 * geometry glory */
-		gWindow->glDrawTextureSetCurrentIndex(MAXSHORT);
-		gWindow->glDrawTexture(tex, fA, mask | PAINT_WINDOW_BLEND_MASK
-				       | PAINT_WINDOW_TRANSLUCENT_MASK |
-				       PAINT_WINDOW_TRANSFORMED_MASK);
-		gWindow->glDrawTextureSetCurrentIndex(glDrawTextureIndex);
-		/* Texture rendering tear-down */
-		glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-		eScreen->gScreen->setTexEnvMode(GL_REPLACE);
-	    }
-	}
-
-	/* Paint the outline */
-	if (mGlowQuads && eScreen->paintingVp == eScreen->selectedVp)
-	{
-	    if (region.numRects ())
-	    {
-		/* reset geometry and paint */
-		gWindow->geometry ().reset ();
-
-		paintGlow (fragment, infiniteRegion, mask);
-	    }
-	}
-
-  }
-
-  return status;
-
-}
-
-#define EXPO_GRID_SIZE 100
-
-void
-ExpoWindow::glAddGeometry (const GLTexture::MatrixList& matrices,
-			   const CompRegion&            region,
-			   const CompRegion&            clip,
-			   unsigned int                 maxGridWidth,
-			   unsigned int                 maxGridHeight)
-{
-    if (eScreen->expoCam > 0.0        &&
-	screen->desktopWindowCount () &&
-	eScreen->optionGetDeform () == ExpoScreen::DeformCurve)
-    {
-	int         i, oldVCount = gWindow->geometry ().vCount;
-	GLfloat     *v;
-	CompPoint   offset;
-	float       lastX, lastZ = 0.0;
-	const float radSquare = pow (eScreen->curveDistance, 2) + 0.25;
-	float       ang;
-
-	gWindow->glAddGeometry (matrices, region, clip,
-				MIN(maxGridWidth , EXPO_GRID_SIZE),
-				maxGridHeight);
-
-	v  = gWindow->geometry ().vertices;
-	v += gWindow->geometry ().vertexStride - 3;
-	v += gWindow->geometry ().vertexStride * oldVCount;
-
-	if (!window->onAllViewports ())
-	{
-	    offset = eScreen->cScreen->windowPaintOffset ();
-	    offset = window->getMovementForOffset (offset);
-	}
-
-	lastX = -1000000000.0;
-
-	for (i = oldVCount; i < gWindow->geometry ().vCount; i++)
-	{
-	    if (v[0] == lastX)
-	    {
-		v[2] = lastZ;
-	    }
-	    else if (v[0] + offset.x () >= -EXPO_GRID_SIZE &&
-		     v[0] + offset.x () < screen->width () + EXPO_GRID_SIZE)
-	    {
-		ang = (((v[0] + offset.x ()) / (float) screen->width ()) - 0.5);
-		ang *= ang;
-		if (ang < radSquare)
-		{
-		    v[2] = eScreen->curveDistance - sqrt (radSquare - ang);
-		    v[2] *= sigmoidProgress (eScreen->expoCam);
-		}
-	    }
-
-	    lastX = v[0];
-	    lastZ = v[2];
-
-	    v += gWindow->geometry ().vertexStride;
-	}
-    }
-    else
-    {
-	gWindow->glAddGeometry (matrices, region, clip, maxGridWidth, maxGridHeight);
-    }
-}
-
-void
-ExpoWindow::glDrawTexture (GLTexture           *texture,
-			   GLFragment::Attrib& attrib,
-			   unsigned int        mask)
-{
-    if (eScreen->expoCam > 0.0                                 &&
-	eScreen->optionGetDeform () == ExpoScreen::DeformCurve &&
-	eScreen->gScreen->lighting ()                          &&
-	screen->desktopWindowCount ())
-    {
-	unsigned int i, idx, vCount;
-	CompPoint    offset;
-	float        x;
-	GLfloat      *v;
-
-	vCount = gWindow->geometry ().vCount;
-
-	if (eScreen->winNormals.size () < vCount * 3)
-	    eScreen->winNormals.resize (vCount * 3);
-
-	if (!window->onAllViewports ())
-	{
-	    offset = eScreen->cScreen->windowPaintOffset ();
-	    offset = window->getMovementForOffset (offset);
-	}
-
-	v = gWindow->geometry ().vertices +
-	    (gWindow->geometry ().vertexStride - 3);
-
-	for (i = 0; i < vCount; i++)
-	{
-	    x = (float) (v[0] + offset.x () - screen->width () / 2) *
-		        eScreen->curveAngle / screen->width ();
-
-	    while (x < 0)
-		x += 360.0;
-
-	    idx = floor (x);
-
-	    eScreen->winNormals[i * 3] = -eScreen->vpNormals[idx * 3];
-	    eScreen->winNormals[(i * 3) + 1] =
-		eScreen->vpNormals[(idx * 3) + 1];
-	    eScreen->winNormals[(i * 3) + 2] =
-		eScreen->vpNormals[(idx * 3) + 2];
-
-	    v += gWindow->geometry ().vertexStride;
-	}
-
-	glEnable (GL_NORMALIZE);
-	glNormalPointer (GL_FLOAT,0, &eScreen->winNormals.at (0));
-
-	glEnableClientState (GL_NORMAL_ARRAY);
-
-	gWindow->glDrawTexture (texture, attrib, mask);
-
-	glDisable (GL_NORMALIZE);
-	glDisableClientState (GL_NORMAL_ARRAY);
-	glNormal3f (0.0, 0.0, -1.0);
-    }
-    else
-    {
-	glEnable (GL_NORMALIZE);
-	gWindow->glDrawTexture (texture, attrib, mask);
-	glDisable (GL_NORMALIZE);
-    }
-}
-
-bool
-ExpoWindow::glPaint (const GLWindowPaintAttrib& attrib,
-		     const GLMatrix&            transform,
-		     const CompRegion&          region,
-		     unsigned int               mask)
-{
-    GLMatrix            wTransform (transform);
-    GLWindowPaintAttrib wAttrib (attrib);
-    CompRegion          clip (region);
-
-    if (eScreen->expoActive)
-    {
-	float     opacity = 1.0;
-	bool      hide;
-	bool      zoomAnim;
-	CompPoint vp;
-	screen->viewportForGeometry (window->geometry (), vp);
-
-	zoomAnim = eScreen->optionGetExpoAnimation () ==
-	           ExpoScreen::ExpoAnimationZoom;
-	hide     = eScreen->optionGetHideDocks () &&
-	           (window->wmType () & CompWindowTypeDockMask);
-
-	if (eScreen->expoCam > 0.0)
-	{
-	    if (eScreen->expoCam < 1.0 && !zoomAnim)
-		mask |= PAINT_WINDOW_TRANSLUCENT_MASK;
-	    else if (hide)
-		mask |= PAINT_WINDOW_TRANSLUCENT_MASK;
-	}
-
-	if (!zoomAnim)
-	    opacity = attrib.opacity * eScreen->expoCam;
-
-	if (hide)
-	{
-	    if (zoomAnim && eScreen->paintingVp == eScreen->selectedVp)
-		opacity = attrib.opacity *
-			  (1 - sigmoidProgress (eScreen->expoCam));
-	    else
-		opacity = 0;
-	}
-
-	if (opacity <= 0)
-	    mask |= PAINT_WINDOW_NO_CORE_INSTANCE_MASK;
-	else
-	    wAttrib.opacity = wAttrib.opacity * opacity;
-
-	/* Stretch maximized windows a little so that you don't
-	 * have an awkward gap */
-
-	if (window->state () & MAXIMIZE_STATE &&
-		!window->border ().top)
-	{
-	    CompOutput *o = &screen->outputDevs ()[screen->outputDeviceForGeometry(window->geometry())];
-	    float yS = 1.0 + ((o->height () / (float) window->height ()) - 1.0f) * sigmoidProgress (eScreen->expoCam);
-	    wTransform.translate (window->x () + window->width () / 2,
-				  window->y () + window->height (),
-				  0.0f);
-	    wTransform.scale (1.0f, yS, 1.0f);
-	    wTransform.translate (-(window->x () + window->width () / 2),
-				  -(window->y () + window->height ()),
-				  0.0f);
-
-	    if (eScreen->paintingVp != vp)
-		mask |= PAINT_WINDOW_NO_CORE_INSTANCE_MASK;
-
-	    mask |= PAINT_WINDOW_TRANSFORMED_MASK;
-	}
-	
-	if (std::find (eScreen->dndWindows.begin(), eScreen->dndWindows.end (), window) != eScreen->dndWindows.end ())
-	{
-	    if (!eScreen->paintingDndWindow)
-	    {
-		mask |= PAINT_WINDOW_NO_CORE_INSTANCE_MASK;
-	    }
-	    else
-	    {
-		mask |= PAINT_WINDOW_TRANSFORMED_MASK;
-		clip = infiniteRegion;
-	    }
-	}
-    }
-
-    bool status = gWindow->glPaint (wAttrib, wTransform, clip, mask);
-
-    return status;
-}
-
-bool
-ExpoWindow::damageRect (bool            initial,
-			const CompRect& rect)
-{
-    if (eScreen->expoCam > 0.0f)
-	eScreen->cScreen->damageScreen ();
-
-    return cWindow->damageRect (initial, rect);
-}
-
-#define EXPOINITBIND(opt, func)                                \
-    optionSet##opt##Initiate (boost::bind (&ExpoScreen::func,  \
-					   this, _1, _2, _3));
-#define EXPOTERMBIND(opt, func)                                \
-    optionSet##opt##Terminate (boost::bind (&ExpoScreen::func, \
-					    this, _1, _2, _3));
-
-ExpoScreen::ExpoScreen (CompScreen *s) :
-    PluginClassHandler<ExpoScreen, CompScreen> (s),
-    ExpoOptions (),
-    cScreen (CompositeScreen::get (s)),
-    gScreen (GLScreen::get (s)),
-    expoCam (0.0f),
-    expoActive (false),
-    expoMode (false),
-    dndState (DnDNone),
-    dndWindows (0),
-    origVp (s->vp ()),
-    selectedVp (s->vp ()),
-    vpUpdateMode (VPUpdateNone),
-    clickTime (0),
-    doubleClick (false),
-    vpNormals (360 * 3),
-    grabIndex (0),
-    paintingDndWindow (false),
-    mGlowTextureProperties (&glowTextureProperties)
-{
-    CompString fname;
-    CompString pname = "expo";
-    CompSize   size;
-
-
-    leftKey  = XKeysymToKeycode (s->dpy (), XStringToKeysym ("Left"));
-    rightKey = XKeysymToKeycode (s->dpy (), XStringToKeysym ("Right"));
-    upKey    = XKeysymToKeycode (s->dpy (), XStringToKeysym ("Up"));
-    downKey  = XKeysymToKeycode (s->dpy (), XStringToKeysym ("Down"));
-
-    mMoveCursor = XCreateFontCursor (screen->dpy (), XC_fleur);
-
-    EXPOINITBIND (ExpoKey, doExpo);
-    EXPOTERMBIND (ExpoKey, termExpo);
-    EXPOINITBIND (ExpoButton, doExpo);
-    EXPOTERMBIND (ExpoButton, termExpo);
-    EXPOINITBIND (ExpoEdge, doExpo);
-    EXPOTERMBIND (ExpoButton, termExpo);
-
-    EXPOINITBIND (DndButton, dndInit);
-    EXPOTERMBIND (DndButton, dndFini);
-    EXPOINITBIND (ExitButton, exitExpo);
-    EXPOINITBIND (NextVpButton, nextVp);
-    EXPOINITBIND (PrevVpButton, prevVp);
-
-    ScreenInterface::setHandler (screen, false);
-    CompositeScreenInterface::setHandler (cScreen, false);
-    GLScreenInterface::setHandler (gScreen, false);
-
-    outline_texture = GLTexture::imageDataToTexture (mGlowTextureProperties->textureData,
-						     CompSize (mGlowTextureProperties->textureSize,
-							       mGlowTextureProperties->textureSize),
-						     GL_RGBA, GL_UNSIGNED_BYTE);
-    fname = "texture_tile.png";
-    polkadots_texture = GLTexture::readImageToTexture (fname, pname, polkadots_texture_size);
-
-    if (polkadots_texture.empty ())
-	compLogMessage ("expo", CompLogLevelWarn, "failed to bind image to texture");
-    else
-    {
-	foreach (GLTexture *tex, polkadots_texture)
-	{
-	    tex->enable (GLTexture::Good);
-	    glTexParameteri (tex->target (), GL_TEXTURE_WRAP_S, GL_REPEAT);
-	    glTexParameteri (tex->target (), GL_TEXTURE_WRAP_T, GL_REPEAT);
-	    tex->disable ();
-	}
-    }
-}
-
-ExpoScreen::~ExpoScreen ()
-{
-    if (mMoveCursor)
-	XFreeCursor (screen->dpy (), mMoveCursor);
-}
-
-void
-ExpoWindow::resizeNotify(int dx, int dy, int dw, int dh)
-{
-    window->resizeNotify (dx, dy, dw, dh);
-
-    /* mGlowQuads contains positional info, so we need to recalc that */
-    if (mGlowQuads)
-    {
-	/* FIXME: we need to find a more multitexture friendly way
-	 * of doing this */
-	GLTexture::Matrix tMat = eScreen->outline_texture.at (0)->matrix ();
-	computeGlowQuads (&tMat);
-    }
-}
-
-ExpoWindow::ExpoWindow (CompWindow *w) :
-    PluginClassHandler<ExpoWindow, CompWindow> (w),
-    window (w),
-    cWindow (CompositeWindow::get (w)),
-    gWindow (GLWindow::get (w)),
-    eScreen (ExpoScreen::get (screen)),
-    dndOpacity (0.0f),
-    mGlowQuads (NULL)
-{
-    CompositeWindowInterface::setHandler (cWindow, false);
-    GLWindowInterface::setHandler (gWindow, false);
-    WindowInterface::setHandler (window, true);
-
-    if (window->type () & CompWindowTypeDesktopMask)
-    {
-	foreach (GLTexture *tex, eScreen->outline_texture)
-	{
-	    GLTexture::Matrix mat = tex->matrix ();
-	    computeGlowQuads (&mat);
-	}
-    }
-}
-
-ExpoWindow::~ExpoWindow ()
-{
-    eScreen->dndWindows.remove (window);
-    computeGlowQuads (NULL);
-}
-
-bool
-ExpoPluginVTable::init ()
-{
-    if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
-	!CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
-	!CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
-	return false;
-
-    return true;
-}
-
-

=== removed directory '.pc/fix_930192.patch'
=== removed directory '.pc/fix_930192.patch/animation'
=== removed directory '.pc/fix_930192.patch/animation/src'
=== removed file '.pc/fix_930192.patch/animation/src/animation.cpp'
--- .pc/fix_930192.patch/animation/src/animation.cpp	2012-03-21 11:46:41 +0000
+++ .pc/fix_930192.patch/animation/src/animation.cpp	1970-01-01 00:00:00 +0000
@@ -1,2962 +0,0 @@
-/**
- * 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"
-
-using namespace compiz::core;
-
-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)
-    {
-	const CompWindowList &pl = pushLockedPaintList ();
-	// Initialize persistent window data for the extension plugin
-	foreach (CompWindow *w, pl)
-	{
-	    AnimWindow *aw = AnimWindow::get (w);
-	    extensionPluginInfo->initPersistentData (aw);
-	}
-
-	popLockedPaintList ();
-    }
-}
-
-void
-AnimScreen::removeExtension (ExtensionPluginInfo *extensionPluginInfo)
-{
-    priv->removeExtension (extensionPluginInfo);
-}
-
-void
-PrivateAnimScreen::removeExtension (ExtensionPluginInfo *extensionPluginInfo)
-{
-    // Stop all ongoing animations
-    const CompWindowList &pl = pushLockedPaintList ();
-
-    foreach (CompWindow *w, pl)
-    {
-	PrivateAnimWindow *aw = AnimWindow::get (w)->priv;
-	if (aw->curAnimation ())
-	    aw->postAnimationCleanUp ();
-    }
-
-    popLockedPaintList ();
-
-    // 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);
-    }
-
-    const CompWindowList &cpl = pushLockedPaintList ();
-
-    // Destroy persistent window data for the extension plugin
-    foreach (CompWindow *w, cpl)
-    {
-	AnimWindow *aw = AnimWindow::get (w);
-	extensionPluginInfo->destroyPersistentData (aw);
-    }
-
-    popLockedPaintList ();
-}
-
-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)
-
-	aScreen->enableCustomPaintList (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;
-	const CompWindowList &pl = pushLockedPaintList ();
-	CompWindowList       windowsFinishedAnimations;
-
-	struct timeval curTime;
-	gettimeofday (&curTime, 0);
-
-	if (mLastRedrawTimeFresh)
-	{
-	    msSinceLastPaintActual = timer::timeval_diff (&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;
-
-	/* Paint list includes destroyed windows */
-	for (CompWindowList::const_reverse_iterator rit = pl.rbegin ();
-	     rit != pl.rend (); rit++)
-	{
-	    CompWindow *w = (*rit);
-	    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
-		    windowsFinishedAnimations.push_back (w);
-		else
-		    animStillInProgress = true;
-	    }
-	}
-
-	foreach (CompWindow *w, pl)
-	{
-	    PrivateAnimWindow *aw = AnimWindow::get (w)->priv;
-	    if (aw->curAnimation ())
-		aw->curAnimation ()->postPreparePaint ();
-	}
-
-	popLockedPaintList ();
-    }
-
-    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);
-
-    const CompWindowList &pl = pushLockedPaintList ();
-    CompWindowList       windowsFinishedAnimations;
-
-    bool animStillInProgress = false;
-
-    /* Paint list includes destroyed windows */
-    for (CompWindowList::const_reverse_iterator rit = pl.rbegin ();
-	 rit != pl.rend (); rit++)
-    {
-	CompWindow *w = (*rit);
-	AnimWindow *animWin = AnimWindow::get (w);
-	PrivateAnimWindow *aw = animWin->priv;
-	Animation *curAnim = aw->curAnimation ();
-
-	if (curAnim)
-	{
-	    bool finished = (curAnim->remainingTime () <= 0);
-	    if (finished) // Animation is done
-		windowsFinishedAnimations.push_back (w);
-	    else
-		animStillInProgress = true;
-	}
-    }
-
-    popLockedPaintList ();
-
-    foreach (CompWindow *w, windowsFinishedAnimations)
-    {
-	AnimWindow *aw = AnimWindow::get (w);
-	aw->priv->notifyAnimation (false);
-	aw->priv->postAnimationCleanUp ();
-    }
-
-    if (!animStillInProgress)
-    {
-	activateEvent (false);
-	mLastRedrawTimeFresh = false;
-
-	// Reset stacking related info after all animations are done.
-	ExtensionPluginAnimation *extPlugin =
-		static_cast<ExtensionPluginAnimation *> (mExtensionPlugins[0]);
-	extPlugin->resetStackingInfo ();
-    }
-
-    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,