Merge lp:~hikiko/unity/unity.lowgfx-2017 into lp:unity

[Eleni Maria Stea]

removes lowgfx option from ccsm, reads the "lowgfx" gsetting (lp:~hikiko/unity-control-center/unity-control-center.lowgfx)

removes lowgfx option from ccsm, reads the "lowgfx" gsetting (lp:~hikiko/unity-control-center/unity-control-center.lowgfx)

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

As said in the UCC branch, please update the compiz profile selector script to use the dconf/gsettings value instead.

This method only relies on unity settings being changed by UCC, while having the check at pre-start script would make unity to use the whole new profile even if configured with just the gsetting key.

review: Needs Fixing

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

Check the comments please

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

Check inline comments

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

Some style fixes as a start please...

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

I've fixed some things here: lp:~3v1n0/unity/lowgfx-fixes

Please merge.

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

This side is fine.

review: Approve

=== modified file 'data/com.canonical.Unity.gschema.xml'
--- data/com.canonical.Unity.gschema.xml	2017-01-25 16:40:35 +0000
+++ data/com.canonical.Unity.gschema.xml	2017-04-05 07:48:49 +0000
@@ -100,6 +100,11 @@
         when authenticating.  Only do this if you have account
         configured properly on your system.</description>
     </key>
+    <key type="b" name="lowgfx">
+      <default>false</default>
+      <summary>Enable/Disable Low Graphics Mode</summary>
+      <description>Whether Unity runs in Low Graphics Mode.</description>
+    </key>
   </schema>
   <schema path="/com/canonical/unity/interface/" id="com.canonical.Unity.Interface" gettext-domain="unity">
     <key type="d" name="text-scale-factor">

=== modified file 'decorations/DecorationsWindowButton.cpp'
--- decorations/DecorationsWindowButton.cpp	2016-08-04 08:53:20 +0000
+++ decorations/DecorationsWindowButton.cpp	2017-04-05 07:48:49 +0000
@@ -45,7 +45,8 @@
 
 void WindowButton::UpdateTexture()
 {
-  SetTexture(DataPool::Get()->ButtonTexture(scale(), type(), GetCurrentState()));
+  if (auto tex = DataPool::Get()->ButtonTexture(scale(), type(), GetCurrentState()))
+    SetTexture(tex);
 }
 
 WidgetState WindowButton::GetCurrentState() const

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2017-02-27 13:47:32 +0000
+++ plugins/unityshell/src/unityshell.cpp	2017-04-05 07:48:49 +0000
@@ -292,23 +292,28 @@
     }
   }
 
-    //In case of software rendering then enable lowgfx mode.
+  //In case of software rendering then enable lowgfx mode.
   std::string renderer = ANSI_TO_TCHAR(NUX_REINTERPRET_CAST(const char *, glGetString(GL_RENDERER)));
-
   if (renderer.find("Software Rasterizer") != std::string::npos ||
       renderer.find("Mesa X11") != std::string::npos ||
       renderer.find("llvmpipe") != std::string::npos ||
       renderer.find("softpipe") != std::string::npos ||
-      (getenv("UNITY_LOW_GFX_MODE") != NULL && atoi(getenv("UNITY_LOW_GFX_MODE")) == 1) ||
-       optionGetLowGraphicsMode())
-    {
-      unity_settings_.low_gfx = true;
-    }
+      (getenv("UNITY_LOW_GFX_MODE") != NULL && atoi(getenv("UNITY_LOW_GFX_MODE")) == 1))
+  {
+    unity_settings_.low_gfx = true;
+  }
 
   if (getenv("UNITY_LOW_GFX_MODE") != NULL && atoi(getenv("UNITY_LOW_GFX_MODE")) == 0)
   {
     unity_settings_.low_gfx = false;
   }
+
+  if (unity_settings_.low_gfx())
+    BackgroundEffectHelper::blur_type = BLUR_NONE;
+
+  Settings::Instance().low_gfx.changed.connect(sigc::track_obj([this] (bool low_gfx) {
+    BackgroundEffectHelper::blur_type = low_gfx ? BLUR_NONE : (unity::BlurType) optionGetDashBlurExperimental();
+  }, *this));
 #endif
 
   if (!failed)
@@ -384,7 +389,6 @@
      optionSetAutohideAnimationNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetDashBlurExperimentalNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetShortcutOverlayNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
-     optionSetLowGraphicsModeNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetShowLauncherInitiate(boost::bind(&UnityScreen::showLauncherKeyInitiate, this, _1, _2, _3));
      optionSetShowLauncherTerminate(boost::bind(&UnityScreen::showLauncherKeyTerminate, this, _1, _2, _3));
      optionSetKeyboardFocusInitiate(boost::bind(&UnityScreen::setKeyboardFocusKeyInitiate, this, _1, _2, _3));
@@ -3751,14 +3755,6 @@
     case UnityshellOptions::ShortcutOverlay:
       shortcut_controller_->SetEnabled(optionGetShortcutOverlay());
       break;
-    case UnityshellOptions::LowGraphicsMode:
-      if (optionGetLowGraphicsMode())
-          BackgroundEffectHelper::blur_type = BLUR_NONE;
-      else
-          BackgroundEffectHelper::blur_type = (unity::BlurType)optionGetDashBlurExperimental();
-
-      unity::Settings::Instance().low_gfx = optionGetLowGraphicsMode();
-      break;
     case UnityshellOptions::DecayRate:
       launcher_options->edge_decay_rate = optionGetDecayRate() * 100;
       break;

=== modified file 'plugins/unityshell/unityshell.xml.in'
--- plugins/unityshell/unityshell.xml.in	2016-07-18 17:20:07 +0000
+++ plugins/unityshell/unityshell.xml.in	2017-04-05 07:48:49 +0000
@@ -160,12 +160,6 @@
                   <_long>Enables possibility to display an overlay showing available mouse and keyboard shortcuts.</_long>
                   <default>true</default>
                 </option>
-
-                <option name="low_graphics_mode"  type="bool">
-                  <_short>Enable Low Graphics Mode</_short>
-                  <_long>Enables low graphics mode regardless of hardware in the system</_long>
-                  <default>false</default>
-                </option>
             </group>
 
             <group>

=== modified file 'tools/compiz-profile-selector.in'
--- tools/compiz-profile-selector.in	2016-09-05 10:46:49 +0000
+++ tools/compiz-profile-selector.in	2017-04-05 07:48:49 +0000
@@ -1,12 +1,27 @@
 #!/bin/bash
-
 set -e
+
+config_dir="$XDG_CONFIG_HOME"
+if [ -z "$config_dir" ]; then
+  config_dir="$HOME/.config"
+fi
+
+default_ini="$config_dir/compiz-1/compizconfig/Default.ini"
+
+if [ -f "$default_ini" ]; then
+  rm "$default_ini"
+fi
+
 compiz_profile="ubuntu"
 
 if ! /usr/lib/nux/unity_support_test -p; then
   compiz_profile="ubuntu-lowgfx"
 fi
 
+if [ "$(gsettings get com.canonical.Unity lowgfx)" == "true" ]; then
+  compiz_profile="ubuntu-lowgfx"
+fi
+
 echo "Using compiz profile '$compiz_profile'"
 
 if [ -n "$UPSTART_SESSION" ]; then

=== modified file 'tools/unity.cmake'
--- tools/unity.cmake	2016-09-01 18:55:15 +0000
+++ tools/unity.cmake	2017-04-05 07:48:49 +0000
@@ -66,6 +66,12 @@
     except:
       pass
 
+    try:
+      if subprocess.check_output('gsettings get com.canonical.Unity lowgfx'.split()) == b'true\n':
+        os.environ['COMPIZ_CONFIG_PROFILE'] = 'ubuntu-lowgfx'
+    except:
+      pass
+
     if not 'DISPLAY' in os.environ:
         # take an optimistic chance and warn about it :)
         print("WARNING: no DISPLAY variable set, setting it to :0")

=== modified file 'unity-shared/BackgroundEffectHelper.cpp'
--- unity-shared/BackgroundEffectHelper.cpp	2016-12-12 08:27:16 +0000
+++ unity-shared/BackgroundEffectHelper.cpp	2017-04-05 07:48:49 +0000
@@ -21,7 +21,6 @@
 #include "BackgroundEffectHelper.h"
 
 #include "TextureCache.h"
-#include "UnitySettings.h"
 
 namespace
 {
@@ -50,9 +49,6 @@
   owner.changed.connect(sigc::mem_fun(this, &BackgroundEffectHelper::OnOwnerChanged));
   TextureCache::GetDefault().themed_invalidated.connect(sigc::mem_fun(this, &BackgroundEffectHelper::LoadTextures));
   LoadTextures();
-
-  if (Settings::Instance().low_gfx())
-    blur_type = BLUR_NONE;
 }
 
 BackgroundEffectHelper::BackgroundEffectHelper()

=== modified file 'unity-shared/UnitySettings.cpp'
--- unity-shared/UnitySettings.cpp	2016-12-20 16:32:03 +0000
+++ unity-shared/UnitySettings.cpp	2017-04-05 07:48:49 +0000
@@ -40,6 +40,7 @@
 const std::string DOUBLE_CLICK_ACTIVATE = "double-click-activate";
 const std::string DESKTOP_TYPE = "desktop-type";
 const std::string PAM_CHECK_ACCOUNT_TYPE = "pam-check-account-type";
+const std::string LOWGFX = "lowgfx";
 
 const std::string LAUNCHER_SETTINGS = "com.canonical.Unity.Launcher";
 const std::string LAUNCHER_POSITION = "launcher-position";
@@ -116,6 +117,10 @@
     for (unsigned i = 0; i < monitors::MAX; ++i)
       em_converters_.emplace_back(std::make_shared<EMConverter>());
 
+    signals_.Add<void, GSettings*, const gchar*>(usettings_, "changed::" + LOWGFX, [this] (GSettings*, const gchar *) {
+      UpdateLowGfx();
+    });
+
     signals_.Add<void, GSettings*, const gchar*>(usettings_, "changed::" + FORM_FACTOR, [this] (GSettings*, const gchar*) {
       CacheFormFactor();
     });
@@ -180,6 +185,7 @@
     UScreen::GetDefault()->changed.connect(sigc::hide(sigc::hide(sigc::mem_fun(this, &Impl::UpdateDPI))));
 
     // The order is important here, DPI is the last thing to be updated
+    UpdateLowGfx();
     UpdateLimSetting();
     UpdateGesturesSetting();
     UpdateTextScaleFactor();
@@ -229,6 +235,11 @@
     cached_launcher_position_ = static_cast<LauncherPosition>(g_settings_get_enum(launcher_settings_, LAUNCHER_POSITION.c_str()));
   }
 
+  void UpdateLowGfx()
+  {
+    parent_->low_gfx = GetLowGfx();
+  }
+
   void UpdateLimSetting()
   {
     parent_->lim_movement_thresold = g_settings_get_uint(lim_settings_, CLICK_MOVEMENT_THRESHOLD.c_str());
@@ -281,6 +292,11 @@
     return g_settings_get_boolean(usettings_, PAM_CHECK_ACCOUNT_TYPE.c_str());
   }
 
+  bool GetLowGfx() const
+  {
+    return g_settings_get_boolean(usettings_, LOWGFX.c_str());
+  }
+
   int GetFontSize() const
   {
     gint font_size;
@@ -329,7 +345,7 @@
     auto const& geo = uscreen->GetMonitorGeometry(monitor);
     auto const& size = uscreen->GetMonitorPhysicalSize(monitor);
     auto scale = DPI_SCALING_STEP;
-      
+
     if ((size.width == 160 && size.height == 90) ||
         (size.width == 160 && size.height == 100) ||
         (size.width == 16 && size.height == 9) ||
@@ -340,7 +356,7 @@
 
     if (size.width > 0 && size.height > 0)
     {
-      const double dpi_x = static_cast<double>(geo.width) / (size.width / 25.4);  
+      const double dpi_x = static_cast<double>(geo.width) / (size.width / 25.4);
       const double dpi_y = static_cast<double>(geo.height) / (size.height / 25.4);
 
       const auto dpi = std::max(dpi_x, dpi_y);
@@ -481,8 +497,7 @@
 //
 
 Settings::Settings()
-  : low_gfx(false)
-  , is_standalone(false)
+  : is_standalone(false)
   , pimpl(new Impl(this))
 {
   if (settings_instance)

=== modified file 'unity-shared/UnitySettings.h'
--- unity-shared/UnitySettings.h	2016-07-04 14:21:00 +0000
+++ unity-shared/UnitySettings.h	2017-04-05 07:48:49 +0000
@@ -76,7 +76,6 @@
   nux::Property<bool> gestures_windows_drag_pinch;
 
   sigc::signal<void> dpi_changed;
-  sigc::signal<void> low_gfx_changed;
   sigc::signal<void> gestures_changed;
 
 private: