Merge lp:~3v1n0/unity/compiz-average-color into lp:unity

[Marco Trevisan (Treviño)]

BGHash, UnityScreen: get desktop averageColor from compiz

compiz now supports getting this value, let's use it instead of
doing this again here.

Depends on lp:~3v1n0/compiz/support-desktop-average-colors

[lp:~3v1n0/unity/compiz-average-color]

4246. By Marco Trevisan (Treviño) on 2017-06-30

debian/control: increase build-dependency on latest compiz-dev

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

[lp:~3v1n0/unity/compiz-average-color]

4247. By Marco Trevisan (Treviño) on 2017-07-03

UnityScreen: ensure we set the proper decoration options on startup

4248. By Marco Trevisan (Treviño) on 2017-07-03

debian/control: add build dependency on dbus-x11

=== modified file 'debian/control'
--- debian/control	2017-06-19 09:00:18 +0000
+++ debian/control	2017-07-03 15:31:53 +0000
@@ -3,9 +3,10 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake,
-               compiz-dev (>= 1:0.9.12.2),
+               compiz-dev (>= 1:0.9.13.1+17.10.20170630),
                debhelper (>= 9.0.0~),
                dbus-test-runner,
+               dbus-x11,
                dh-migrations,
                dh-translations (>= 94),
                dh-python,

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2017-04-05 07:58:57 +0000
+++ plugins/unityshell/src/unityshell.cpp	2017-07-03 15:31:53 +0000
@@ -482,9 +482,10 @@
 
     Introspectable::AddChild(deco_manager_.get());
     auto const& deco_style = decoration::Style::Get();
-    auto deco_style_cb = sigc::hide(sigc::mem_fun(this, &UnityScreen::OnDecorationStyleChanged));
+    auto deco_style_cb = sigc::hide(sigc::mem_fun(this, &UnityScreen::UpdateDecorationStyle));
     deco_style->theme.changed.connect(deco_style_cb);
     deco_style->title_font.changed.connect(deco_style_cb);
+    UpdateDecorationStyle();
 
     minimize_speed_controller_.DurationChanged.connect(
       sigc::mem_fun(this, &UnityScreen::OnMinimizeDurationChanged)
@@ -864,17 +865,28 @@
   wy = y + (last_bound.height - height) / 2;
 }
 
-void UnityScreen::OnDecorationStyleChanged()
+void UnityScreen::UpdateDecorationStyle()
 {
   for (UnityWindow* uwin : fake_decorated_windows_)
     uwin->CleanupCachedTextures();
 
-  auto const& style = decoration::Style::Get();
-  deco_manager_->shadow_offset = style->ShadowOffset();
-  deco_manager_->active_shadow_color = style->ActiveShadowColor();
-  deco_manager_->active_shadow_radius = style->ActiveShadowRadius();
-  deco_manager_->inactive_shadow_color = style->InactiveShadowColor();
-  deco_manager_->inactive_shadow_radius = style->InactiveShadowRadius();
+  if (optionGetOverrideDecorationTheme())
+  {
+    deco_manager_->active_shadow_color = NuxColorFromCompizColor(optionGetActiveShadowColor());
+    deco_manager_->inactive_shadow_color = NuxColorFromCompizColor(optionGetInactiveShadowColor());
+    deco_manager_->active_shadow_radius = optionGetActiveShadowRadius();
+    deco_manager_->inactive_shadow_radius = optionGetInactiveShadowRadius();
+    deco_manager_->shadow_offset = nux::Point(optionGetShadowXOffset(), optionGetShadowYOffset());
+  }
+  else
+  {
+    auto const& style = decoration::Style::Get();
+    deco_manager_->shadow_offset = style->ShadowOffset();
+    deco_manager_->active_shadow_color = style->ActiveShadowColor();
+    deco_manager_->active_shadow_radius = style->ActiveShadowRadius();
+    deco_manager_->inactive_shadow_color = style->InactiveShadowColor();
+    deco_manager_->inactive_shadow_radius = style->InactiveShadowRadius();
+  }
 }
 
 void UnityScreen::DamageBlurUpdateRegion(nux::Geometry const& blur_update)
@@ -2061,13 +2073,6 @@
     case MapRequest:
       ShowdesktopHandler::InhibitLeaveShowdesktopMode (event->xmaprequest.window);
       break;
-    case PropertyNotify:
-      if (bghash_ && event->xproperty.window == GDK_ROOT_WINDOW() &&
-          event->xproperty.atom == bghash_->ColorAtomId())
-      {
-        bghash_->RefreshColor();
-      }
-      break;
     default:
         if (screen->shapeEvent() + ShapeNotify == event->type)
         {
@@ -3617,43 +3622,16 @@
       break;
     }
     case UnityshellOptions::OverrideDecorationTheme:
-      if (optionGetOverrideDecorationTheme())
-      {
-        deco_manager_->active_shadow_color = NuxColorFromCompizColor(optionGetActiveShadowColor());
-        deco_manager_->inactive_shadow_color = NuxColorFromCompizColor(optionGetInactiveShadowColor());
-        deco_manager_->active_shadow_radius = optionGetActiveShadowRadius();
-        deco_manager_->inactive_shadow_radius = optionGetInactiveShadowRadius();
-        deco_manager_->shadow_offset = nux::Point(optionGetShadowXOffset(), optionGetShadowYOffset());
-      }
-      else
-      {
-        OnDecorationStyleChanged();
-      }
-      break;
     case UnityshellOptions::ActiveShadowColor:
-      if (optionGetOverrideDecorationTheme())
-        deco_manager_->active_shadow_color = NuxColorFromCompizColor(optionGetActiveShadowColor());
-      break;
+    case UnityshellOptions::ActiveShadowRadius:
     case UnityshellOptions::InactiveShadowColor:
-      if (optionGetOverrideDecorationTheme())
-        deco_manager_->inactive_shadow_color = NuxColorFromCompizColor(optionGetInactiveShadowColor());
-      break;
-    case UnityshellOptions::ActiveShadowRadius:
-      if (optionGetOverrideDecorationTheme())
-        deco_manager_->active_shadow_radius = optionGetActiveShadowRadius();
-      break;
     case UnityshellOptions::InactiveShadowRadius:
-      if (optionGetOverrideDecorationTheme())
-        deco_manager_->inactive_shadow_radius = optionGetInactiveShadowRadius();
-      break;
     case UnityshellOptions::ShadowXOffset:
-      if (optionGetOverrideDecorationTheme())
-        deco_manager_->shadow_offset = nux::Point(optionGetShadowXOffset(), optionGetShadowYOffset());
-      break;
     case UnityshellOptions::ShadowYOffset:
-      if (optionGetOverrideDecorationTheme())
-        deco_manager_->shadow_offset = nux::Point(optionGetShadowXOffset(), optionGetShadowYOffset());
+    {
+      UpdateDecorationStyle();
       break;
+    }
     case UnityshellOptions::LauncherHideMode:
     {
       launcher_options->hide_mode = (launcher::LauncherHideMode) optionGetLauncherHideMode();
@@ -3854,6 +3832,12 @@
   ScheduleRelayout(500);
 }
 
+void UnityScreen::averageColorChangeNotify(const unsigned short *color)
+{
+  bghash_->UpdateColor(color, nux::animation::Animation::State::Running);
+  screen->averageColorChangeNotify (color);
+}
+
 bool UnityScreen::layoutSlotsAndAssignWindows()
 {
   auto const& scaled_windows = sScreen->getWindows();
@@ -4078,6 +4062,7 @@
   nux::GetWindowCompositor().sigHiddenViewWindow.connect(sigc::mem_fun(this, &UnityScreen::OnViewHidden));
 
   bghash_.reset(new BGHash());
+  bghash_->UpdateColor(screen->averageColor(), nux::animation::Animation::State::Stopped);
   LOG_INFO(logger) << "InitUnityComponents-BGHash " << timer.ElapsedSeconds() << "s";
 
   auto xdnd_collection_window = std::make_shared<XdndCollectionWindowImp>();

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2017-01-09 15:09:26 +0000
+++ plugins/unityshell/src/unityshell.h	2017-07-03 15:31:53 +0000
@@ -163,6 +163,7 @@
   bool initPluginForScreen(CompPlugin* p) override;
 
   void outputChangeNotify() override;
+  void averageColorChangeNotify(const unsigned short *color) override;
 
   CompAction::Vector& getActions() override;
 
@@ -282,7 +283,7 @@
 
   bool SaveInputThenFocus(const guint xid);
 
-  void OnDecorationStyleChanged();
+  void UpdateDecorationStyle();
 
   void InitGesturesSupport();
   void UpdateGesturesSupport();

=== modified file 'tools/CMakeLists.txt'
--- tools/CMakeLists.txt	2017-03-27 19:33:50 +0000
+++ tools/CMakeLists.txt	2017-07-03 15:31:53 +0000
@@ -21,7 +21,7 @@
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CFLAGS}")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CFLAGS}")
 
-set(LIBS ${UAPSC_DEPS_LIBRARIES})
+set(LIBS ${UAPSC_DEPS_LIBRARIES} -lm)
 
 set(LIB_PATHS ${UAPSC_DEPS_LIBRARY_DIRS})
 link_directories(${LIB_PATHS})

=== modified file 'tools/compiz_config_profile_setter.c'
--- tools/compiz_config_profile_setter.c	2017-04-25 17:58:23 +0000
+++ tools/compiz_config_profile_setter.c	2017-07-03 15:31:53 +0000
@@ -130,7 +130,7 @@
 static gboolean
 set_compiz_profile (CCSContext *ccs_context, const gchar *profile_name)
 {
-  CCSPluginList plugins;
+  CCSPluginList plugins, p;
   const char *ccs_backend;
 
   ccs_backend = ccsGetBackend (ccs_context);
@@ -144,7 +144,7 @@
 
   plugins = ccsContextGetPlugins (ccs_context);
 
-  for (CCSPluginList p = plugins; p; p = p->next)
+  for (p = plugins; p; p = p->next)
     {
       CCSPlugin* plugin = p->data;
       ccsReadPluginSettings (plugin);

=== modified file 'unity-shared/BGHash.cpp'
--- unity-shared/BGHash.cpp	2016-07-04 14:51:28 +0000
+++ unity-shared/BGHash.cpp	2017-07-03 15:31:53 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2012 Canonical Ltd
+ * Copyright (C) 2011-2017 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Gordon Allott <[e-mail]>
+ *              Marco Trevisan <[e-mail]>
  */
 
 
@@ -23,18 +24,13 @@
 #include "unity-shared/UnitySettings.h"
 #include "unity-shared/WindowManager.h"
 
-#ifndef XA_STRING
-#define XA_STRING ((Atom) 31)
-#endif
-
-DECLARE_LOGGER(logger, "unity.bghash");
+namespace na = nux::animation;
 
 namespace unity
 {
-
 namespace
 {
-  Atom COLORS_ATOM = 0;
+  DECLARE_LOGGER(logger, "unity.bghash");
   const unsigned TRANSITION_DURATION = 500;
 }
 
@@ -42,77 +38,44 @@
   : transition_animator_(Settings::Instance().low_gfx() ? 0 : TRANSITION_DURATION)
   , override_color_(nux::color::Transparent)
 {
-  COLORS_ATOM = gdk_x11_get_xatom_by_name("_GNOME_BACKGROUND_REPRESENTATIVE_COLORS");
   transition_animator_.updated.connect(sigc::mem_fun(this, &BGHash::OnTransitionUpdated));
   WindowManager::Default().average_color = unity::colors::Aubergine;
-  RefreshColor(/* skip_animation */ true);
 
   Settings::Instance().low_gfx.changed.connect(sigc::track_obj([this] (bool low_gfx) {
     transition_animator_.SetDuration(low_gfx ? 0 : TRANSITION_DURATION);
   }, *this));
 }
 
-uint64_t BGHash::ColorAtomId() const
-{
-  return COLORS_ATOM;
-}
-
 void BGHash::OverrideColor(nux::Color const& color)
 {
   override_color_ = color;
-  RefreshColor();
+  TransitionToNewColor(override_color_, nux::animation::Animation::State::Running);
 }
 
-void BGHash::RefreshColor(bool skip_animation)
+void BGHash::UpdateColor(const unsigned short *color, na::Animation::State animate)
 {
   if (override_color_.alpha > 0.0f)
   {
-    TransitionToNewColor(override_color_, skip_animation);
-    return;
-  }
-
-  // XXX: move this part to PluginAdapter
-  Atom         real_type;
-  gint         result;
-  gint         real_format;
-  gulong       items_read;
-  gulong       items_left;
-  gchar*       colors;
-  Display*     display;
-  GdkRGBA      color_gdk;
-
-  colors = nullptr;
-  display = gdk_x11_display_get_xdisplay(gdk_display_get_default());
-
-  gdk_error_trap_push();
-  result = XGetWindowProperty (display,
-             GDK_ROOT_WINDOW(),
-             COLORS_ATOM,
-             0L,
-             G_MAXLONG,
-             False,
-             XA_STRING,
-             &real_type,
-             &real_format,
-             &items_read,
-             &items_left,
-             (guchar **) &colors);
-  gdk_flush ();
-  gdk_error_trap_pop_ignored ();
-
-  if (result == Success && items_read)
-  {
-    gdk_rgba_parse(&color_gdk, colors);
-    nux::Color new_color(color_gdk.red, color_gdk.green, color_gdk.blue, 1.0f);
-    TransitionToNewColor(MatchColor(new_color), skip_animation);
-  }
-
-  XFree(colors);
+    TransitionToNewColor(override_color_, animate);
+    return;
+  }
+
+  if (!color)
+    return;
+
+  nux::Color new_color;
+  const double MAX_USHORT = std::numeric_limits<unsigned short>::max ();
+  new_color.red = color[0] / MAX_USHORT;
+  new_color.green = color[1] / MAX_USHORT;
+  new_color.blue = color[2] / MAX_USHORT;
+
+  TransitionToNewColor(MatchColor(new_color), animate);
 }
 
-void BGHash::TransitionToNewColor(nux::color::Color const& new_color, bool skip_animation)
+void BGHash::TransitionToNewColor(nux::color::Color const& new_color, na::Animation::State animate)
 {
   auto const& current_color = WindowManager::Default().average_color();
+  bool skip_animation = (animate != na::Animation::State::Running);
   LOG_DEBUG(logger) << "transitioning from: " << current_color.red << " to " << new_color.red;
 
   transition_animator_.Stop();

=== modified file 'unity-shared/BGHash.h'
--- unity-shared/BGHash.h	2016-07-04 14:51:28 +0000
+++ unity-shared/BGHash.h	2017-07-03 15:31:53 +0000
@@ -36,14 +36,13 @@
     BGHash();
 
     nux::Color CurrentColor() const;
-    uint64_t ColorAtomId() const;
-    void RefreshColor(bool skip_animation = false);
+    void UpdateColor(const unsigned short *compiz_color, nux::animation::Animation::State);
     void OverrideColor(nux::Color const& color);
 
   private:
+    void TransitionToNewColor(nux::Color const& new_color, nux::animation::Animation::State);
+    nux::Color MatchColor(nux::Color const& base_color) const;
     void OnTransitionUpdated(nux::Color const& new_color);
-    void TransitionToNewColor(nux::Color const& new_color, bool skip_animation = false);
-    nux::Color MatchColor(nux::Color const& base_color) const;
 
   private:
     nux::animation::AnimateValue<nux::Color> transition_animator_;