Merge lp:~seb128/unity-settings-daemon/non-unity-sessions-need-scaling into lp:unity-settings-daemon

[Sebastien Bacher]

Restore code that set the scaling factor according the screen dpi, but only
when not under and Unity session. That was desactived in r4020 because Unity
is handling those values, but this is not the case under ubiquity or
unity-greeter.

Restore code that set the scaling factor according the screen dpi, but only
when not under and Unity session. That was desactived in r4020 because Unity
is handling those values, but this is not the case under ubiquity or
unity-greeter.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4069
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/58/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-vivid-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-vivid-i386-ci/2

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

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

I can't believe the mm values are sometimes 16/9. We should look into fixing this in the proper module.

Look ok to me otherwise. Thanks.

review: Approve

=== modified file 'plugins/xsettings/gsd-xsettings-manager.c'
--- plugins/xsettings/gsd-xsettings-manager.c	2014-11-27 10:52:57 +0000
+++ plugins/xsettings/gsd-xsettings-manager.c	2015-02-18 15:17:24 +0000
@@ -436,7 +436,7 @@
 static int
 get_window_scale (GnomeXSettingsManager *manager)
 {
-	GSettings  *interface_settings;
+        GSettings  *interface_settings;
         int window_scale;
         GdkRectangle rect;
         GdkDisplay *display;
@@ -445,13 +445,43 @@
         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, INTERFACE_SETTINGS_SCHEMA);
         window_scale =
                 g_settings_get_uint (interface_settings, SCALING_FACTOR_KEY);
         if (window_scale == 0) {
                 window_scale = 1;
+
+                /* Under Unity let the shell handle the scaling */
+                if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0)
+                        goto out;
+
+                display = gdk_display_get_default ();
+                screen = gdk_display_get_default_screen (display);
+                gdk_screen_get_monitor_geometry (screen, 0, &rect);
+                width_mm = gdk_screen_get_monitor_width_mm (screen, 0);
+                height_mm = gdk_screen_get_monitor_height_mm (screen, 0);
+                monitor_scale = gdk_screen_get_monitor_scale_factor (screen, 0);
+
+                /* Somebody encoded the aspect ratio (16/9 or 16/10)
+                 * instead of the physical size */
+                if ((width_mm == 160 && height_mm == 90) ||
+                    (width_mm == 160 && height_mm == 100) ||
+                    (width_mm == 16 && height_mm == 9) ||
+                    (width_mm == 16 && height_mm == 10))
+                        goto out;
+
+                if (width_mm > 0 && height_mm > 0) {
+                        dpi_x = (double)rect.width * monitor_scale / (width_mm / 25.4);
+                        dpi_y = (double)rect.height * monitor_scale / (height_mm / 25.4);
+                        /* We don't completely trust these values so both
+                           must be high, and never pick higher ratio than
+                           2 automatically */
+                        if (dpi_x > HIDPI_LIMIT && dpi_y > HIDPI_LIMIT)
+                                window_scale = 2;
+                }
         }
 
+out:
         return window_scale;
 }