From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 8 Jul 2015 00:39:45 +0000 (-0400)
Subject: Simplify Xft setting fallback
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~24^2~9103
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bdf0820c501437a2150d8ff0d5340246e713f73f;p=gtk4.git

Simplify Xft setting fallback

If we don't find Xft values in the X resource db, simply fall
back to the values that are hardcoded in /etc/X11/Xresources
anyway. Extra trickery with likely-made-up screen dimensions
is not going to yield better results, and only makes for a
deeper rabbit hole when debugging.
---

diff --git a/gdk/x11/gdkxftdefaults.c b/gdk/x11/gdkxftdefaults.c
index 5f4a3f2af4..fa1cfde2ec 100644
--- a/gdk/x11/gdkxftdefaults.c
+++ b/gdk/x11/gdkxftdefaults.c
@@ -168,14 +168,13 @@ init_xft_settings (GdkScreen *screen)
   x11_screen->xft_hinting = b;
 
   if (!get_integer_default (xdisplay, "hintstyle", &x11_screen->xft_hintstyle))
-    x11_screen->xft_hintstyle = FC_HINT_FULL;
+    x11_screen->xft_hintstyle = FC_HINT_MEDIUM;
 
   if (!get_integer_default (xdisplay, "rgba", &x11_screen->xft_rgba))
     x11_screen->xft_rgba = FC_RGBA_UNKNOWN;
 
   if (!get_double_default (xdisplay, "dpi", &dpi_double))
-    dpi_double = (((double) DisplayHeight (xdisplay, x11_screen->screen_num) * 25.4) /
-		  (double) DisplayHeightMM (xdisplay, x11_screen->screen_num));
+    dpi_double = 96.0;
 
   x11_screen->xft_dpi = (int)(0.5 + PANGO_SCALE * dpi_double);
 }