comparison src/xsettings.c @ 106097:5fa329215a93

xsettings.c didn't check font-use-system-font, fix that. * xsettings.c (something_changedCB, Ffont_get_system_font): Check use_system_font. (syms_of_xsettings): DEFVAR font-use-system-font. * font-setting.el (font-use-system-font): Moved ... * cus-start.el (all): ... to here.

106096:58fd09a16d9e

#endif

static char *current_mono_font;
static struct x_display_info *first_dpyinfo;
static Lisp_Object Qfont_name, Qfont_render;

#ifdef HAVE_GCONF
static GConfClient *gconf_client;
#endif

      struct x_display_info *dpyinfo;
      int found = 0;
      for (dpyinfo = x_display_list; !found && dpyinfo; dpyinfo = dpyinfo->next)
        found = dpyinfo == first_dpyinfo;

      if (found)
        store_font_changed_event (Qfont_name,
                                  XCAR (first_dpyinfo->name_list_element));
    }
}
#endif /* HAVE_GCONF */

DEFUN ("font-get-system-font", Ffont_get_system_font, Sfont_get_system_font,
       0, 0, 0,
       doc: /* Get the system default monospaced font. */)
  ()
{
  return current_mono_font
    ? make_string (current_mono_font, strlen (current_mono_font))
    : Qnil;
}

void

  staticpro (&Qfont_name);
  Qfont_render = intern_c_string ("font-render");
  staticpro (&Qfont_render);
  defsubr (&Sfont_get_system_font);

#ifdef HAVE_GCONF
  Fprovide (intern_c_string ("system-font-setting"), Qnil);
#endif
#ifdef HAVE_XFT
  Fprovide (intern_c_string ("font-render-setting"), Qnil);

106097:5fa329215a93

#endif

static char *current_mono_font;
static struct x_display_info *first_dpyinfo;
static Lisp_Object Qfont_name, Qfont_render;
static int use_system_font;

#ifdef HAVE_GCONF
static GConfClient *gconf_client;
#endif

      struct x_display_info *dpyinfo;
      int found = 0;
      for (dpyinfo = x_display_list; !found && dpyinfo; dpyinfo = dpyinfo->next)
        found = dpyinfo == first_dpyinfo;

      if (found && use_system_font)
        store_font_changed_event (Qfont_name,
                                  XCAR (first_dpyinfo->name_list_element));
    }
}
#endif /* HAVE_GCONF */

DEFUN ("font-get-system-font", Ffont_get_system_font, Sfont_get_system_font,
       0, 0, 0,
       doc: /* Get the system default monospaced font. */)
  ()
{
  return current_mono_font && use_system_font
    ? make_string (current_mono_font, strlen (current_mono_font))
    : Qnil;
}

void

  staticpro (&Qfont_name);
  Qfont_render = intern_c_string ("font-render");
  staticpro (&Qfont_render);
  defsubr (&Sfont_get_system_font);

  DEFVAR_BOOL ("font-use-system-font", &use_system_font,
    doc: /* *Non-nil means to use the system defined font.  */);
  use_system_font = 0;

#ifdef HAVE_GCONF
  Fprovide (intern_c_string ("system-font-setting"), Qnil);
#endif
#ifdef HAVE_XFT
  Fprovide (intern_c_string ("font-render-setting"), Qnil);