Mercurial > hg > xemacs-beta

comparison src/faces.c @ 5126:2a462149bd6a ben-lisp-object

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Wed, 24 Feb 2010 19:04:27 -0600
parents b5df3737028a 07dcc7000bbf
children a9c41067dd88
comparison
equal deleted inserted replaced
5125:b5df3737028a 5126:2a462149bd6a
722 function. 722 function.
723 */ 723 */
724 724
725 void 725 void
726 default_face_font_info (Lisp_Object domain, int *ascent, int *descent, 726 default_face_font_info (Lisp_Object domain, int *ascent, int *descent,
727 int *height, int *width, int *proportional_p) 727 int *width, int *height, int *proportional_p)
728 { 728 {
729 Lisp_Object font_instance; 729 Lisp_Object font_instance;
730 struct face_cachel *cachel; 730 struct face_cachel *cachel;
731 struct window *w = NULL; 731 struct window *w = NULL;
732 732
781 if (proportional_p) 781 if (proportional_p)
782 *proportional_p = XFONT_INSTANCE (font_instance)->proportional_p; 782 *proportional_p = XFONT_INSTANCE (font_instance)->proportional_p;
783 } 783 }
784 784
785 void 785 void
786 default_face_height_and_width (Lisp_Object domain, 786 default_face_width_and_height (Lisp_Object domain, int *width, int *height)
787 int *height, int *width) 787 {
788 { 788 default_face_font_info (domain, 0, 0, width, height, 0);
789 default_face_font_info (domain, 0, 0, height, width, 0);
790 }
791
792 void
793 default_face_height_and_width_1 (Lisp_Object domain,
794 int *height, int *width)
795 {
796 if (window_system_pixelated_geometry (domain))
797 {
798 if (height)
799 *height = 1;
800 if (width)
801 *width = 1;
802 }
803 else
804 default_face_height_and_width (domain, height, width);
805 } 789 }
806 790
807 DEFUN ("face-list", Fface_list, 0, 1, 0, /* 791 DEFUN ("face-list", Fface_list, 0, 1, 0, /*
808 Return a list of the names of all defined faces. 792 Return a list of the names of all defined faces.
809 If TEMPORARY is nil, only the permanent faces are included. 793 If TEMPORARY is nil, only the permanent faces are included.