Mercurial > emacs
changeset 65770:9324b7187dd7
(start_hourglass): Apply 2005-05-07 change for xfns.c.
(x_create_tip_frame) [GLYPH_DEBUG]: Uncomment debug code.
(Fx_create_frame, x_create_tip_frame) [USE_ATSUI]: Try
ATSUI-compatible 12pt Monaco font first.
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
|---|---|
| date | Sat, 01 Oct 2005 11:09:09 +0000 |
| parents | 9bbfc8301ea6 |
| children | 3b00e34812bb |
| files | src/macfns.c |
| diffstat | 1 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/macfns.c Sat Oct 01 11:08:25 2005 +0000 +++ b/src/macfns.c Sat Oct 01 11:09:09 2005 +0000 @@ -2532,6 +2532,10 @@ } /* Try out a font which we hope has bold and italic variations. */ +#if USE_ATSUI + if (! STRINGP (font)) + font = x_new_font (f, "-*-monaco-medium-r-normal--12-*-*-*-*-*-iso10646-1"); +#endif if (! STRINGP (font)) font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1"); /* If those didn't work, look for something which will at least work. */ @@ -3340,6 +3344,10 @@ EMACS_TIME delay; int secs, usecs = 0; + /* Don't bother for ttys. */ + if (NILP (Vwindow_system)) + return; + cancel_hourglass (); if (INTEGERP (Vhourglass_delay) @@ -3586,7 +3594,7 @@ FRAME_FONTSET (f) = -1; f->icon_name = Qnil; -#if 0 /* GLYPH_DEBUG TODO: image support. */ +#if GLYPH_DEBUG image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount; dpyinfo_refcount = dpyinfo->reference_count; #endif /* GLYPH_DEBUG */ @@ -3630,6 +3638,10 @@ } /* Try out a font which we hope has bold and italic variations. */ +#if USE_ATSUI + if (! STRINGP (font)) + font = x_new_font (f, "-*-monaco-medium-r-normal--12-*-*-*-*-*-iso10646-1"); +#endif if (! STRINGP (font)) font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1"); /* If those didn't work, look for something which will at least work. */