Mercurial > hg > xemacs-beta

comparison src/faces.c @ 442:abe6d1db359e r21-2-36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-36
author cvs
date Mon, 13 Aug 2007 11:35:02 +0200
parents 8de8e3f6228a
children 576fb035e263
comparison
equal deleted inserted replaced
441:72a7cfa4a488 442:abe6d1db359e
494 494
495 UNGCPRO; 495 UNGCPRO;
496 } 496 }
497 497
498 static int 498 static int
499 update_face_inheritance_mapper (CONST void *hash_key, void *hash_contents, 499 update_face_inheritance_mapper (const void *hash_key, void *hash_contents,
500 void *face_inheritance_closure) 500 void *face_inheritance_closure)
501 { 501 {
502 Lisp_Object key, contents; 502 Lisp_Object key, contents;
503 struct face_inheritance_closure *fcl = 503 struct face_inheritance_closure *fcl =
504 (struct face_inheritance_closure *) face_inheritance_closure; 504 (struct face_inheritance_closure *) face_inheritance_closure;
1750 1750
1751 1751
1752 void 1752 void
1753 syms_of_faces (void) 1753 syms_of_faces (void)
1754 { 1754 {
1755 INIT_LRECORD_IMPLEMENTATION (face);
1756
1755 /* Qdefault, Qwidget, Qleft_margin, Qright_margin defined in general.c */ 1757 /* Qdefault, Qwidget, Qleft_margin, Qright_margin defined in general.c */
1756 defsymbol (&Qmodeline, "modeline"); 1758 defsymbol (&Qmodeline, "modeline");
1757 defsymbol (&Qgui_element, "gui-element"); 1759 defsymbol (&Qgui_element, "gui-element");
1758 defsymbol (&Qtext_cursor, "text-cursor"); 1760 defsymbol (&Qtext_cursor, "text-cursor");
1759 defsymbol (&Qvertical_divider, "vertical-divider"); 1761 defsymbol (&Qvertical_divider, "vertical-divider");
1892 #ifdef HAVE_X_WINDOWS 1894 #ifdef HAVE_X_WINDOWS
1893 /* The same gory list from x-faces.el. 1895 /* The same gory list from x-faces.el.
1894 (#### Perhaps we should remove the stuff from x-faces.el 1896 (#### Perhaps we should remove the stuff from x-faces.el
1895 and only depend on this stuff here? That should work.) 1897 and only depend on this stuff here? That should work.)
1896 */ 1898 */
1897 CONST char *fonts[] = 1899 const char *fonts[] =
1898 { 1900 {
1899 "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*", 1901 "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*",
1900 "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*", 1902 "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*",
1901 "-*-courier-*-r-*-*-*-120-*-*-*-*-iso8859-*", 1903 "-*-courier-*-r-*-*-*-120-*-*-*-*-iso8859-*",
1902 "-*-*-medium-r-*-*-*-120-*-*-m-*-iso8859-*", 1904 "-*-*-medium-r-*-*-*-120-*-*-m-*-iso8859-*",
1910 "-*-*-*-r-*-*-*-120-*-*-c-*-*-*", 1912 "-*-*-*-r-*-*-*-120-*-*-c-*-*-*",
1911 "-*-*-*-r-*-*-*-120-*-*-*-*-*-*", 1913 "-*-*-*-r-*-*-*-120-*-*-*-*-*-*",
1912 "-*-*-*-*-*-*-*-120-*-*-*-*-*-*", 1914 "-*-*-*-*-*-*-*-120-*-*-*-*-*-*",
1913 "*" 1915 "*"
1914 }; 1916 };
1915 CONST char **fontptr; 1917 const char **fontptr;
1916 1918
1917 for (fontptr = fonts + countof(fonts) - 1; fontptr >= fonts; fontptr--) 1919 for (fontptr = fonts + countof(fonts) - 1; fontptr >= fonts; fontptr--)
1918 inst_list = Fcons (Fcons (list1 (Qx), build_string (*fontptr)), 1920 inst_list = Fcons (Fcons (list1 (Qx), build_string (*fontptr)),
1919 inst_list); 1921 inst_list);
1920 #endif /* HAVE_X_WINDOWS */ 1922 #endif /* HAVE_X_WINDOWS */
2026 2028
2027 /* widget is another gui element */ 2029 /* widget is another gui element */
2028 Vwidget_face = Fmake_face (Qwidget, 2030 Vwidget_face = Fmake_face (Qwidget,
2029 build_string ("widget face"), 2031 build_string ("widget face"),
2030 Qnil); 2032 Qnil);
2033 set_specifier_fallback (Fget (Vwidget_face, Qfont, Qunbound),
2034 Fget (Vgui_element_face, Qfont, Qunbound));
2031 set_specifier_fallback (Fget (Vwidget_face, Qforeground, Qunbound), 2035 set_specifier_fallback (Fget (Vwidget_face, Qforeground, Qunbound),
2032 Fget (Vgui_element_face, Qforeground, Qunbound)); 2036 Fget (Vgui_element_face, Qforeground, Qunbound));
2033 set_specifier_fallback (Fget (Vwidget_face, Qbackground, Qunbound), 2037 set_specifier_fallback (Fget (Vwidget_face, Qbackground, Qunbound),
2034 Fget (Vgui_element_face, Qbackground, Qunbound)); 2038 Fget (Vgui_element_face, Qbackground, Qunbound));
2035 set_specifier_fallback (Fget (Vwidget_face, Qbackground_pixmap, Qnil), 2039 /* We don't want widgets to have a default background pixmap. */
2036 Fget (Vgui_element_face, Qbackground_pixmap,
2037 Qunbound));
2038 2040
2039 Vleft_margin_face = Fmake_face (Qleft_margin, 2041 Vleft_margin_face = Fmake_face (Qleft_margin,
2040 build_string ("left margin face"), 2042 build_string ("left margin face"),
2041 Qnil); 2043 Qnil);
2042 Vright_margin_face = Fmake_face (Qright_margin, 2044 Vright_margin_face = Fmake_face (Qright_margin,