comparison src/macfns.c @ 61339:1f9e7993e18e

(Fx_create_frame, x_create_tip_frame): Add "fontset-mac" to fallback font/fontsets.
author YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
date Wed, 06 Apr 2005 02:24:23 +0000
parents 9497994ad6fc
children 217c5fe404c0 02f1dbc4a199
comparison
equal deleted inserted replaced
61338:b44917251d3a 61339:1f9e7993e18e
2630 /* Try out a font which we hope has bold and italic variations. */ 2630 /* Try out a font which we hope has bold and italic variations. */
2631 if (! STRINGP (font)) 2631 if (! STRINGP (font))
2632 font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1"); 2632 font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1");
2633 /* If those didn't work, look for something which will at least work. */ 2633 /* If those didn't work, look for something which will at least work. */
2634 if (! STRINGP (font)) 2634 if (! STRINGP (font))
2635 font = x_new_fontset (f, "fontset-mac");
2636 if (! STRINGP (font))
2635 font = x_new_font (f, "-*-monaco-*-12-*-mac-roman"); 2637 font = x_new_font (f, "-*-monaco-*-12-*-mac-roman");
2636 if (! STRINGP (font)) 2638 if (! STRINGP (font))
2637 font = x_new_font (f, "-*-courier-*-10-*-mac-roman"); 2639 font = x_new_font (f, "-*-courier-*-10-*-mac-roman");
2638 if (! STRINGP (font)) 2640 if (! STRINGP (font))
2639 error ("Cannot find any usable font"); 2641 error ("Cannot find any usable font");
3729 3731
3730 /* Try out a font which we hope has bold and italic variations. */ 3732 /* Try out a font which we hope has bold and italic variations. */
3731 if (! STRINGP (font)) 3733 if (! STRINGP (font))
3732 font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1"); 3734 font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1");
3733 /* If those didn't work, look for something which will at least work. */ 3735 /* If those didn't work, look for something which will at least work. */
3736 if (! STRINGP (font))
3737 font = x_new_fontset (f, "fontset-mac");
3734 if (! STRINGP (font)) 3738 if (! STRINGP (font))
3735 font = x_new_font (f, "-*-monaco-*-12-*-mac-roman"); 3739 font = x_new_font (f, "-*-monaco-*-12-*-mac-roman");
3736 if (! STRINGP (font)) 3740 if (! STRINGP (font))
3737 font = x_new_font (f, "-*-courier-*-10-*-mac-roman"); 3741 font = x_new_font (f, "-*-courier-*-10-*-mac-roman");
3738 UNBLOCK_INPUT; 3742 UNBLOCK_INPUT;