Merge lp:~3v1n0/unity-settings-daemon/use-ubuntu-schemas-for-scaling into lp:unity-settings-daemon

[Marco Trevisan (Treviño)]

XSettings: under unity use com.ubuntu.user-interface.desktop keys for scaling settings

Unity would override them with computed values, so we need to store them in different keys
not to interfere with any other installed gnome out there.

Also migrate changes to old keys to the new ones, if they happen when running unity.

[Andrea Azzarone (azzar1)]

Looks good now. +1

review: Approve

=== modified file 'debian/control'
--- debian/control	2017-09-06 14:47:10 +0000
+++ debian/control	2017-10-03 05:07:54 +0000
@@ -57,7 +57,7 @@
          gsettings-desktop-schemas (>= 3.15.4),
          nautilus-data (>= 2.91.3-1),
          gnome-settings-daemon-schemas (>= 3.16),
-         gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140224),
+         gsettings-ubuntu-schemas (>= 0.0.7+17.10.20170922),
 Recommends: ibus (>= 1.5.0),
             pulseaudio,
             systemd-services
 
=== modified file 'plugins/media-keys/gsd-media-keys-manager.c'
--- plugins/media-keys/gsd-media-keys-manager.c	2017-04-18 11:51:12 +0000
+++ plugins/media-keys/gsd-media-keys-manager.c	2017-10-03 05:07:54 +0000
@@ -113,8 +113,12 @@
 #define SETTINGS_POWER_DIR "org.gnome.settings-daemon.plugins.power"
 #define SETTINGS_XSETTINGS_DIR "org.gnome.settings-daemon.plugins.xsettings"
 #define SETTINGS_TOUCHPAD_DIR "org.gnome.desktop.peripherals.touchpad"
+#define UNITY_SETTINGS_INTERFACE_DIR "com.canonical.Unity.Interface"
+
 #define TOUCHPAD_ENABLED_KEY "send-events"
 #define HIGH_CONTRAST "HighContrast"
+#define TEXT_SCALING_FACTOR_KEY (in_desktop ("Unity") ? \
+                                 "text-scale-factor" : "text-scaling-factor")
 
 #define VOLUME_STEP 6           /* percents for one volume button press */
 
@@ -313,6 +317,29 @@
         NULL
 };
 
+static gboolean
+in_desktop (const gchar *name)
+{
+        const gchar *desktop_name_list;
+        gchar **names;
+        gboolean in_list = FALSE;
+        gint i;
+
+        desktop_name_list = g_getenv ("XDG_CURRENT_DESKTOP");
+        if (!desktop_name_list)
+                return FALSE;
+
+        names = g_strsplit (desktop_name_list, ":", -1);
+        for (i = 0; names[i] && !in_list; i++)
+                if (strcmp (names[i], name) == 0) {
+                        in_list = TRUE;
+                        break;
+                }
+        g_strfreev (names);
+
+        return in_list;
+}
+
 static const char *
 calculate_icon_name (gint value, const char **icon_names)
 {
@@ -2070,7 +2097,8 @@
 do_text_size_action (GsdMediaKeysManager *manager,
 		     MediaKeyType         type)
 {
-	gdouble factor, best, distance;
+	GSettings *settings;
+        gdouble factor, best, distance;
 	guint i;
 
 	/* Same values used in the Seeing tab of the Universal Access panel */
@@ -2081,8 +2109,16 @@
 		1.5
 	};
 
+        const gchar *text_scaling_key = TEXT_SCALING_FACTOR_KEY;
+
+        if (in_desktop ("Unity")) {
+                settings = g_settings_new (UNITY_SETTINGS_INTERFACE_DIR);
+        } else {
+                settings = g_object_ref (manager->priv->interface_settings);
+        }
+
 	/* Figure out the current DPI scaling factor */
-	factor = g_settings_get_double (manager->priv->interface_settings, "text-scaling-factor");
+	factor = g_settings_get_double (settings, text_scaling_key);
 	factor += (type == INCREASE_TEXT_KEY ? 0.25 : -0.25);
 
 	/* Try to find a matching value */
@@ -2098,9 +2134,11 @@
 	}
 
 	if (best == 1.0)
-		g_settings_reset (manager->priv->interface_settings, "text-scaling-factor");
+		g_settings_reset (settings, text_scaling_key);
 	else
-		g_settings_set_double (manager->priv->interface_settings, "text-scaling-factor", best);
+		g_settings_set_double (settings, text_scaling_key, best);
+
+        g_object_unref (settings);
 }
 
 static void
 
=== modified file 'plugins/xsettings/gsd-xsettings-manager.c'
--- plugins/xsettings/gsd-xsettings-manager.c	2016-08-18 10:59:20 +0000
+++ plugins/xsettings/gsd-xsettings-manager.c	2017-10-03 05:07:54 +0000
@@ -50,6 +50,7 @@
 
 #define MOUSE_SETTINGS_SCHEMA     "org.gnome.settings-daemon.peripherals.mouse"
 #define INTERFACE_SETTINGS_SCHEMA "org.gnome.desktop.interface"
+#define UNITY_INTERFACE_SETTINGS_SCHEMA "com.ubuntu.user-interface.desktop"
 #define SOUND_SETTINGS_SCHEMA     "org.gnome.desktop.sound"
 #define PRIVACY_SETTINGS_SCHEMA     "org.gnome.desktop.privacy"
 #define WM_SETTINGS_SCHEMA        "org.gnome.desktop.wm.preferences"
@@ -69,6 +70,12 @@
 #define FONT_HINTING_KEY      "hinting"
 #define FONT_RGBA_ORDER_KEY   "rgba-order"
 
+#define SCALING_SETTINGS_SCHEMA_FOR_DESKTOP (in_desktop ("Unity") ? \
+                                             UNITY_INTERFACE_SETTINGS_SCHEMA : \
+                                             INTERFACE_SETTINGS_SCHEMA)
+
+static gboolean in_desktop (const gchar *name);
+
 /* As we cannot rely on the X server giving us good DPI information, and
  * that we don't want multi-monitor screens to have different DPIs (thus
  * different text sizes), we'll hard-code the value of the DPI
@@ -255,6 +262,7 @@
         gboolean           have_unity;
 
         guint              notify_idle_id;
+        guint              freeze_settings_migrate_id;
 };
 
 #define GSD_XSETTINGS_ERROR gsd_xsettings_error_quark ()
@@ -426,7 +434,7 @@
         double      dpi;
         double      factor;
 
-	interface_settings = g_hash_table_lookup (manager->priv->settings, INTERFACE_SETTINGS_SCHEMA);
+	interface_settings = g_hash_table_lookup (manager->priv->settings, SCALING_SETTINGS_SCHEMA_FOR_DESKTOP);
         factor = g_settings_get_double (interface_settings, TEXT_SCALING_FACTOR_KEY);
 
 	dpi = DPI_FALLBACK;
@@ -469,7 +477,7 @@
         int monitor_scale;
         double dpi_x, dpi_y;
 
-        interface_settings = g_hash_table_lookup (manager->priv->settings, INTERFACE_SETTINGS_SCHEMA);
+        interface_settings = g_hash_table_lookup (manager->priv->settings, SCALING_SETTINGS_SCHEMA_FOR_DESKTOP);
         window_scale =
                 g_settings_get_uint (interface_settings, SCALING_FACTOR_KEY);
         if (window_scale == 0) {
@@ -526,7 +534,7 @@
 xft_settings_get (GnomeXSettingsManager *manager,
                   GnomeXftSettings      *settings)
 {
-	GSettings  *interface_settings;
+	GSettings  *interface_settings, *scaling_settings;
         GsdFontAntialiasingMode antialiasing;
         GsdFontHinting hinting;
         GsdFontRgbaOrder order;
@@ -535,6 +543,7 @@
         int cursor_size;
 
 	interface_settings = g_hash_table_lookup (manager->priv->settings, INTERFACE_SETTINGS_SCHEMA);
+        scaling_settings = g_hash_table_lookup (manager->priv->settings, SCALING_SETTINGS_SCHEMA_FOR_DESKTOP);
 
         antialiasing = g_settings_get_enum (manager->priv->plugin_settings, FONT_ANTIALIASING_KEY);
         hinting = g_settings_get_enum (manager->priv->plugin_settings, FONT_HINTING_KEY);
@@ -546,7 +555,7 @@
         dpi = get_dpi_from_gsettings (manager);
         settings->dpi = dpi * 1024; /* Xft wants 1/1024ths of an inch */
         settings->scaled_dpi = dpi * settings->window_scale * 1024;
-        cursor_size = g_settings_get_int (interface_settings, CURSOR_SIZE_KEY);
+        cursor_size = g_settings_get_int (scaling_settings, CURSOR_SIZE_KEY);
         settings->cursor_size = cursor_size * settings->window_scale;
         settings->cursor_theme = g_settings_get_string (interface_settings, CURSOR_THEME_KEY);
         settings->rgba = "rgb";
@@ -943,11 +952,38 @@
 
         if (g_str_equal (key, TEXT_SCALING_FACTOR_KEY) ||
             g_str_equal (key, SCALING_FACTOR_KEY) ||
-            g_str_equal (key, CURSOR_SIZE_KEY) ||
-            g_str_equal (key, CURSOR_THEME_KEY)) {
-        	xft_callback (NULL, key, manager);
-        	return;
-	}
+            g_str_equal (key, CURSOR_SIZE_KEY)) {
+                gchar *schema_id;
+                g_object_get (settings, "schema-id", &schema_id, NULL);
+
+                if (g_str_equal (schema_id, SCALING_SETTINGS_SCHEMA_FOR_DESKTOP)) {
+                        update_xft_settings (manager);
+                        queue_notify (manager);
+                } else if (manager->priv->freeze_settings_migrate_id == 0 &&
+                           in_desktop ("Unity") &&
+                           g_str_equal (schema_id, INTERFACE_SETTINGS_SCHEMA)) {
+                        GSettings *unity_interface_settings;
+                        GVariant *setting_value;
+
+                        setting_value = g_settings_get_value (settings, key);
+                        unity_interface_settings =
+                                g_hash_table_lookup (manager->priv->settings,
+                                                     UNITY_INTERFACE_SETTINGS_SCHEMA);
+
+                        g_settings_set_value (unity_interface_settings, key,
+                                              setting_value);
+                        g_variant_unref (setting_value);
+                }
+
+                g_free (schema_id);
+                return;
+        }
+
+        if (g_str_equal (key, CURSOR_THEME_KEY)) {
+                update_xft_settings (manager);
+                queue_notify (manager);
+                return;
+        }
 
         trans = find_translation_entry (settings, key);
         if (trans == NULL) {
@@ -1051,6 +1087,14 @@
                                                                NULL);
 }
 
+static gboolean
+on_freeze_settings_migrate_timeout (gpointer data)
+{
+        GnomeXSettingsManager *manager = data;
+        manager->priv->freeze_settings_migrate_id = 0;
+        return FALSE;
+}
+
 gboolean
 gnome_xsettings_manager_start (GnomeXSettingsManager *manager,
                                GError               **error)
@@ -1077,6 +1121,8 @@
         g_hash_table_insert (manager->priv->settings,
                              INTERFACE_SETTINGS_SCHEMA, g_settings_new (INTERFACE_SETTINGS_SCHEMA));
         g_hash_table_insert (manager->priv->settings,
+                             UNITY_INTERFACE_SETTINGS_SCHEMA, g_settings_new (UNITY_INTERFACE_SETTINGS_SCHEMA));
+        g_hash_table_insert (manager->priv->settings,
                              SOUND_SETTINGS_SCHEMA, g_settings_new (SOUND_SETTINGS_SCHEMA));
         g_hash_table_insert (manager->priv->settings,
                              PRIVACY_SETTINGS_SCHEMA, g_settings_new (PRIVACY_SETTINGS_SCHEMA));
@@ -1135,6 +1181,9 @@
         queue_notify (manager);
         g_variant_unref (overrides);
 
+        /* Ingore migration of gnome settings to unity at startup */
+        manager->priv->freeze_settings_migrate_id =
+                g_timeout_add_seconds (5, on_freeze_settings_migrate_timeout, manager);
 
         gnome_settings_profile_end (NULL);
 
@@ -1168,8 +1217,11 @@
 
         stop_fontconfig_monitor (manager);
 
-        if (manager->priv->unity_name_watch_id > 0)
-                g_bus_unwatch_name (manager->priv->unity_name_watch_id);
+        if (p->unity_name_watch_id > 0)
+                g_bus_unwatch_name (p->unity_name_watch_id);
+
+        if (p->freeze_settings_migrate_id != 0)
+                g_source_remove (p->freeze_settings_migrate_id);
 
         if (p->settings != NULL) {
                 g_hash_table_destroy (p->settings);