Merge lp:~jassmith/unity/unity.redraw-on-resume into lp:unity

[Jason Smith]

Repaint the launcher on resume from suspend.

== The Problem ==
Unity paints a corrupted texture on screen after resume from suspend until it is redraw on Nvidia based system

== The Solutins ==
Repaint the launcher on resume from suspend (this seems to be the problem child)

== Testing ==
Manual test included. Automatic testing not really reasonable due to the nature of the issue (driver hack-a-round)

[Gord Allott (gordallott)]

+1

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

Why not using glib::DBusProxy ?
It would allow a cleaner implementation...

review: Needs Information

[Marco Trevisan (Treviño) (3v1n0)]

Also, maybe we could just make this go in: https://code.launchpad.net/~smspillaz/unity/unity.half_fix_883836/+merge/85800

And integrate this change into that utility function (that I also had used for some panel stuff).

[Omer Akram (om26er)]

bump?

[Tim Penhey (thumper)]

Why add <gio/gio.h> ?

Instead of assigning, use reset:

proxy_.reset(new unity::glib::DBusProxy("org.freedesktop.UPower",
                                        "/org/freedesktop/UPower",
                                        "org.freedesktop.UPower",
                                        G_BUS_TYPE_SYSTEM);

Since you use a lambda function, and not sigc::mem_fun, this won't be automatically disconnected when the launcher controller dies. Could there be a situation where this occurs? Or not?

review: Needs Fixing

[Tim Penhey (thumper)]

Since this is a high priority bug, and a very slim defined race condition, I've just filed bug 971155 and we'll land this.

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== added file 'manual-tests/NvResumeFromSuspend.txt'
--- manual-tests/NvResumeFromSuspend.txt	1970-01-01 00:00:00 +0000
+++ manual-tests/NvResumeFromSuspend.txt	2012-03-29 20:11:20 +0000
@@ -0,0 +1,11 @@
+Nvidia resume from suspend corruption
+----------
+This test ensures the screen is not corrupted after resume from suspend on nvidia cards.
+
+#. Ensure unity is running on a machine with a nvidia GPU using the proprietary nvidia driver
+#. Put the machine to sleep
+#. Resume the machine from sleep
+#. Observe the area where the launcher would normally show
+
+Outcome:
+  The screen should not display any visual corruption once X is finished updating after a resume.

=== modified file 'plugins/unityshell/src/LauncherController.cpp'
--- plugins/unityshell/src/LauncherController.cpp	2012-03-28 02:42:13 +0000
+++ plugins/unityshell/src/LauncherController.cpp	2012-03-29 20:11:20 +0000
@@ -18,6 +18,7 @@
  *              Tim Penhey <[e-mail]>
  */
 
+#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 #include <libbamf/libbamf.h>
 
@@ -261,6 +262,11 @@
   });
 
   parent_->AddChild(model_.get());
+
+  uscreen->resuming.connect([&]() -> void {
+    for (auto launcher : launchers)
+      launcher->QueueDraw();
+  });
 }
 
 Controller::Impl::~Impl()

=== modified file 'plugins/unityshell/src/UScreen.cpp'
--- plugins/unityshell/src/UScreen.cpp	2012-03-14 06:24:18 +0000
+++ plugins/unityshell/src/UScreen.cpp	2012-03-29 20:11:20 +0000
@@ -32,6 +32,9 @@
                    (GCallback)UScreen::Changed, this);
 
   Refresh();
+
+  proxy_ = unity::glib::DBusProxy::Ptr(new unity::glib::DBusProxy("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.UPower", G_BUS_TYPE_SYSTEM));
+  proxy_->Connect("Resuming", [&](GVariant* data) -> void { resuming.emit(); });
 }
 
 UScreen::~UScreen()

=== modified file 'plugins/unityshell/src/UScreen.h'
--- plugins/unityshell/src/UScreen.h	2012-03-14 06:24:18 +0000
+++ plugins/unityshell/src/UScreen.h	2012-03-29 20:11:20 +0000
@@ -24,6 +24,8 @@
 #include <sigc++/sigc++.h>
 #include <vector>
 
+#include "UnityCore/GLibDBusProxy.h"
+
 class UScreen : public sigc::trackable
 {
 public:
@@ -41,6 +43,8 @@
   // <void, primary_monitor, monitors>
   sigc::signal<void, int, std::vector<nux::Geometry>&> changed;
 
+  sigc::signal<void> resuming;
+
 private:
   static void     Changed(GdkScreen* screen, UScreen* self);
   static gboolean OnIdleChanged(UScreen* self);
@@ -50,6 +54,7 @@
   std::vector<nux::Geometry> _monitors;
   guint32 _refresh_id;
   int primary_;
+  unity::glib::DBusProxy::Ptr proxy_;
 };
 
 #endif // _UNITY_SCREEN_H_