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 5f4a3f2af4da5953bc4d4bf5b9e25075d81fc780..fa1cfde2ecfc5b9f401a0734607178d89c0731ec 100644 (file)
--- 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);
 }