Merge lp:~hikiko/unity/unity.ui-scale-factor into lp:unity

[Eleni Maria Stea]

scaling desktop according to a scale factor

scaling desktop according to a scale factor

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3674
http://jenkins.qa.ubuntu.com/job/unity-ci/698/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/234
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/230
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/232

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/698/rebuild

review: Approve (continuous-integration)

[Andrea Azzarone (azzar1)]

Can you revert that changes in po/*?

[Stephen M. Webb (bregma)]

Needs .po file changes reverted and merge with trunk.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3681
http://jenkins.qa.ubuntu.com/job/unity-ci/699/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/235
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/231
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/233

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/699/rebuild

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

OK, works getting the gsetting to affect Unity, LGTM and build on it.

review: Approve

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

474 + g_object_unref(gsettings_);
475 + g_object_unref(ubuntu_settings_);
476 + g_object_unref(usettings_);
477 + g_object_unref(lim_settings_);

Please get rid of them, we're already doing it as they're glib::Object

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3682
http://jenkins.qa.ubuntu.com/job/unity-ci/700/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/236
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/232
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/234

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/700/rebuild

review: Approve (continuous-integration)

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

+1

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-02-20 07:08:01 +0000
+++ debian/control	2014-02-21 17:06:30 +0000
@@ -11,6 +11,7 @@
                google-mock (>= 1.6.0+svn437),
                google-mock,
                gsettings-desktop-schemas-dev,
+               gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140219),
                intltool (>= 0.35.0),
                libatk1.0-dev,
                libbamf3-dev (>= 0.5.0+13.10.20130731),

=== modified file 'unity-shared/CMakeLists.txt'
--- unity-shared/CMakeLists.txt	2014-02-17 04:01:26 +0000
+++ unity-shared/CMakeLists.txt	2014-02-21 17:06:30 +0000
@@ -19,7 +19,6 @@
 set (UNITY_SHARED_SOURCES
      ApplicationManager.cpp
      BGHash.cpp
-     ConfigParser.cpp
      CoverArt.cpp
      BackgroundEffectHelper.cpp
      DashStyle.cpp

=== removed file 'unity-shared/ConfigParser.cpp'
--- unity-shared/ConfigParser.cpp	2014-02-03 18:46:31 +0000
+++ unity-shared/ConfigParser.cpp	1970-01-01 00:00:00 +0000
@@ -1,287 +0,0 @@
-/*
- * Copyright (C) 2014 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Eleni Maria Stea <[e-mail]>
- */
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "ConfigParser.h"
-
-static char *strip_whitespace (char *buf);
-
-/* Linked List */
-
-struct Node {
-  char *key;
-  char *value;
-
-  struct Node *next;
-};
-
-/* ConfigString */
-
-struct ConfigString {
-  struct Node *list;
-  char *string;
-};
-
-ConfigString *cfgstr_create (const char *orig_str)
-{
-  char *sptr, *str;
-
-  str = (char*)alloca(strlen(orig_str) + 1);
-  strcpy(str, orig_str);
-
-  ConfigString *cfgstr;
-  if (!(cfgstr = (ConfigString*)malloc(sizeof *cfgstr)))
-    return 0;
-
-  cfgstr->list = NULL;
-  cfgstr->string = NULL;
-
-  sptr = str;
-  while (sptr && *sptr != 0)
-  {
-    char *key, *value, *end, *start, *vstart;
-    struct Node *node;
-
-    if (*sptr == ';')
-    {
-      sptr++;
-      continue;
-    }
-
-    start = sptr;
-    if ((end = strchr(start, ';')))
-    {
-      *end = 0;
-      sptr = end + 1;
-    }
-    else
-    {
-      sptr = NULL;
-    }
-
-    /* parse key/value from the string */
-    if (!(vstart = strchr(start, '=')))
-    {
-      fprintf(stderr, "%s: invalid key-value pair: %s\n", __func__, start);
-      cfgstr_destroy(cfgstr);
-      return 0;
-    }
-    *vstart++ = 0;  /* terminate the key part and move the pointer to the start of the value */
-
-    start = strip_whitespace(start);
-    vstart = strip_whitespace(vstart);
-
-    if (!(key = (char*)malloc(strlen(start) + 1)))
-    {
-      cfgstr_destroy(cfgstr);
-      return 0;
-    }
-
-    if (!(value = (char*)malloc(strlen(vstart) + 1)))
-    {
-      free(key);
-      cfgstr_destroy(cfgstr);
-      return 0;
-    }
-
-    strcpy(key, start);
-    strcpy(value, vstart);
-
-    /* create new list node and add to the list */
-    if (!(node = (Node*)malloc(sizeof *node)))
-    {
-      free(key);
-      free(value);
-      cfgstr_destroy(cfgstr);
-      return 0;
-    }
-
-    node->key = key;
-    node->value = value;
-    node->next = cfgstr->list;
-    cfgstr->list = node;
-  }
-
-  return cfgstr;
-}
-
-void cfgstr_destroy (ConfigString *cfgstr)
-{
-  if (!cfgstr)
-    return;
-
-  while (cfgstr->list)
-  {
-    struct Node *node = cfgstr->list;
-    cfgstr->list = cfgstr->list->next;
-    free(node->key);
-    free(node->value);
-    free(node);
-  }
-  free(cfgstr->string);
-  free(cfgstr);
-}
-
-const char *cfgstr_get_string (const ConfigString *cfgstr)
-{
-  int len;
-  const struct Node *node;
-  char *end;
-
-  free(cfgstr->string);
-
-  /* determine the string size */
-  len = 0;
-  node = cfgstr->list;
-  while (node)
-  {
-    len += strlen(node->key) + strlen(node->value) + 2;
-    node = node->next;
-  }
-
-  if (!(((ConfigString*)cfgstr)->string = (char*)malloc(len + 1)))
-    return 0;
-
-  end = cfgstr->string;
-  node = cfgstr->list;
-
-  while (node)
-  {
-    end += sprintf(end, "%s=%s;", node->key, node->value);
-    node = node->next;
-  }
-
-  return cfgstr->string;
-}
-
-static struct Node *find_node(struct Node *node, const char *key)
-{
-  while (node)
-  {
-    if (strcmp(node->key, key) == 0)
-      return node;
-
-    node = node->next;
-  }
-  return 0;
-}
-
-const char *cfgstr_get (const ConfigString *cfgstr, const char *key)
-{
-  struct Node *node = find_node(cfgstr->list, key);
-  if (!node)
-    return 0;
-
-  return node->value;
-}
-
-float cfgstr_get_float (const ConfigString *cfgstr, const char *key)
-{
-  const char *val_str = cfgstr_get(cfgstr, key);
-  return val_str ? atof(val_str) : 0;
-}
-
-int cfgstr_get_int (const ConfigString *cfgstr, const char *key)
-{
-  const char *val_str = cfgstr_get(cfgstr, key);
-  return val_str ? atoi(val_str) : 0;
-}
-
-/*
- * returns:
- * -1: on error
- *  0: successfuly updated value
- *  1: added new key-value pair
- * */
-
-int cfgstr_set (ConfigString *cfgstr, const char *key, const char *value)
-{
-  char *new_val;
-  struct Node *node = find_node(cfgstr->list, key);
-  if (!node)
-  {
-    if ((!(node = (Node*)malloc(sizeof *node))))
-      return -1;
-
-    if ((!(node->key = (char*)malloc(strlen(key) + 1))))
-    {
-      free(node);
-      return -1;
-    }
-
-    if ((!(node->value = (char*)malloc(strlen(value) + 1))))
-    {
-      free(node->key);
-      free(node);
-      return -1;
-    }
-
-    strcpy(node->key, key);
-    strcpy(node->value, value);
-    node->next = cfgstr->list;
-    cfgstr->list = node;
-
-    return 1;
-  }
-
-  if ((!(new_val = (char*)malloc(strlen(value) + 1))))
-    return -1;
-
-  strcpy(new_val, value);
-  free(node->value);
-  node->value = new_val;
-  return 0;
-}
-
-int cfgstr_set_float (ConfigString *cfgstr, const char *key, float value)
-{
-  char buf[512];
-  snprintf(buf, sizeof buf, "%f", value);
-  buf[sizeof buf - 1] = 0; /* make sure it's null terminated */
-
-  return cfgstr_set(cfgstr, key, buf);
-}
-
-int cfgstr_set_int (ConfigString *cfgstr, const char *key, int value)
-{
-  char buf[32];
-  snprintf(buf, sizeof buf, "%d", value);
-  buf[sizeof buf - 1] = 0; /* make sure it's null terminated */
-
-  return cfgstr_set(cfgstr, key, buf);
-}
-
-static char *strip_whitespace (char *buf)
-{
-  while (*buf && isspace(*buf))
-    buf++;
-
-  if (!*buf)
-    return 0;
-
-  char *end = buf + strlen(buf) - 1;
-  while (end > buf && isspace(*end))
-    end--;
-
-  end[1] = 0;
-  return buf;
-}

=== removed file 'unity-shared/ConfigParser.h'
--- unity-shared/ConfigParser.h	2014-02-03 10:18:52 +0000
+++ unity-shared/ConfigParser.h	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2014 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Eleni Maria Stea <[e-mail]>
- */
-
-#ifndef CONFIG_PARSER_H_
-#define CONFIG_PARSER_H_
-
-typedef struct ConfigString ConfigString;
-
-ConfigString *cfgstr_create (const char *str);
-void cfgstr_destroy (ConfigString *cfgstr);
-
-const char *cfgstr_get_string(const ConfigString *cfgstr);
-
-const char *cfgstr_get (const ConfigString *cfgstr, const char *key);
-float cfgstr_get_float (const ConfigString *cfgstr, const char *key);
-int cfgstr_get_int (const ConfigString *cfgstr, const char *key);
-
-int cfgstr_set (ConfigString *cfgstr, const char *key, const char *value);
-int cfgstr_set_float (ConfigString *cfgstr, const char *key, float value);
-int cfgstr_set_int (ConfigString *cfgstr, const char *key, int value);
-
-#endif // CONFIG_PARSER_H_

=== modified file 'unity-shared/UScreen.cpp'
--- unity-shared/UScreen.cpp	2014-02-19 16:36:04 +0000
+++ unity-shared/UScreen.cpp	2014-02-21 17:06:30 +0000
@@ -96,15 +96,27 @@
   return nux::Geometry(0, 0, width, height); 
 }
 
-const std::string UScreen::GetMonitorName(int output_number) const
-{
-  auto const &output_name = glib::gchar_to_string(gdk_screen_get_monitor_plug_name(screen_, output_number));
-  if (output_name.empty())
-  {
-    LOG_ERROR(logger) << "Failed to get monitor name";
-  }
-
-  return output_name;
+const std::string UScreen::GetMonitorName(int output_number = 0) const
+{
+  if (output_number < 0 || output_number > gdk_screen_get_n_monitors(screen_))
+  {
+    LOG_ERROR(logger) << "UScreen::GetMonitorName: Invalid monitor number" << output_number;
+    return "";
+  }
+
+  char* const output_name = gdk_screen_get_monitor_plug_name(screen_, output_number);
+  if (!output_name)
+  {
+    LOG_ERROR(logger) << "UScreen::GetMonitorName: Failed to get monitor name for monitor" << output_number;
+    return "";
+  }
+
+  return std::string(output_name);
+}
+
+int UScreen::GetPluggedMonitorsNumber() const
+{
+  return monitors_.size();
 }
 
 void UScreen::Changed(GdkScreen* screen)

=== modified file 'unity-shared/UScreen.h'
--- unity-shared/UScreen.h	2014-02-06 10:07:27 +0000
+++ unity-shared/UScreen.h	2014-02-21 17:06:30 +0000
@@ -53,6 +53,7 @@
   sigc::signal<void> resuming;
 
   const std::string GetMonitorName(int output_number) const;
+  int GetPluggedMonitorsNumber() const;
 
 private:
   void Changed(GdkScreen* screen);

=== modified file 'unity-shared/UnitySettings.cpp'
--- unity-shared/UnitySettings.cpp	2014-02-19 16:40:07 +0000
+++ unity-shared/UnitySettings.cpp	2014-02-21 17:06:30 +0000
@@ -21,6 +21,7 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <gio/gio.h>
+#include <glib.h>
 
 #include <NuxCore/Logger.h>
 
@@ -39,15 +40,12 @@
 const std::string SETTINGS_NAME = "com.canonical.Unity";
 const std::string FORM_FACTOR = "form-factor";
 const std::string DOUBLE_CLICK_ACTIVATE = "double-click-activate";
+const std::string SCALE_FACTOR = "scale-factor";
 const std::string LIM_KEY = "integrated-menus";
-
 const std::string LIM_SETTINGS = "com.canonical.Unity.IntegratedMenus";
 const std::string CLICK_MOVEMENT_THRESHOLD = "click-movement-threshold";
 const std::string DOUBLE_CLICK_WAIT = "double-click-wait";
-
-// FIXME Update this when hikikos settings changes land in unity
-const std::string GNOME_SETTINGS = "org.gnome.desktop.interface";
-const std::string SCALING_FACTOR = "scaling-factor";
+const std::string UI_SETTINGS = "com.ubuntu.user-interface";
 }
 
 //
@@ -58,9 +56,10 @@
 public:
   Impl(Settings* owner)
     : parent_(owner)
+    , gsettings_(g_settings_new(SETTINGS_NAME.c_str()))
+    , ubuntu_settings_(g_settings_new(UI_SETTINGS.c_str()))
     , usettings_(g_settings_new(SETTINGS_NAME.c_str()))
     , lim_settings_(g_settings_new(LIM_SETTINGS.c_str()))
-    , gnome_settings_(g_settings_new(GNOME_SETTINGS.c_str()))
     , cached_form_factor_(FormFactor::DESKTOP)
     , cached_double_click_activate_(true)
     , lowGfx_(false)
@@ -82,6 +81,9 @@
       CacheDoubleClickActivate();
       parent_->double_click_activate.changed.emit(cached_double_click_activate_);
     });
+    signals_.Add<void, GSettings*, const gchar*>(ubuntu_settings_, "changed::" + SCALE_FACTOR, [this] (GSettings*, const gchar* t) {
+      UpdateEMConverter();
+    });
 
     signals_.Add<void, GSettings*, const gchar*>(usettings_, "changed::" + LIM_KEY, [this] (GSettings*, const gchar*) {
       UpdateLimSetting();
@@ -90,10 +92,6 @@
     signals_.Add<void, GSettings*, const gchar*>(lim_settings_, "changed", [this] (GSettings*, const gchar*) {
       UpdateLimSetting();
     });
-
-    signals_.Add<void, GSettings*, const gchar*>(gnome_settings_, "changed::" + SCALING_FACTOR, [this] (GSettings*, const gchar* t) {
-      UpdateEMConverter();
-    });
   }
 
   void CacheFormFactor()
@@ -154,13 +152,37 @@
     return font_size / 1024;
   }
 
-  // FIXME Add in getting the specific dpi scale from each monitor
+  float GetUIScaleFactor(int monitor = 0) const
+  {
+    GVariant* dict;
+    g_settings_get(ubuntu_settings_, SCALE_FACTOR.c_str(), "@a{si}", &dict);
+
+    std::string monitor_name = UScreen::GetDefault()->GetMonitorName(monitor);
+
+    int value;
+    float ui_scale;
+    if (!g_variant_lookup (dict, monitor_name.c_str(), "i", &value))
+    {
+      ui_scale = 1.0;
+    }
+    else
+    {
+      ui_scale = (float)value / 8.0;
+    }
+
+    return ui_scale;
+  }
+
   int GetDPI(int monitor = 0) const
   {
     int dpi = 96;
-    int scale = g_settings_get_uint(gnome_settings_, SCALING_FACTOR.c_str());
-
-    return dpi * (scale > 0 ? scale : 1);
+    int valid_monitors = UScreen::GetDefault()->GetPluggedMonitorsNumber();
+    if (monitor >= 0 && monitor < valid_monitors)
+    {
+      float new_dpi = (float)dpi * GetUIScaleFactor(monitor);
+      dpi = (int)new_dpi;
+    }
+    return dpi;
   }
 
   void UpdateFontSize()
@@ -189,6 +211,8 @@
   }
 
   Settings* parent_;
+  glib::Object<GSettings> gsettings_;
+  glib::Object<GSettings> ubuntu_settings_;
   glib::Object<GSettings> usettings_;
   glib::Object<GSettings> lim_settings_;
   glib::Object<GSettings> gnome_settings_;