Commit Graph

305 Commits

Author SHA1 Message Date
Kim F. Storm
46b00436e7 (Qface_no_inherit): New var.
(syms_of_xfaces): Intern and staticpro it.
(Finternal_make_lisp_face, Finternal_set_lisp_face_attribute)
(Finternal_copy_lisp_face, update_face_from_frame_parameter):
Don't increment face_change_count when face has non-nil
face-no-inherit property.
2004-09-14 20:04:09 +00:00
Richard M. Stallman
d9639b25df (merge_face_ref): Specifying `unspecified' is a no-op. 2004-08-16 22:53:28 +00:00
Luc Teirlinck
fc820cc540 (Fcolor_supported_p): Doc fix. 2004-07-24 20:56:59 +00:00
Stefan Monnier
734e951420 (x_supports_face_attributes_p)
(Fdisplay_supports_face_attributes_p): YAILOM.
(tty_supports_face_attributes_p): Remove unused var `i'.
2004-06-30 19:35:18 +00:00
Richard M. Stallman
5e9bab6ff1 (Finternal_copy_lisp_face): Small cleanup; doc fix. 2004-06-21 03:26:32 +00:00
Andreas Schwab
3ebc09397f (face_attr_equal_p): Declare parameters. 2004-06-13 14:50:07 +00:00
Miles Bader
6e87ac8f55 Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-385
src/xfaces.c (push_named_merge_point): Return 0 if a cycle is detected
2004-06-08 07:06:19 +00:00
Miles Bader
a0a2334679 Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Face merging cleanups

The only user-visible changes should be:

  * The priority order of faces in a face :inherit attribute is now
    reversed (for consistency with face lists in `face' text
    properties)

  * An :inherit loop is halted immediately, instead of being applied
    several times first; this should only matters when a relative
    attribute such as a :height scale is used.
2004-06-07 07:02:20 +00:00
Miles Bader
0722292b20 Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
(Fdisplay_supports_face_attributes_p): Work around bootstrapping problem
2004-06-06 09:49:12 +00:00
Miles Bader
8e330b2257 Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
(tty_supports_face_attributes_p): Ensure attributes differ from default

This implements the property of `display-supports-face-attributes-p'
which says that the specified attributes must be distinguishable from
those of the default face.
2004-06-04 23:30:03 +00:00
Eli Zaretskii
ccda4e3cef (x_supports_face_attributes_p): Make this function
conditional on HAVE_WINDOW_SYSTEM.
(Fdisplay_supports_face_attributes_p) [HAVE_WINDOW_SYSTEM]: Don't
call x_supports_face_attributes_p if it was not compiled in.
2004-06-04 15:56:53 +00:00
Miles Bader
9717e36cff Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Move `display-supports-face-attributes-p' entirely into C code

Previously only the tty-related portion of display-supports-face-attributes-p
was done in C.  This just moves the graphical-display related bits into C
too, which allows us to implement them properly (the previous attempt to do a
halfway-proper job in lisp didn't work because of funny conditions during
emacs startup).
2004-06-04 06:00:59 +00:00
Kim F. Storm
0bc90bbad4 (face_at_buffer_position): Use GET_OVERLAYS_AT. 2004-05-17 22:50:41 +00:00
Juanma Barranquero
7fc9263541 (Ftty_supports_face_attributes_p, Finternal_copy_lisp_face): Fix typo in
docstring.
(Finternal_get_lisp_face_attribute): Fix docstring.
2004-05-13 00:22:16 +00:00
Miles Bader
e32d987200 Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-248
src/lisp.h (CYCLE_CHECK): Macro moved from xfaces.c
2004-04-26 00:21:41 +00:00
Stefan Monnier
066a4c6b91 (face_color_supported_p): Fix compilation without X11. 2004-04-09 16:15:08 +00:00
Jan Djärv
5890e9f7ac Move include stdio.h to same place as in other files. 2004-02-09 15:39:49 +00:00
Kenichi Handa
b64c9a0407 (face_font_available_p): New function. 2003-12-29 06:54:55 +00:00
Kim F. Storm
d7078aefa0 (cache_face): Abort if c->size exceeds MAX_FACE_ID. 2003-12-28 00:12:45 +00:00
Jan Djärv
5202d23dfe * xfaces.c (lface_fully_specified_p): Take into account that
MAC OS always have unspecified stipple.
2003-12-24 10:29:59 +00:00
Thien-Thi Nguyen
2d176448ab (Fcolor_gray_p): Fix omission bug:
In case `frame' is nil, consult the selected frame.
(Fcolor_supported_p): Likewise.
2003-12-24 06:39:58 +00:00
Miles Bader
ab5796a9f9 Add arch taglines 2003-09-01 15:45:59 +00:00
Kenichi Handa
6aa1813f26 (try_font_list): Call try_alternative_families to try any family
with the given registry.
2003-08-15 12:19:29 +00:00
Kenichi Handa
10b7e56f14 * xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
what autoscaled.
(best_matching_font): Once we find a better scalable font, set
non_scalable_has_exact_height_p to 1.
2003-08-15 12:08:51 +00:00
Jan Djärv
a5f696acd2 Fix some of the font/face problems. 2003-06-26 21:18:45 +00:00
Jason Rumney
0c8ea7afde (Finternal_face_x_get_resource): Do it on Windows and Mac too. 2003-06-05 22:52:43 +00:00
Dave Love
f0d6207551 (font_rescale_ratio): Fix for K&R. 2003-06-02 18:43:11 +00:00
Glenn Morris
074468698d (realize_default_face): Do not abort if lface is non-existent -
reverts change from v1.275.
2003-05-29 17:08:16 +00:00
Stefan Monnier
a72551529b (build_scalable_font_name): Remove `unused var pixel_size' warning. 2003-05-25 17:47:13 +00:00
Kim F. Storm
c623bbd3a6 [WINDOWSNT]: Move redefinition of FONT_WIDTH macro to
where it's used in x_list_fonts (for clarity).
(frame_update_line_height): Remove unused function; functionality
is now done directly when setting the default font in x_set_font.
2003-05-24 22:09:13 +00:00
Richard M. Stallman
e67f5ccc06 (Finternal_set_lisp_face_attribute): Handle Qunspecified
as value for QCfont attribute.
(realize_default_face): lface should already exist; crash if not.
Specify 0 for FORCE_P when calling set_lface_from_font_name.
2003-05-19 14:41:09 +00:00
Kenichi Handa
f70400f256 (Vface_font_rescale_alist): New variable.
(struct font_name): New member rescale_ratio.
(font_rescale_ratio): New function.
(split_font_name): If NUMERIC_P is nonzero, set
font->rescale_ratio.
(better_font_p): On comparing point sized, pay attention to
recale_ratio member of fonts.
(build_scalable_font_name): Reflect font->rescale_ratio in the
font name.
(syms_of_xfaces): Declare Vface_font_rescale_alist as a Lisp
variable.
2003-04-09 07:26:59 +00:00
Miles Bader
774666fb43 (choose_face_font): Make sure *NEEDS_OVERSTRIKE is always set. 2003-04-03 01:40:58 +00:00
Kim F. Storm
b5bcda6db2 Remove extern decl for frame parameter vars. 2003-03-31 20:36:05 +00:00
Stefan Monnier
2b47daccff (x_face_list_fonts): Fix int/Lisp_Object mixup. 2003-02-22 22:20:00 +00:00
Kenichi Handa
f9a45bb340 (try_alternative_families): Try all scalable fonts if
Vscalable_fonts_allowed is not Qt.
2003-02-19 06:15:15 +00:00
Jan Djärv
72ecb43c59 * xfaces.c (x_face_list_fonts): Set *pfonts to 0 if no fonts found. 2003-02-19 05:59:54 +00:00
Jan Djärv
ee5be7c3c9 * xterm.c (x_list_fonts): If maxnames is less than 0, get all font
names.

* xfaces.c (x_face_list_fonts): Allocate struct font_name here.
(sorted_font_list): Moved allocation of struct font_name to
x_face_list_fonts.
(Fx_font_family_list): Set font-list-limit to -1 to get all font names.
(Fx_list_fonts): Set maxnames to -1 to get all font names.
2003-02-18 21:30:08 +00:00
Juanma Barranquero
177c0ea743 Trailing whitespace deleted. 2003-02-04 14:56:31 +00:00
Miles Bader
6ae2cd5715 (load_face_font): Set `face->overstrike' based on result from
choose_face_font.
(best_matching_font, choose_face_font): Add `needs_overstrike'
argument, and use it to return whether overstriking is desirable
for this face/font combo.
(set_font_frame_param: Pass new argument to choose_face_font.
2002-11-17 23:54:10 +00:00
Juanma Barranquero
e99833cab6 Remove definition of XColor. 2002-10-23 16:55:33 +00:00
Kenichi Handa
e21880c693 (try_font_list): Pay attention to the case that FAMILY is nil. 2002-09-27 00:47:25 +00:00
Kenichi Handa
54580ab203 (try_font_list): New arg PREFER_FACE_FAMILY. If it is
nonzero, try face's family at first.  Otherwise try FAMILY at
first.
(choose_face_font): If C is a single byte char or latin-1, call
try_font_list with PREFER_FACE_FAMILY 1.
2002-09-26 08:04:18 +00:00
Richard M. Stallman
2e1bb1c32d (Fcolor_supported_p): Just one arg is required. 2002-09-13 19:35:08 +00:00
Ken Raeburn
53c208f6a2 (may_use_scalable_font_p): Argument now points to
const.
(x_face_list_fonts, x_update_menu_appearance):
(hash_string_case_insensitive): Treat Lisp string contents as
const.
2002-07-19 14:27:28 +00:00
Ken Raeburn
23889aba6d (xstricmp): String pointer args now point to const. 2002-07-16 19:49:19 +00:00
Ken Raeburn
d5db40779d Most uses of XSTRING combined with STRING_BYTES or indirection changed to
SCHARS, SBYTES, STRING_INTERVALS, SREF, SDATA; explicit size_byte references
left unchanged for now.
2002-07-15 00:01:34 +00:00
Juanma Barranquero
aed1337830 Use macro SPECPDL_INDEX. 2002-07-11 14:18:02 +00:00
Juanma Barranquero
331379bfa7 Rename BINDING_STACK_SIZE to SPECPDL_INDEX. 2002-07-10 08:45:24 +00:00
Andrew Choi
f00691a3e4 In src/:
2002-06-16  Andrew Choi  <akochoi@shaw.ca>

        * fontset.c (syms_of_fontset) [MAC_OS]: Set ASCII font of
        Vdefault_fontset to Monaco with mac-roman coding.

        * mac.c, macfns.c, macmenu.c, macterm.c: Undefine and redefine
        init_process before and after inclusion of Carbon/Carbon.h, resp.

        * macterm.c (x_new_font): Set font for normal_gc, reverse_gc, and
        cursor_gc.
        (add_font_name_table_entry): New function.
        (init_font_name_table): Use add_font_name_table_entry; add italic,
        bold, and bold-italic entries for truetype fonts.

        * xfaces.c (init_frame_faces) [MAC_OS]: Call realize_basic_faces
        for Mac too.
        (try_font_list) [MAC_OS]: If no font matches given registry, try
        fonts with any registry matching face_family.
        (realize_x_face) [MAC_OS]: Remove old ad-hoc fix to load font
        here.

        * s/darwin.h: If autoconf detects the Ncurses library, define
        LIBS_TERMCAP to -lncurses to use it.

In lisp/:

2002-06-16  Andrew Choi  <akochoi@shaw.ca>

        * term/mac-win.el (scalable-fonts-allowed): Set to t.
2002-06-16 23:08:57 +00:00