Merge lp:~unity-team/compiz/x-sru2 into lp:compiz/xenial

[Marco Trevisan (Treviño)]

Releasing SRU2 for Xenial

[Andrea Azzarone (azzar1)]

review: Approve

[lp:~unity-team/compiz/x-sru2]

4016. By Eleni Maria Stea on 2016-07-14

Added a new option in show desktop plugin that skips the fade animation: useful when performance is more important than eyecandy.

4017. By Marco Trevisan (Treviño) on 2016-07-14

ccsGSettingsBackend: don't try to update setting if wrapper is not found

4018. By Marco Trevisan (Treviño) on 2016-07-14

migration scripts: remove unsupported plugins for all the unity profiles

4019. By Marco Trevisan (Treviño) on 2016-07-14

debian/changelog: remove reference to crash bug since it's not affecting xenial

=== modified file 'compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.c'
--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.c	2016-03-03 14:22:05 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.c	2016-07-14 15:59:00 +0000
@@ -93,7 +93,8 @@
 
     g_value_unset (&schemaNameValue);
 
-    updateSettingWithGSettingsKeyName (backend, wrapper, keyName, backendInterface->updateSetting);
+    if (wrapper)
+	updateSettingWithGSettingsKeyName (backend, wrapper, keyName, backendInterface->updateSetting);
 }
 
 static CCSGSettingsWrapper *
 
=== removed file 'debian/00_remove_decor_in_unity_session.py'
--- debian/00_remove_decor_in_unity_session.py	2015-04-06 13:42:54 +0000
+++ debian/00_remove_decor_in_unity_session.py	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-
-# Copyright (C) 2014-2015 Canonical
-#
-# Authors:
-#  Marco Trevisan <[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; version 3.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUTa
-# 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
-
-from gi.repository import Gio
-import os,sys
-
-COMPIZ_SCHEMA = "org.compiz"
-COMPIZ_CORE_PATH = "/org/compiz/profiles/unity/plugins/core/"
-
-if COMPIZ_SCHEMA not in Gio.Settings.list_schemas():
-    print("No compiz schemas found, no migration needed")
-    sys.exit(0)
-
-core_settings = Gio.Settings(schema=COMPIZ_SCHEMA+".core", path=COMPIZ_CORE_PATH)
-active_plugins = core_settings.get_strv("active-plugins")
-
-if not "decor" in active_plugins:
-    print("No decor plugin active, no migration needed")
-    sys.exit(0)
-
-try:
-    active_plugins.remove("decor")
-except ValueError:
-    pass
-
-# gsettings doesn't work directly, the key is somewhat reverted. Work one level under then: dconf!
-# gsettings.set_strv("active-plugins", active_plugins)
-from subprocess import Popen, PIPE, STDOUT
-p = Popen(("dconf load "+COMPIZ_CORE_PATH).split(), stdout=PIPE, stdin=PIPE, stderr=STDOUT)
-p.communicate(input=bytes("[/]\nactive-plugins={}".format(active_plugins),'utf-8'))
 
=== removed file 'debian/00_remove_gnomecompat_in_unity_session.py'
--- debian/00_remove_gnomecompat_in_unity_session.py	2015-04-06 13:42:54 +0000
+++ debian/00_remove_gnomecompat_in_unity_session.py	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-
-# Copyright (C) 2014-2015 Canonical
-#
-# Authors:
-#  Marco Trevisan <[e-mail]>
-#  William Hua <[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; version 3.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUTa
-# 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
-
-from gi.repository import Gio
-import os,sys
-
-COMPIZ_SCHEMA = "org.compiz"
-COMPIZ_CORE_PATH = "/org/compiz/profiles/unity/plugins/core/"
-
-if COMPIZ_SCHEMA not in Gio.Settings.list_schemas():
-    print("No compiz schemas found, no migration needed")
-    sys.exit(0)
-
-core_settings = Gio.Settings(schema=COMPIZ_SCHEMA+".core", path=COMPIZ_CORE_PATH)
-active_plugins = core_settings.get_strv("active-plugins")
-
-if not "gnomecompat" in active_plugins:
-    print("No gnomecompat plugin active, no migration needed")
-    sys.exit(0)
-
-try:
-    active_plugins.remove("gnomecompat")
-except ValueError:
-    pass
-
-# gsettings doesn't work directly, the key is somewhat reverted. Work one level under then: dconf!
-# gsettings.set_strv("active-plugins", active_plugins)
-from subprocess import Popen, PIPE, STDOUT
-p = Popen(("dconf load "+COMPIZ_CORE_PATH).split(), stdout=PIPE, stdin=PIPE, stderr=STDOUT)
-p.communicate(input=bytes("[/]\nactive-plugins={}".format(active_plugins), 'utf-8'))
 
=== added file 'debian/00_remove_obsolete_plugins_in_unity_session_v1.py'
--- debian/00_remove_obsolete_plugins_in_unity_session_v1.py	1970-01-01 00:00:00 +0000
+++ debian/00_remove_obsolete_plugins_in_unity_session_v1.py	2016-07-14 15:59:00 +0000
@@ -0,0 +1,52 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+# Copyright (C) 2016 Canonical
+#
+# Authors:
+#  Marco Trevisan <[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; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUTa
+# 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
+
+from gi.repository import Gio
+import os,sys
+
+COMPIZ_SCHEMA = "org.compiz"
+COMPIZ_CORE_PATH = "/org/compiz/profiles/{}/plugins/core/"
+UNITY_PROFILES = ["unity", "unity-lowgfx"]
+OBSOLETE_PLUGINS = ["decor", "gnomecompat", "scalefilter"]
+
+if COMPIZ_SCHEMA not in Gio.Settings.list_schemas():
+    print("No compiz schemas found, no migration needed")
+    sys.exit(0)
+
+for profile in UNITY_PROFILES:
+    core_profile_path = COMPIZ_CORE_PATH.format(profile)
+    core_settings = Gio.Settings(schema=COMPIZ_SCHEMA+".core", path=core_profile_path)
+    active_plugins = core_settings.get_strv("active-plugins")
+
+    for plugin in OBSOLETE_PLUGINS:
+        if not plugin in active_plugins:
+            print("No '{}' plugin active in '{}' profile, no migration needed".format(plugin, profile))
+            continue
+
+        try:
+            active_plugins.remove(plugin)
+        except ValueError:
+            pass
+
+        # gsettings doesn't work directly, the key is somewhat reverted. Work one level under then: dconf!
+        # gsettings.set_strv("active-plugins", active_plugins)
+        from subprocess import Popen, PIPE, STDOUT
+        p = Popen(("dconf load "+core_profile_path).split(), stdout=PIPE, stdin=PIPE, stderr=STDOUT)
+        p.communicate(input=bytes("[/]\nactive-plugins={}".format(active_plugins), 'utf-8'))
 
=== removed file 'debian/00_remove_scalefilter_in_unity_session.py'
--- debian/00_remove_scalefilter_in_unity_session.py	2015-04-06 13:42:54 +0000
+++ debian/00_remove_scalefilter_in_unity_session.py	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-
-# Copyright (C) 2014-2015 Canonical
-#
-# Authors:
-#  Marco Trevisan <[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; version 3.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUTa
-# 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
-
-from gi.repository import Gio
-import os,sys
-
-COMPIZ_SCHEMA = "org.compiz"
-COMPIZ_CORE_PATH = "/org/compiz/profiles/unity/plugins/core/"
-
-if COMPIZ_SCHEMA not in Gio.Settings.list_schemas():
-    print("No compiz schemas found, no migration needed")
-    sys.exit(0)
-
-core_settings = Gio.Settings(schema=COMPIZ_SCHEMA+".core", path=COMPIZ_CORE_PATH)
-active_plugins = core_settings.get_strv("active-plugins")
-
-if not "scalefilter" in active_plugins:
-    print("No decor scalefilter active, no migration needed")
-    sys.exit(0)
-
-try:
-    active_plugins.remove("scalefilter")
-except ValueError:
-    pass
-
-# gsettings doesn't work directly, the key is somewhat reverted. Work one level under then: dconf!
-# gsettings.set_strv("active-plugins", active_plugins)
-from subprocess import Popen, PIPE, STDOUT
-p = Popen(("dconf load "+COMPIZ_CORE_PATH).split(), stdout=PIPE, stdin=PIPE, stderr=STDOUT)
-p.communicate(input=bytes("[/]\nactive-plugins={}".format(active_plugins), 'utf-8'))
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-05-26 00:12:16 +0000
+++ debian/changelog	2016-07-14 15:59:00 +0000
@@ -1,3 +1,21 @@
+compiz (1:0.9.12.2+16.04.20160526-0ubuntu2) UNRELEASED; urgency=medium
+
+  [ Eleni Maria Stea ]
+  * Added options for no animation in expo and scale plugins. They skip
+    the intermediate fading steps that force several redraws.
+  * Added a new option in show desktop plugin that skips the fade
+    animation: useful when performance is more important than eyecandy.
+
+  [ Marco Trevisan (Treviño) ]
+  * debian: add unity-lowgfx profile to compizconfig (LP: #1598770)
+  * Composite: use C++ goodness for managing damaging rectangles
+  * ccsGSettingsBackend: don't try to update setting if wrapper is not
+    found
+  * migration scripts: remove unsupported plugins for all the unity
+    profiles
+
+ -- Eleni Maria Stea <[e-mail]>  Tue, 05 Jul 2016 12:29:58 +0200
+
 compiz (1:0.9.12.2+16.04.20160526-0ubuntu1) xenial; urgency=medium
 
   [ Andrea Azzarone ]
 
=== removed file 'debian/compiz-gnome.gconf-defaults'
--- debian/compiz-gnome.gconf-defaults	2014-03-11 14:04:52 +0000
+++ debian/compiz-gnome.gconf-defaults	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-/apps/compiz-1/plugins/move/screen0/options/constrain_y                true
-/apps/compiz-1/general/screen0/options/hsize				2
-/apps/compiz-1/general/screen0/options/vsize				2
-/apps/gwd/blur_type							all
-/apps/gwd/metacity_theme_opacity					1.0
-/apps/gwd/metacity_theme_shade_opacity					true
-/apps/compizconfig-1/profiles/unity/general/screen0/options/active_plugins [core,composite,opengl,compiztoolbox,vpswitch,snap,mousepoll,resize,place,move,wall,grid,regex,imgpng,session,gnomecompat,animation,fade,unitymtgrabhandles,workarounds,scale,expo,ezoom,unityshell]
-/apps/compizconfig-1/profiles/unity/plugins/gnomecompat/screen0/options/main_menu_key ""
-/apps/compizconfig-1/profiles/unity/plugins/gnomecompat/screen0/options/run_key ""
-/apps/compizconfig-1/profiles/Default/general/screen0/options/active_plugins [core,composite,opengl,compiztoolbox,decor,vpswitch,snap,mousepoll,resize,place,move,wall,grid,regex,imgpng,session,gnomecompat,animation,fade,workarounds,scale,expo,ezoom]
 
=== modified file 'debian/compiz-gnome.gsettings-override'
--- debian/compiz-gnome.gsettings-override	2015-07-25 18:35:50 +0000
+++ debian/compiz-gnome.gsettings-override	2016-07-14 15:59:00 +0000
@@ -10,4 +10,3 @@
 
 [org.compiz.animation]
 unminimize-effects=['animation:Glide 2']
-
 
=== modified file 'debian/compiz-gnome.install'
--- debian/compiz-gnome.install	2015-12-10 16:34:35 +0000
+++ debian/compiz-gnome.install	2016-07-14 15:59:00 +0000
@@ -1,6 +1,6 @@
 debian/65compiz_profile-on-session /etc/X11/Xsession.d
 debian/profile_upgrades/*.upgrade usr/share/compizconfig/upgrades
-debian/unity.ini /etc/compizconfig/
+debian/unity*.ini /etc/compizconfig/
 postinst/convert-files/*.convert usr/lib/compiz/migration/
 usr/bin/gtk-window-decorator
 usr/lib/*/compizconfig/backends/libgsettings.so
 
=== modified file 'debian/compiz-gnome.migrations'
--- debian/compiz-gnome.migrations	2015-02-19 15:57:24 +0000
+++ debian/compiz-gnome.migrations	2016-07-14 15:59:00 +0000
@@ -1,3 +1,1 @@
-debian/00_remove_decor_in_unity_session.py
-debian/00_remove_scalefilter_in_unity_session.py
-debian/00_remove_gnomecompat_in_unity_session.py
+debian/00_remove_obsolete_plugins_in_unity_session_v1.py
 
=== modified file 'debian/compizconfig'
--- debian/compizconfig	2015-02-04 22:20:18 +0000
+++ debian/compizconfig	2016-07-14 15:59:00 +0000
@@ -20,3 +20,8 @@
 plugin_list_autosort = true
 profile = unity
 
+[general_ubuntu-lowgfx]
+backend = gsettings
+integration = true
+plugin_list_autosort = true
+profile = unity-lowgfx
 
=== added file 'debian/unity-lowgfx.ini'
--- debian/unity-lowgfx.ini	1970-01-01 00:00:00 +0000
+++ debian/unity-lowgfx.ini	2016-07-14 15:59:00 +0000
@@ -0,0 +1,47 @@
+[core]
+s0_active_plugins = core;composite;opengl;copytex;compiztoolbox;vpswitch;snap;mousepoll;resize;place;move;wall;grid;regex;imgpng;session;fade;unitymtgrabhandles;workarounds;scale;expo;ezoom;unityshell
+
+[ezoom]
+s0_speed = 100
+
+[expo]
+s0_expo_animation = 3
+
+[fade]
+s0_fade_mode = 1
+s0_fade_time = 1
+
+[grid]
+s0_animation_duration = 1
+
+[resize]
+s0_mode = 2
+
+[opengl]
+s0_texture_filter = 0
+
+[scale]
+s0_skip_animation = true
+
+[unityshell]
+s0_low_graphics_mode = true
+s0_dash_blur_experimental = 0
+
+s0_override_decoration_theme = true
+s0_shadow_x_offset = 1
+s0_shadow_y_offset = 1
+s0_active_shadow_radius = 3
+s0_inactive_shadow_radius = 2
+
+s0_menus_fadein = 0
+s0_menus_fadeout = 0
+s0_menus_discovery_fadein = 0
+s0_menus_discovery_fadeout = 0
+
+s0_autohide_animation = 1
+
+[wall]
+s0_slide_duration = 0
+
+[showdesktop]
+s0_skip_animation = true
 
=== modified file 'plugins/composite/src/privates.h'
--- plugins/composite/src/privates.h	2013-02-28 03:39:31 +0000
+++ plugins/composite/src/privates.h	2016-07-14 15:59:00 +0000
@@ -142,7 +142,6 @@
 {
     public:
 	PrivateCompositeWindow (CompWindow *w, CompositeWindow *cw);
-	~PrivateCompositeWindow ();
 
 	void windowNotify (CompWindowNotify n);
 	void resizeNotify (int dx, int dy, int dwidth, int dheight);
@@ -156,11 +155,7 @@
 	void allowFurtherRebindAttempts ();
 	bool frozen ();
 
-	static void handleDamageRect (CompositeWindow *w,
-				      int             x,
-				      int             y,
-				      int             width,
-				      int             height);
+	static void handleDamageRect (CompositeWindow *w, XRectangle const& rect);
 
     public:
 	CompWindow      *window;
@@ -179,9 +174,7 @@
 	unsigned short brightness;
 	unsigned short saturation;
 
-	XRectangle *damageRects;
-	int        sizeDamage;
-	int        nDamage;
+	std::vector<XRectangle> damageRects;
 
     private:
 
 
=== modified file 'plugins/composite/src/window.cpp'
--- plugins/composite/src/window.cpp	2013-04-13 13:53:39 +0000
+++ plugins/composite/src/window.cpp	2016-07-14 15:59:00 +0000
@@ -115,20 +115,11 @@
     overlayWindow (false),
     opacity (OPAQUE),
     brightness (BRIGHT),
-    saturation (COLOR),
-    damageRects (0),
-    sizeDamage (0),
-    nDamage (0)
+    saturation (COLOR)
 {
     WindowInterface::setHandler (w);
 }
 
-PrivateCompositeWindow::~PrivateCompositeWindow ()
-{
-    if (sizeDamage)
-	free (damageRects);
-}
-
 bool
 PrivateCompositeWindow::bind ()
 {
@@ -405,32 +396,14 @@
 CompositeWindow::processDamage (XDamageNotifyEvent *de)
 {
     if (priv->window->syncWait ())
-    {
-	if (priv->nDamage == priv->sizeDamage)
-	{
-	    priv->damageRects = (XRectangle *) realloc (priv->damageRects,
-				 (priv->sizeDamage + 1) *
-				 sizeof (XRectangle));
-	    priv->sizeDamage += 1;
-	}
-
-	priv->damageRects[priv->nDamage].x      = de->area.x;
-	priv->damageRects[priv->nDamage].y      = de->area.y;
-	priv->damageRects[priv->nDamage].width  = de->area.width;
-	priv->damageRects[priv->nDamage].height = de->area.height;
-	priv->nDamage++;
-    }
+	priv->damageRects.push_back (de->area);
     else
-	priv->handleDamageRect (this, de->area.x, de->area.y,
-				de->area.width, de->area.height);
+	priv->handleDamageRect (this, de->area);
 }
 
 void
 PrivateCompositeWindow::handleDamageRect (CompositeWindow *w,
-					  int             x,
-					  int             y,
-					  int             width,
-					  int             height)
+					  XRectangle const& rect)
 {
     if (!w->priv->redirected)
 	return;
@@ -440,15 +413,15 @@
     if (!w->priv->damaged)
 	w->priv->damaged = initial = true;
 
-    if (!w->damageRect (initial, CompRect (x, y, width, height)))
+    if (!w->damageRect (initial, CompRect (rect.x, rect.y, rect.width, rect.height)))
     {
 	const CompWindow::Geometry &geom = w->priv->window->geometry ();
 
-	x += geom.x () + geom.border ();
-	y += geom.y () + geom.border ();
+	int x = rect.x + geom.x () + geom.border ();
+	int y = rect.y + geom.y () + geom.border ();
 
 	w->priv->cScreen->damageRegion (CompRegion (CompRect
-						    (x, y, width, height)));
+						    (x, y, rect.width, rect.height)));
     }
 
     if (initial)
@@ -565,17 +538,10 @@
 
 	case CompWindowNotifySyncAlarm:
 	{
-	    XRectangle *rects;
+	    for (XRectangle const& rect : damageRects)
+		PrivateCompositeWindow::handleDamageRect (cWindow, rect);
 
-	    rects   = damageRects;
-	    while (nDamage--)
-	    {
-		PrivateCompositeWindow::handleDamageRect (cWindow,
-							  rects[nDamage].x,
-							  rects[nDamage].y,
-							  rects[nDamage].width,
-							  rects[nDamage].height);
-	    }
+	    damageRects.clear();
 	    break;
 	}
 
 
=== modified file 'plugins/expo/expo.xml.in'
--- plugins/expo/expo.xml.in	2016-05-17 02:52:54 +0000
+++ plugins/expo/expo.xml.in	2016-07-14 15:59:00 +0000
@@ -95,7 +95,7 @@
 		    <_long>The animation used when initiating or leaving Expo.</_long>
 		    <default>0</default>
 		    <min>0</min>
-		    <max>2</max>
+		    <max>3</max>
 		    <desc>
 			<value>0</value>
 			<_name>Zoom</_name>
@@ -108,6 +108,10 @@
 			<value>2</value>
 			<_name>Vortex</_name>
 		    </desc>
+		    <desc>
+			<value>3</value>
+			<_name>None</_name>
+		    </desc>
 		</option>
 	    </group>
 	    <group>
 
=== modified file 'plugins/expo/src/expo.cpp'
--- plugins/expo/src/expo.cpp	2016-05-17 02:53:00 +0000
+++ plugins/expo/src/expo.cpp	2016-07-14 15:59:00 +0000
@@ -402,10 +402,18 @@
     float val = (static_cast <float> (msSinceLastPaint) / 1000.0f) /
 		optionGetZoomTime ();
 
-    if (expoMode)
-	expoCam = MIN (1.0, expoCam + val);
-    else
-	expoCam = MAX (0.0, expoCam - val);
+    if (optionGetExpoAnimation() != ExpoScreen::ExpoAnimationNone) {
+	if (expoMode)
+	    expoCam = MIN (1.0, expoCam + val);
+	else
+	    expoCam = MAX (0.0, expoCam - val);
+    }
+    else {
+	if (expoMode)
+	    expoCam = 1;
+	else
+	    expoCam = 0;
+    }
 
     if (expoCam)
     {
 
=== modified file 'plugins/gnomecompat/gnomecompat.xml.in'
--- plugins/gnomecompat/gnomecompat.xml.in	2015-10-26 17:15:43 +0000
+++ plugins/gnomecompat/gnomecompat.xml.in	2016-07-14 15:59:00 +0000
@@ -11,6 +11,9 @@
 		<plugin>opengl</plugin>
 		<plugin>decor</plugin>
 	    </relation>
+	    <conflict>
+		<plugin>unityshell</plugin>
+	    </conflict>
 	</deps>
 	<options>
 	    <option name="main_menu_key" type="key">
 
=== modified file 'plugins/scale/scale.xml.in'
--- plugins/scale/scale.xml.in	2016-05-17 02:52:54 +0000
+++ plugins/scale/scale.xml.in	2016-07-14 15:59:00 +0000
@@ -139,6 +139,11 @@
 					<_name>On all output devices</_name>
 				</desc>
 			</option>
+			<option name="skip_animation" type="bool">
+				<_short>Skip Animation</_short>
+				<_long>Skips the scale plugin animation.</_long>
+				<default>false</default>
+			</option>
 	    </group>
 	    <group>
 		<_short>Bindings</_short>
 
=== modified file 'plugins/scale/src/scale.cpp'
--- plugins/scale/src/scale.cpp	2016-05-17 02:52:54 +0000
+++ plugins/scale/src/scale.cpp	2016-07-14 15:59:00 +0000
@@ -932,9 +932,11 @@
     if (state != ScaleScreen::Idle && state != ScaleScreen::Wait)
     {
 	int   steps;
-	float amount, chunk;
-
-	amount = msSinceLastPaint * 0.05f * optionGetSpeed ();
+	float amount, chunk, speed;
+
+	speed = optionGetSkipAnimation() ? USHRT_MAX : optionGetSpeed();
+
+	amount = msSinceLastPaint * 0.05f * speed;
 	steps  = amount / (0.5f * optionGetTimestep ());
 
 	if (!steps)
 
=== modified file 'plugins/showdesktop/showdesktop.xml.in'
--- plugins/showdesktop/showdesktop.xml.in	2013-04-27 15:56:23 +0000
+++ plugins/showdesktop/showdesktop.xml.in	2016-07-14 15:59:00 +0000
@@ -100,6 +100,11 @@
           <_long>Window types that should be moved out of sight when entering showdesktop-mode.</_long>
           <default>type=toolbar | type=utility | type=dialog | type=normal</default>
         </option>
+	<option name="skip_animation" type="bool">
+          <_short>Skip Animation</_short>
+	  <_long>Skips the showdesktop animation.</_long>
+	  <default>false</default>
+	</option>
       </group>
       <group>
         <_short>Appearance</_short>
 
=== modified file 'plugins/showdesktop/src/showdesktop.cpp'
--- plugins/showdesktop/src/showdesktop.cpp	2013-05-09 13:43:07 +0000
+++ plugins/showdesktop/src/showdesktop.cpp	2016-07-14 15:59:00 +0000
@@ -614,10 +614,21 @@
 	(state == SD_STATE_DEACTIVATING))
     {
 	int steps;
-	float amount, chunk;
-
-	amount = msSinceLastPaint * 0.05f * optionGetSpeed ();
-	steps = amount / (0.5f * optionGetTimestep ());
+	float amount, chunk, speed, timestep;
+
+	if (optionGetSkipAnimation())
+	{
+	    speed = USHRT_MAX;
+	    timestep = 0.1;
+	}
+	else
+	{
+	    speed = optionGetSpeed();
+	    timestep = optionGetTimestep();
+	}
+
+	amount = msSinceLastPaint * 0.05f * speed;
+	steps = amount / (0.5f * timestep);
 	if (!steps)
     	    steps = 1;
 	chunk = amount / (float)steps;
 
=== modified file 'src/plugin.cpp'
--- src/plugin.cpp	2015-10-26 17:15:43 +0000
+++ src/plugin.cpp	2016-07-14 15:59:00 +0000
@@ -132,60 +132,6 @@
 }
 
 static bool
-setOpenGLPluginEnvironment ()
-{
-    /*
-     * Check if the hardware is adequate for Unity and if not, use LLVMpipe.
-     * Unfortunately the design of Mesa requires that this be done before
-     * libGL is loaded, which means before the opengl plugin is loaded.
-     */
-    bool toggledLLVM = false;
-
-    if (!getenv ("LIBGL_ALWAYS_SOFTWARE"))
-    {
-	const char *profile = getenv ("COMPIZ_CONFIG_PROFILE");
-	if (profile && strcmp (profile, "ubuntu") == 0)
-	{
-	    int result = system ("/usr/lib/nux/unity_support_test");
-	    int status = WEXITSTATUS (result);
-	    compLogMessage ("core", CompLogLevelInfo,
-		"Unity is %s",
-		status == 0 ?   "fully supported by your hardware." :
-		status == 127 ? "undetectable" :
-		                "not supported by your hardware. "
-		                "Enabling software rendering instead (slow).");
-	    if (status > 0 && status < 127)
-	    {
-		setenv ("LIBGL_ALWAYS_SOFTWARE", "1", 1);
-		toggledLLVM = true;
-	    }
-	}
-    }
-
-    return toggledLLVM;
-}
-
-static void
-unsetUnityshellPluginEnvironment ()
-{
-    unsetenv ("LIBGL_ALWAYS_SOFTWARE");
-}
-
-static void
-setPluginEnvironment (const char *name)
-{
-    if (strcmp (name, "opengl") == 0)
-	setOpenGLPluginEnvironment ();
-}
-
-static void
-unsetPluginEnvironment (const char *name)
-{
-    if (strcmp (name, "unityshell") == 0)
-	unsetUnityshellPluginEnvironment ();
-}
-
-static bool
 dlloaderLoadPlugin (CompPlugin *p,
 		    const char *path,
 		    const char *name)
@@ -197,8 +143,6 @@
     if (cloaderLoadPlugin (p, path, name))
 	return true;
 
-    setPluginEnvironment (name);
-
     if (path)
     {
 	file  = path;
@@ -269,8 +213,6 @@
     if (!loaded && dlhand)
 	dlclose (dlhand);
 
-    unsetPluginEnvironment (name);
-
     return loaded;
 }