From bdf0820c501437a2150d8ff0d5340246e713f73f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 7 Jul 2015 20:39:45 -0400 Subject: [PATCH 186/193] 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. --- gdk/x11/gdkxftdefaults.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gdk/x11/gdkxftdefaults.c b/gdk/x11/gdkxftdefaults.c index 5f4a3f2..fa1cfde 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); } -- 2.4.5