if (EQ (keyw, Qname))
name_seen = 1;
else
- abort ();
+ ABORT ();
}
if (!name_seen)
void
ensure_face_cachel_complete (struct face_cachel *cachel,
- Lisp_Object domain, unsigned char *charsets)
+ Lisp_Object domain, Charset_ID *charsets)
{
int i;
void
face_cachel_charset_font_metric_info (struct face_cachel *cachel,
- unsigned char *charsets,
+ Charset_ID *charsets,
struct font_metric_info *fm)
{
int i;
{
Lisp_Object fg_fb = Qnil, bg_fb = Qnil;
+#ifdef HAVE_GTK
+ fg_fb = acons (list1 (Qgtk), build_string ("black"), fg_fb);
+ bg_fb = acons (list1 (Qgtk), build_string ("white"), bg_fb);
+#endif
#ifdef HAVE_X_WINDOWS
fg_fb = acons (list1 (Qx), build_string ("black"), fg_fb);
bg_fb = acons (list1 (Qx), build_string ("white"), bg_fb);
support is compiled in. */
{
Lisp_Object inst_list = Qnil;
-#ifdef HAVE_X_WINDOWS
+
+#if defined(HAVE_X_WINDOWS) || defined(HAVE_GTK)
+ /* This is kind of ugly because stephen wanted this to be CPP
+ ** identical to the old version, at least for the initial
+ ** checkin
+ **
+ ** WMP March 9, 2001
+ */
+
/* The same gory list from x-faces.el.
(#### Perhaps we should remove the stuff from x-faces.el
and only depend on this stuff here? That should work.)
};
const char **fontptr;
+#ifdef HAVE_X_WINDOWS
for (fontptr = fonts + countof(fonts) - 1; fontptr >= fonts; fontptr--)
inst_list = Fcons (Fcons (list1 (Qx), build_string (*fontptr)),
inst_list);
#endif /* HAVE_X_WINDOWS */
+#ifdef HAVE_GTK
+ for (fontptr = fonts + countof(fonts) - 1; fontptr >= fonts; fontptr--)
+ inst_list = Fcons (Fcons (list1 (Qgtk), build_string (*fontptr)),
+ inst_list);
+#endif /* HAVE_GTK */
+#endif /* HAVE_X_WINDOWS || HAVE_GTK */
+
+
#ifdef HAVE_TTY
inst_list = Fcons (Fcons (list1 (Qtty), build_string ("normal")),
inst_list);
#ifdef HAVE_MS_WINDOWS
/* Fixedsys does not exist for printers */
inst_list = Fcons (Fcons (list1 (Qmsprinter),
- build_string ("Courier:Regular:10::Western")), inst_list);
+ build_string ("Courier:Regular:10::Western")), inst_list);
inst_list = Fcons (Fcons (list1 (Qmsprinter),
- build_string ("Courier New:Regular:10::Western")), inst_list);
+ build_string ("Courier New:Regular:10::Western")), inst_list);
inst_list = Fcons (Fcons (list1 (Qmswindows),
- build_string ("Fixedsys:Regular:9::Western")), inst_list);
+ build_string ("Fixedsys:Regular:9::Western")), inst_list);
inst_list = Fcons (Fcons (list1 (Qmswindows),
- build_string ("Courier:Regular:10::Western")), inst_list);
+ build_string ("Courier:Regular:10::Western")), inst_list);
inst_list = Fcons (Fcons (list1 (Qmswindows),
- build_string ("Courier New:Regular:10::Western")), inst_list);
+ build_string ("Courier New:Regular:10::Western")), inst_list);
#endif /* HAVE_MS_WINDOWS */
set_specifier_fallback (Fget (Vdefault_face, Qfont, Qnil), inst_list);
}
{
Lisp_Object fg_fb = Qnil, bg_fb = Qnil;
+#ifdef HAVE_GTK
+ /* We need to put something in there, or error checking gets
+ #%!@#ed up before the styles are set, which override the
+ fallbacks. */
+ fg_fb = acons (list1 (Qgtk), build_string ("black"), fg_fb);
+ bg_fb = acons (list1 (Qgtk), build_string ("Gray80"), bg_fb);
+#endif
#ifdef HAVE_X_WINDOWS
fg_fb = acons (list1 (Qx), build_string ("black"), fg_fb);
bg_fb = acons (list1 (Qx), build_string ("Gray80"), bg_fb);