Merge lp:~azzar1/unity/clear-color-buffer-before-suspending into lp:unity

[Andrea Azzarone]

Wait until the color buffer is cleared before suspending.

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

Looks good... Let's get it!

review: Approve

=== modified file 'lockscreen/LockScreenController.cpp'
--- lockscreen/LockScreenController.cpp	2017-09-19 18:10:01 +0000
+++ lockscreen/LockScreenController.cpp	2017-09-19 18:10:01 +0000
@@ -76,6 +76,8 @@
   , blank_window_animator_(IDLE_FADE_DURATION)
   , test_mode_(test_mode)
   , prompt_activation_(false)
+  , is_paint_inhibited_(false)
+  , buffer_cleared_(true)
 {
   auto* uscreen = UScreen::GetDefault();
   uscreen_connection_ = uscreen->changed.connect([this] (int, std::vector<nux::Geometry> const& monitors) {
@@ -93,7 +95,13 @@
   suspend_inhibitor_manager_->connected.connect(sigc::mem_fun(this, &Controller::SyncInhibitor));
   suspend_inhibitor_manager_->about_to_suspend.connect([this] () {
     if (Settings::Instance().lock_on_suspend())
+    {
+      InhibitPaint();
       session_manager_->PromptLockScreen();
+    }
+  });
+  suspend_inhibitor_manager_->resumed.connect([this] () {
+    UninhibitPaint();
   });
 
   Settings::Instance().lock_on_suspend.changed.connect(sigc::hide(sigc::mem_fun(this, &Controller::SyncInhibitor)));
@@ -556,6 +564,36 @@
   return primary_shield_.IsValid() ? primary_shield_->IsIndicatorOpen() : false;
 }
 
+void Controller::InhibitPaint()
+{
+  buffer_cleared_ = false;
+  is_paint_inhibited_ = true;
+}
+
+void Controller::UninhibitPaint()
+{
+  if (!is_paint_inhibited_)
+    return;
+
+  buffer_cleared_ = true;
+  is_paint_inhibited_ = false;
+  SyncInhibitor();
+}
+
+bool Controller::IsPaintInhibited() const
+{
+  return is_paint_inhibited_;
+}
+
+void Controller::MarkBufferHasCleared()
+{
+  if (buffer_cleared_)
+    return;
+
+  buffer_cleared_ = true;
+  SyncInhibitor();
+}
+
 void Controller::SyncInhibitor()
 {
   bool locked = IsLocked() && primary_shield_.IsValid() && primary_shield_->GetOpacity() == 1.0f;
@@ -566,7 +604,7 @@
 
   if (inhibit)
     suspend_inhibitor_manager_->Inhibit("Unity needs to lock the screen");
-  else
+  else if (buffer_cleared_)
     suspend_inhibitor_manager_->Uninhibit();
 }
 

=== modified file 'lockscreen/LockScreenController.h'
--- lockscreen/LockScreenController.h	2017-09-19 18:10:01 +0000
+++ lockscreen/LockScreenController.h	2017-09-19 18:10:01 +0000
@@ -56,6 +56,8 @@
 
   bool IsLocked() const;
   bool HasOpenMenu() const;
+  bool IsPaintInhibited() const;
+  void MarkBufferHasCleared();
 
 private:
   friend class TestLockScreenController;
@@ -82,6 +84,9 @@
   void OnLockScreenInputEvent(XEvent const&);
   void OnBlankWindowInputEvent(XEvent const&);
 
+  void InhibitPaint();
+  void UninhibitPaint();
+
   std::vector<nux::ObjectPtr<BaseShield>> shields_;
   nux::ObjectWeakPtr<BaseShield> primary_shield_;
   nux::ObjectWeakPtr<AbstractUserPromptView> prompt_view_;
@@ -104,6 +109,8 @@
   bool test_mode_;
   bool prompt_activation_;
   BlurType old_blur_type_;
+  bool is_paint_inhibited_;
+  bool buffer_cleared_;
 
   connection::Wrapper uscreen_connection_;
   connection::Wrapper hidden_window_connection_;

=== modified file 'lockscreen/SuspendInhibitorManager.cpp'
--- lockscreen/SuspendInhibitorManager.cpp	2016-03-31 09:59:30 +0000
+++ lockscreen/SuspendInhibitorManager.cpp	2017-09-19 18:10:01 +0000
@@ -60,6 +60,8 @@
   lm_proxy_->Connect("PrepareForSleep", [this] (GVariant* variant) {
     if (glib::Variant(variant).GetBool())
       parent_->about_to_suspend.emit();
+    else
+      parent_->resumed.emit();
   });
 
   lm_proxy_->connected.connect(sigc::mem_fun(&parent->connected, &decltype(parent->connected)::emit));

=== modified file 'lockscreen/SuspendInhibitorManager.h'
--- lockscreen/SuspendInhibitorManager.h	2016-03-31 09:59:30 +0000
+++ lockscreen/SuspendInhibitorManager.h	2017-09-19 18:10:01 +0000
@@ -42,6 +42,7 @@
 
   sigc::signal<void> connected;
   sigc::signal<void> about_to_suspend;
+  sigc::signal<void> resumed;
 
 private:
   class Impl;

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2017-07-17 10:53:40 +0000
+++ plugins/unityshell/src/unityshell.cpp	2017-09-19 18:10:01 +0000
@@ -1496,6 +1496,13 @@
                                 CompOutput* output,
                                 unsigned int mask)
 {
+  if (G_UNLIKELY(lockscreen_controller_->IsPaintInhibited()))
+  {
+    CHECKGL(glClearColor(0.0f, 0.0f, 0.0f, 1.0f));
+    CHECKGL(glClear(GL_COLOR_BUFFER_BIT));
+    return true;
+  }
+
   bool ret;
 
   /*
@@ -1692,6 +1699,11 @@
 
 void UnityScreen::donePaint()
 {
+  if (G_UNLIKELY(lockscreen_controller_->IsPaintInhibited()))
+  {
+    lockscreen_controller_->MarkBufferHasCleared();
+  }
+
   /*
    * It's only safe to clear the draw list if drawing actually occurred
    * (i.e. the shell was not obscured behind a fullscreen window).