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

[Jason Smith]

== 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

=== added file 'manual-tests/NvResumeFromSuspend.txt'
--- manual-tests/NvResumeFromSuspend.txt	1970-01-01 00:00:00 +0000
+++ manual-tests/NvResumeFromSuspend.txt	2012-03-04 13:42:18 +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-02-29 17:05:43 +0000
+++ plugins/unityshell/src/LauncherController.cpp	2012-03-04 13:42:18 +0000
@@ -18,6 +18,7 @@
  *              Tim Penhey <[e-mail]>
  */
 
+#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 #include <libbamf/libbamf.h>
 
@@ -171,6 +172,9 @@
 
   LauncherList launchers;
 
+  GDBusConnection*       dbus_connection_;
+  guint                  resume_signal_id_;
+
   sigc::connection on_expoicon_activate_connection_;
   sigc::connection launcher_key_press_connection_;
   sigc::connection launcher_event_outside_connection_;
@@ -251,6 +255,32 @@
   });
 
   parent_->AddChild(model_.get());
+
+  dbus_connection_ = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, NULL);
+  if (dbus_connection_)
+  {
+    auto handler = [](GDBusConnection* connection,
+                      const gchar*     sender_name,
+                      const gchar*     object_path,
+                      const gchar*     interface_name,
+                      const gchar*     signal_name,
+                      GVariant*        parameters,
+                      gpointer         user_data) {
+      Controller::Impl* self = static_cast<Controller::Impl*>(user_data);
+      for (auto launcher : self->launchers)
+        launcher->QueueDraw();
+    };
+    resume_signal_id_ = g_dbus_connection_signal_subscribe(dbus_connection_,
+                                                           "org.freedesktop.UPower",     // sender
+                                                           "org.freedesktop.UPower",     // interface
+                                                           "Resuming",                   // member
+                                                           "/org/freedesktop/UPower",    // path
+                                                           NULL,                         // arg0
+                                                           G_DBUS_SIGNAL_FLAGS_NONE,
+                                                           handler,
+                                                           this,
+                                                           NULL);
+  }
 }
 
 Controller::Impl::~Impl()
@@ -261,6 +291,16 @@
   if (matcher_ != nullptr && on_view_opened_id_ != 0)
     g_signal_handler_disconnect((gpointer) matcher_, on_view_opened_id_);
 
+  if (dbus_connection_)
+  {
+    if (resume_signal_id_)
+      g_dbus_connection_signal_unsubscribe(dbus_connection_, resume_signal_id_);
+
+    g_object_unref(dbus_connection_);
+    dbus_connection_ = nullptr;
+    resume_signal_id_ = 0;
+  }
+
   delete device_section_;
 }