Commit 0701634a authored by YAMAMOTO Mitsuharu's avatar YAMAMOTO Mitsuharu

Fix failure of setting default face attribute in init script (Bug#36284)

* src/xsettings.c (apply_xft_settings): Undo replacing all #ifdef HAVE_XFT
with #if defined USE_CAIRO || defined HAVE_XFT for this function.
parent 9eb78866
Pipeline #2181 failed with stage
in 73 minutes and 25 seconds
......@@ -608,18 +608,16 @@ static void
apply_xft_settings (struct x_display_info *dpyinfo,
struct xsettings *settings)
{
#if defined USE_CAIRO || defined HAVE_XFT
#ifdef HAVE_XFT
FcPattern *pat;
struct xsettings oldsettings;
bool changed = false;
memset (&oldsettings, 0, sizeof (oldsettings));
pat = FcPatternCreate ();
#ifdef HAVE_XFT
XftDefaultSubstitute (dpyinfo->display,
XScreenNumberOfScreen (dpyinfo->screen),
pat);
#endif
FcPatternGetBool (pat, FC_ANTIALIAS, 0, &oldsettings.aa);
FcPatternGetBool (pat, FC_HINTING, 0, &oldsettings.hinting);
#ifdef FC_HINT_STYLE
......@@ -719,9 +717,7 @@ apply_xft_settings (struct x_display_info *dpyinfo,
};
char buf[sizeof format + d_formats * d_growth + lf_formats * lf_growth];
#ifdef HAVE_XFT
XftDefaultSet (dpyinfo->display, pat);
#endif
store_config_changed_event (Qfont_render,
XCAR (dpyinfo->name_list_element));
Vxft_settings
......@@ -733,7 +729,7 @@ apply_xft_settings (struct x_display_info *dpyinfo,
}
else
FcPatternDestroy (pat);
#endif /* USE_CAIRO || HAVE_XFT */
#endif /* HAVE_XFT */
}
/* Read XSettings from the display for DPYINFO.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment