/* xfaces.c -- "Face" primitives.
- Copyright (C) 1993, 1994, 1998, 1999 Free Software Foundation.
+ Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001
+ Free Software Foundation.
This file is part of GNU Emacs.
changed by defining `faces'. Each face can specify the following
display attributes:
- 1. Font family or fontset alias name.
-
+ 1. Font family name.
+
2. Relative proportionate width, aka character set width or set
width (swidth), e.g. `semi-compressed'.
-
- 3. Font height in 1/10pt
-
+
+ 3. Font height in 1/10pt.
+
4. Font weight, e.g. `bold'.
-
+
5. Font slant, e.g. `italic'.
-
+
6. Foreground color.
-
+
7. Background color.
8. Whether or not characters should be underlined, and in what color.
13. Whether or not a box should be drawn around characters, the box
type, and, for simple boxes, in what color.
+ 14. Font or fontset pattern, or nil. This is a special attribute.
+ When this attribyte is specified, the face uses a font opened by
+ that pattern as is. In addition, all the other font-related
+ attributes (1st thru 5th) are generated from the opened font name.
+ On the other hand, if one of the other font-related attributes are
+ specified, this attribute is set to nil. In that case, the face
+ doesn't inherit this attribute from the `default' face, and uses a
+ font determined by the other attributes (those may be inherited
+ from the `default' face).
+
+ 15. A face name or list of face names from which to inherit attributes.
+
Faces are frame-local by nature because Emacs allows to define the
same named face (face names are symbols) differently for different
frames. Each frame has an alist of face definitions for all named
faces. The value of a named face in such an alist is a Lisp vector
- with the symbol `face' in slot 0, and a slot for each each of the
- face attributes mentioned above.
+ with the symbol `face' in slot 0, and a slot for each of the face
+ attributes mentioned above.
There is also a global face alist `Vface_new_frame_defaults'. Face
definitions from this list are used to initialize faces of newly
created frames.
-
+
A face doesn't have to specify all attributes. Those not specified
- have a value of `unspecified'. Faces specifying all attributes are
- called `fully-specified'.
+ have a value of `unspecified'. Faces specifying all attributes but
+ the 14th are called `fully-specified'.
Face merging.
Face realization.
-
+
After all face attributes for a character have been determined by
merging faces of that character, that face is `realized'. The
realization process maps face attributes to what is physically
`realized face' in form of a struct face which is stored in the
face cache of the frame on which it was realized.
- Face realization is done in the context of the charset of the
- character to display because different fonts and encodings are used
- for different charsets. In other words, for characters of
- different charsets, different realized faces are needed to display
+ Face realization is done in the context of the character to display
+ because different fonts may be used for different characters. In
+ other words, for characters that have different font
+ specifications, different realized faces are needed to display
them.
- Faces are always realized for a specific character set and contain
- a specific font, even if the face being realized specifies a
- fontset (see `font selection' below). The reason is that the
- result of the new font selection stage is better than what can be
- done with statically defined font name patterns in fontsets.
+ Font specification is done by fontsets. See the comment in
+ fontset.c for the details. In the current implementation, all ASCII
+ characters share the same font in a fontset.
+
+ Faces are at first realized for ASCII characters, and, at that
+ time, assigned a specific realized fontset. Hereafter, we call
+ such a face as `ASCII face'. When a face for a multibyte character
+ is realized, it inherits (thus shares) a fontset of an ASCII face
+ that has the same attributes other than font-related ones.
+
+ Thus, all realzied face have a realized fontset.
Unibyte text.
- In unibyte text, Emacs' charsets aren't applicable; function
- `char-charset' reports CHARSET_ASCII for all characters, including
- those > 0x7f. The X registry and encoding of fonts to use is
- determined from the variable `x-unibyte-registry-and-encoding' in
- this case. The variable is initialized at Emacs startup time from
- the font the user specified for Emacs.
-
- Currently all unibyte text, i.e. all buffers with
- enable_multibyte_characters nil are displayed with fonts of the
- same registry and encoding `x-unibyte-registry-and-encoding'. This
- is consistent with the fact that languages can also be set
- globally, only.
-
+ Unibyte text (i.e. raw 8-bit characters) is displayed with the same
+ font as ASCII characters. That is because it is expected that
+ unibyte text users specify a font that is suitable both for ASCII
+ and raw 8-bit characters.
+
Font selection.
Font selection tries to find the best available matching font for a
- given (charset, face) combination. This is done slightly
- differently for faces specifying a fontset, or a font family name.
+ given (character, face) combination.
- If the face specifies a fontset alias name, that fontset determines
- a pattern for fonts of the given charset. If the face specifies a
- font family, a font pattern is constructed. Charset symbols have a
- property `x-charset-registry' for that purpose that maps a charset
- to an XLFD registry and encoding in the font pattern constructed.
+ If the face specifies a fontset name, that fontset determines a
+ pattern for fonts of the given character. If the face specifies a
+ font name or the other font-related attributes, a fontset is
+ realized from the default fontset. In that case, that
+ specification determines a pattern for ASCII characters and the
+ default fontset determines a pattern for multibyte characters.
Available fonts on the system on which Emacs runs are then matched
against the font pattern. The result of font selection is the best
width---tries to find a best match for the specified font height,
etc.
- 2. Setting face-alternative-font-family-alist allows the user to
+ 2. Setting face-font-family-alternatives allows the user to
specify alternative font families to try if a family specified by a
face doesn't exist.
+ 3. Setting face-font-registry-alternatives allows the user to
+ specify all alternative font registries to try for a face
+ specifying a registry.
+
+ 4. Setting face-ignored-fonts allows the user to ignore specific
+ fonts.
+
+
+ Character compositition.
+
+ Usually, the realization process is already finished when Emacs
+ actually reflects the desired glyph matrix on the screen. However,
+ on displaying a composition (sequence of characters to be composed
+ on the screen), a suitable font for the components of the
+ composition is selected and realized while drawing them on the
+ screen, i.e. the realization process is delayed but in principle
+ the same.
- Composite characters.
-
- Realized faces for composite characters are the only ones having a
- fontset id >= 0. When a composite character is encoded into a
- sequence of non-composite characters (in xterm.c), a suitable font
- for the non-composite characters is then selected and realized,
- i.e. the realization process is delayed but in principle the same.
-
Initialization of basic faces.
The faces `default', `modeline' are considered `basic faces'.
basic faces are realized for CHARSET_ASCII. Frame parameters are
used to fill in unspecified attributes of the default face. */
-/* Define SCALABLE_FONTS to a non-zero value to enable scalable
- font use. Define it to zero to disable scalable font use.
-
- Use of too many or too large scalable fonts can crash XFree86
- servers. That's why I've put the code dealing with scalable fonts
- in #if's. */
-
-#define SCALABLE_FONTS 1
-
#include <config.h>
#include <sys/types.h>
#include <sys/stat.h>
#include "charset.h"
#include "frame.h"
+#ifdef HAVE_WINDOW_SYSTEM
+#include "fontset.h"
+#endif /* HAVE_WINDOW_SYSTEM */
+
#ifdef HAVE_X_WINDOWS
#include "xterm.h"
-#include "fontset.h"
#ifdef USE_MOTIF
#include <Xm/Xm.h>
#include <Xm/XmStrDefs.h>
#endif /* USE_MOTIF */
-#endif
+#endif /* HAVE_X_WINDOWS */
#ifdef MSDOS
#include "dosfns.h"
#endif
+#ifdef WINDOWSNT
+#include "w32term.h"
+#include "fontset.h"
+/* Redefine X specifics to W32 equivalents to avoid cluttering the
+ code with #ifdef blocks. */
+#define FRAME_X_DISPLAY_INFO FRAME_W32_DISPLAY_INFO
+#define x_display_info w32_display_info
+#define FRAME_X_FONT_TABLE FRAME_W32_FONT_TABLE
+#define check_x check_w32
+#define x_list_fonts w32_list_fonts
+#define GCGraphicsExposures 0
+/* For historic reasons, FONT_WIDTH refers to average width on W32,
+ not maximum as on X. Redefine here. */
+#define FONT_WIDTH FONT_MAX_WIDTH
+#endif /* WINDOWSNT */
+
+#ifdef macintosh
+#include "macterm.h"
+#define x_display_info mac_display_info
+#define check_x check_mac
+
+extern XGCValues *XCreateGC (void *, WindowPtr, unsigned long, XGCValues *);
+
+static INLINE GC
+x_create_gc (f, mask, xgcv)
+ struct frame *f;
+ unsigned long mask;
+ XGCValues *xgcv;
+{
+ GC gc;
+ gc = XCreateGC (FRAME_MAC_DISPLAY (f), FRAME_MAC_WINDOW (f), mask, xgcv);
+ return gc;
+}
+
+static INLINE void
+x_free_gc (f, gc)
+ struct frame *f;
+ GC gc;
+{
+ XFreeGC (FRAME_MAC_DISPLAY (f), gc);
+}
+#endif
+
#include "buffer.h"
#include "dispextern.h"
#include "blockinput.h"
#define abs(X) ((X) < 0 ? -(X) : (X))
#endif
+/* Number of pt per inch (from the TeXbook). */
+
+#define PT_PER_INCH 72.27
+
/* Non-zero if face attribute ATTR is unspecified. */
#define UNSPECIFIEDP(ATTR) EQ ((ATTR), Qunspecified)
#define DIM(VECTOR) (sizeof (VECTOR) / sizeof *(VECTOR))
-/* Make a copy of string S on the stack using alloca. Value is a pointer
+/* Make a copy of string S on the stack using alloca. Value is a pointer
to the copy. */
#define STRDUPA(S) strcpy ((char *) alloca (strlen ((S)) + 1), (S))
#define LSTRDUPA(S) STRDUPA (XSTRING ((S))->data)
-/* Size of hash table of realized faces in face caches (should be a
+/* Size of hash table of realized faces in face caches (should be a
prime number). */
#define FACE_CACHE_BUCKETS_SIZE 1001
/* A definition of XColor for non-X frames. */
+
#ifndef HAVE_X_WINDOWS
-typedef struct {
+
+typedef struct
+{
unsigned long pixel;
unsigned short red, green, blue;
char flags;
char pad;
-} XColor;
-#endif
+}
+XColor;
+
+#endif /* not HAVE_X_WINDOWS */
/* Keyword symbols used for face attribute names. */
Lisp_Object QCinverse_video, QCforeground, QCbackground, QCstipple;
Lisp_Object QCwidth, QCfont, QCbold, QCitalic;
Lisp_Object QCreverse_video;
-Lisp_Object QCoverline, QCstrike_through, QCbox;
+Lisp_Object QCoverline, QCstrike_through, QCbox, QCinherit;
/* Symbols used for attribute values. */
Lisp_Object Qultra_expanded;
Lisp_Object Qreleased_button, Qpressed_button;
Lisp_Object QCstyle, QCcolor, QCline_width;
-Lisp_Object Qunspecified, Qunspecified_fg, Qunspecified_bg;
+Lisp_Object Qunspecified;
-/* The symbol `x-charset-registry'. This property of charsets defines
- the X registry and encoding that fonts should have that are used to
- display characters of that charset. */
-
-Lisp_Object Qx_charset_registry;
+char unspecified_fg[] = "unspecified-fg", unspecified_bg[] = "unspecified-bg";
/* The name of the function to call when the background of the frame
has changed, frame_update_face_colors. */
Lisp_Object Vface_default_stipple;
-/* Default registry and encoding to use for charsets whose charset
- symbols don't specify one. */
-
-Lisp_Object Vface_default_registry;
-
/* Alist of alternative font families. Each element is of the form
(FAMILY FAMILY1 FAMILY2 ...). If fonts of FAMILY can't be loaded,
try FAMILY1, then FAMILY2, ... */
Lisp_Object Vface_alternative_font_family_alist;
+/* Alist of alternative font registries. Each element is of the form
+ (REGISTRY REGISTRY1 REGISTRY2...). If fonts of REGISTRY can't be
+ loaded, try REGISTRY1, then REGISTRY2, ... */
+
+Lisp_Object Vface_alternative_font_registry_alist;
+
/* Allowed scalable fonts. A value of nil means don't allow any
scalable fonts. A value of t means allow the use of any scalable
font. Otherwise, value must be a list of regular expressions. A
font may be scaled if its name matches a regular expression in the
list. */
-#if SCALABLE_FONTS
Lisp_Object Vscalable_fonts_allowed;
-#endif
+
+/* List of regular expressions that matches names of fonts to ignore. */
+
+Lisp_Object Vface_ignored_fonts;
/* Maximum number of fonts to consider in font_list. If not an
integer > 0, DEFAULT_FONT_LIST_LIMIT is used instead. */
static Lisp_Object *lface_id_to_name;
static int lface_id_to_name_size;
-/* tty color-related functions (defined on lisp/term/tty-colors.el). */
+/* TTY color-related functions (defined in tty-colors.el). */
+
Lisp_Object Qtty_color_desc, Qtty_color_by_index;
+/* The name of the function used to compute colors on TTYs. */
+
+Lisp_Object Qtty_color_alist;
+
+/* An alist of defined terminal colors and their RGB values. */
+
+Lisp_Object Vtty_defined_color_alist;
+
/* Counter for calls to clear_face_cache. If this counter reaches
CLEAR_FONT_TABLE_COUNT, and a frame has more than
CLEAR_FONT_TABLE_NFONTS load, unused fonts are freed. */
int face_change_count;
+/* Incremented for every change in the `menu' face. */
+
+int menu_face_change_count;
+
+/* Non-zero means don't display bold text if a face's foreground
+ and background colors are the inverse of the default colors of the
+ display. This is a kluge to suppress `bold black' foreground text
+ which is hard to read on an LCD monitor. */
+
+int tty_suppress_bold_inverse_default_colors_p;
+
+/* A list of the form `((x . y))' used to avoid consing in
+ Finternal_set_lisp_face_attribute. */
+
+static Lisp_Object Vparam_value_alist;
+
/* The total number of colors currently allocated. */
#if GLYPH_DEBUG
struct font_name;
struct table_entry;
+static void map_tty_color P_ ((struct frame *, struct face *,
+ enum lface_attribute_index, int *));
static Lisp_Object resolve_face_name P_ ((Lisp_Object));
static int may_use_scalable_font_p P_ ((struct font_name *, char *));
static void set_font_frame_param P_ ((Lisp_Object, Lisp_Object));
static int x_face_list_fonts P_ ((struct frame *, char *,
struct font_name *, int, int, int));
static int font_scalable_p P_ ((struct font_name *));
-static Lisp_Object deduce_unibyte_registry P_ ((struct frame *, char *));
static int get_lface_attributes P_ ((struct frame *, Lisp_Object, Lisp_Object *, int));
static int load_pixmap P_ ((struct frame *, Lisp_Object, unsigned *, unsigned *));
-static char *xstrdup P_ ((char *));
static unsigned char *xstrlwr P_ ((unsigned char *));
static void signal_error P_ ((char *, Lisp_Object));
static struct frame *frame_or_selected_frame P_ ((Lisp_Object, int));
-static void load_face_font_or_fontset P_ ((struct frame *, struct face *, char *, int));
+static void load_face_font P_ ((struct frame *, struct face *, int));
static void load_face_colors P_ ((struct frame *, struct face *, Lisp_Object *));
static void free_face_colors P_ ((struct frame *, struct face *));
static int face_color_gray_p P_ ((struct frame *, char *));
static int sorted_font_list P_ ((struct frame *, char *,
int (*cmpfn) P_ ((const void *, const void *)),
struct font_name **));
-static int font_list P_ ((struct frame *, char *, char *, char *, struct font_name **));
-static int try_font_list P_ ((struct frame *, Lisp_Object *, char *, char *, char *,
- struct font_name **));
+static int font_list_1 P_ ((struct frame *, Lisp_Object, Lisp_Object,
+ Lisp_Object, struct font_name **));
+static int font_list P_ ((struct frame *, Lisp_Object, Lisp_Object,
+ Lisp_Object, struct font_name **));
+static int try_font_list P_ ((struct frame *, Lisp_Object *, Lisp_Object,
+ Lisp_Object, Lisp_Object, struct font_name **));
static int cmp_font_names P_ ((const void *, const void *));
-static struct face *realize_face P_ ((struct face_cache *,
- Lisp_Object *, int));
+static struct face *realize_face P_ ((struct face_cache *, Lisp_Object *, int,
+ struct face *, int));
static struct face *realize_x_face P_ ((struct face_cache *,
- Lisp_Object *, int));
+ Lisp_Object *, int, struct face *));
static struct face *realize_tty_face P_ ((struct face_cache *,
Lisp_Object *, int));
static int realize_basic_faces P_ ((struct frame *));
static int face_numeric_weight P_ ((Lisp_Object));
static int face_numeric_slant P_ ((Lisp_Object));
static int face_numeric_swidth P_ ((Lisp_Object));
-static int face_fontset P_ ((struct frame *, Lisp_Object *));
-static char *choose_face_font P_ ((struct frame *, Lisp_Object *, int,
- Lisp_Object));
-static char *choose_face_fontset_font P_ ((struct frame *, Lisp_Object *,
- int, int));
-static void merge_face_vectors P_ ((Lisp_Object *from, Lisp_Object *));
+static int face_fontset P_ ((Lisp_Object *));
+static char *choose_face_font P_ ((struct frame *, Lisp_Object *, int, int));
+static void merge_face_vectors P_ ((struct frame *, Lisp_Object *, Lisp_Object*, Lisp_Object));
+static void merge_face_inheritance P_ ((struct frame *f, Lisp_Object,
+ Lisp_Object *, Lisp_Object));
static void merge_face_vector_with_property P_ ((struct frame *, Lisp_Object *,
Lisp_Object));
-static int set_lface_from_font_name P_ ((struct frame *, Lisp_Object, char *,
- int, int));
+static int set_lface_from_font_name P_ ((struct frame *, Lisp_Object,
+ Lisp_Object, int, int));
static Lisp_Object lface_from_face_name P_ ((struct frame *, Lisp_Object, int));
-static struct face *make_realized_face P_ ((Lisp_Object *, int, Lisp_Object));
+static struct face *make_realized_face P_ ((Lisp_Object *));
static void free_realized_faces P_ ((struct face_cache *));
static char *best_matching_font P_ ((struct frame *, Lisp_Object *,
struct font_name *, int));
static int xlfd_numeric_value P_ ((struct table_entry *, int, struct font_name *,
int, int));
static Lisp_Object xlfd_symbolic_value P_ ((struct table_entry *, int,
- struct font_name *, int, int));
+ struct font_name *, int,
+ Lisp_Object));
static struct table_entry *xlfd_lookup_field_contents P_ ((struct table_entry *, int,
struct font_name *, int));
-#ifdef HAVE_X_WINDOWS
+#ifdef HAVE_WINDOW_SYSTEM
static int split_font_name P_ ((struct frame *, struct font_name *, int));
static int xlfd_point_size P_ ((struct frame *, struct font_name *));
static void x_free_gc P_ ((struct frame *, GC));
static void clear_font_table P_ ((struct frame *));
-#endif /* HAVE_X_WINDOWS */
+#ifdef WINDOWSNT
+extern Lisp_Object w32_list_fonts P_ ((struct frame *, Lisp_Object, int, int));
+#endif /* WINDOWSNT */
+
+#endif /* HAVE_WINDOW_SYSTEM */
\f
/***********************************************************************
#ifdef HAVE_X_WINDOWS
+#ifdef DEBUG_X_COLORS
+
+/* The following is a poor mans infrastructure for debugging X color
+ allocation problems on displays with PseudoColor-8. Some X servers
+ like 3.3.5 XF86_SVGA with Matrox cards apparently don't implement
+ color reference counts completely so that they don't signal an
+ error when a color is freed whose reference count is already 0.
+ Other X servers do. To help me debug this, the following code
+ implements a simple reference counting schema of its own, for a
+ single display/screen. --gerd. */
+
+/* Reference counts for pixel colors. */
+
+int color_count[256];
+
+/* Register color PIXEL as allocated. */
+
+void
+register_color (pixel)
+ unsigned long pixel;
+{
+ xassert (pixel < 256);
+ ++color_count[pixel];
+}
+
+
+/* Register color PIXEL as deallocated. */
+
+void
+unregister_color (pixel)
+ unsigned long pixel;
+{
+ xassert (pixel < 256);
+ if (color_count[pixel] > 0)
+ --color_count[pixel];
+ else
+ abort ();
+}
+
+
+/* Register N colors from PIXELS as deallocated. */
+
+void
+unregister_colors (pixels, n)
+ unsigned long *pixels;
+ int n;
+{
+ int i;
+ for (i = 0; i < n; ++i)
+ unregister_color (pixels[i]);
+}
+
+
+DEFUN ("dump-colors", Fdump_colors, Sdump_colors, 0, 0, 0,
+ "Dump currently allocated colors and their reference counts to stderr.")
+ ()
+{
+ int i, n;
+
+ fputc ('\n', stderr);
+
+ for (i = n = 0; i < sizeof color_count / sizeof color_count[0]; ++i)
+ if (color_count[i])
+ {
+ fprintf (stderr, "%3d: %5d", i, color_count[i]);
+ ++n;
+ if (n % 5 == 0)
+ fputc ('\n', stderr);
+ else
+ fputc ('\t', stderr);
+ }
+
+ if (n % 5 != 0)
+ fputc ('\n', stderr);
+ return Qnil;
+}
+
+#endif /* DEBUG_X_COLORS */
+
+
+/* Free colors used on frame F. PIXELS is an array of NPIXELS pixel
+ color values. Interrupt input must be blocked when this function
+ is called. */
+
+void
+x_free_colors (f, pixels, npixels)
+ struct frame *f;
+ unsigned long *pixels;
+ int npixels;
+{
+ int class = FRAME_X_DISPLAY_INFO (f)->visual->class;
+
+ /* If display has an immutable color map, freeing colors is not
+ necessary and some servers don't allow it. So don't do it. */
+ if (class != StaticColor && class != StaticGray && class != TrueColor)
+ {
+#ifdef DEBUG_X_COLORS
+ unregister_colors (pixels, npixels);
+#endif
+ XFreeColors (FRAME_X_DISPLAY (f), FRAME_X_COLORMAP (f),
+ pixels, npixels, 0);
+ }
+}
+
+
+/* Free colors used on frame F. PIXELS is an array of NPIXELS pixel
+ color values. Interrupt input must be blocked when this function
+ is called. */
+
+void
+x_free_dpy_colors (dpy, screen, cmap, pixels, npixels)
+ Display *dpy;
+ Screen *screen;
+ Colormap cmap;
+ unsigned long *pixels;
+ int npixels;
+{
+ struct x_display_info *dpyinfo = x_display_info_for_display (dpy);
+ int class = dpyinfo->visual->class;
+
+ /* If display has an immutable color map, freeing colors is not
+ necessary and some servers don't allow it. So don't do it. */
+ if (class != StaticColor && class != StaticGray && class != TrueColor)
+ {
+#ifdef DEBUG_X_COLORS
+ unregister_colors (pixels, npixels);
+#endif
+ XFreeColors (dpy, cmap, pixels, npixels, 0);
+ }
+}
+
+
/* Create and return a GC for use on frame F. GC values and mask
are given by XGCV and MASK. */
#endif /* HAVE_X_WINDOWS */
+#ifdef WINDOWSNT
+/* W32 emulation of GCs */
+
+static INLINE GC
+x_create_gc (f, mask, xgcv)
+ struct frame *f;
+ unsigned long mask;
+ XGCValues *xgcv;
+{
+ GC gc;
+ BLOCK_INPUT;
+ gc = XCreateGC (NULL, FRAME_W32_WINDOW (f), mask, xgcv);
+ UNBLOCK_INPUT;
+ IF_DEBUG (++ngcs);
+ return gc;
+}
-/* Like strdup, but uses xmalloc. */
-static char *
-xstrdup (s)
- char *s;
+/* Free GC which was used on frame F. */
+
+static INLINE void
+x_free_gc (f, gc)
+ struct frame *f;
+ GC gc;
{
- int len = strlen (s) + 1;
- char *p = (char *) xmalloc (len);
- bcopy (s, p, len);
- return p;
+ BLOCK_INPUT;
+ xassert (--ngcs >= 0);
+ xfree (gc);
+ UNBLOCK_INPUT;
}
+#endif /* WINDOWSNT */
/* Like stricmp. Used to compare parts of font names which are in
ISO8859-1. */
{
if (NILP (frame))
frame = selected_frame;
-
+
CHECK_LIVE_FRAME (frame, nparam);
return XFRAME (frame);
}
/* Make a face cache, if F doesn't have one. */
if (FRAME_FACE_CACHE (f) == NULL)
FRAME_FACE_CACHE (f) = make_face_cache (f);
-
-#ifdef HAVE_X_WINDOWS
+
+#ifdef HAVE_WINDOW_SYSTEM
/* Make the image cache. */
- if (FRAME_X_P (f))
+ if (FRAME_WINDOW_P (f))
{
if (FRAME_X_IMAGE_CACHE (f) == NULL)
FRAME_X_IMAGE_CACHE (f) = make_image_cache ();
++FRAME_X_IMAGE_CACHE (f)->refcount;
}
-#endif /* HAVE_X_WINDOWS */
+#endif /* HAVE_WINDOW_SYSTEM */
- /* Realize basic faces. Must have enough information in frame
+ /* Realize basic faces. Must have enough information in frame
parameters to realize basic faces at this point. */
#ifdef HAVE_X_WINDOWS
if (!FRAME_X_P (f) || FRAME_X_WINDOW (f))
+#endif
+#ifdef WINDOWSNT
+ if (!FRAME_WINDOW_P (f) || FRAME_W32_WINDOW (f))
#endif
if (!realize_basic_faces (f))
abort ();
struct frame *f;
{
struct face_cache *face_cache = FRAME_FACE_CACHE (f);
-
+
if (face_cache)
{
free_face_cache (face_cache);
FRAME_FACE_CACHE (f) = NULL;
}
-#ifdef HAVE_X_WINDOWS
- if (FRAME_X_P (f))
+#ifdef HAVE_WINDOW_SYSTEM
+ if (FRAME_WINDOW_P (f))
{
struct image_cache *image_cache = FRAME_X_IMAGE_CACHE (f);
if (image_cache)
free_image_cache (f);
}
}
-#endif /* HAVE_X_WINDOWS */
+#endif /* HAVE_WINDOW_SYSTEM */
}
clear_face_cache (clear_fonts_p)
int clear_fonts_p;
{
-#ifdef HAVE_X_WINDOWS
+#ifdef HAVE_WINDOW_SYSTEM
Lisp_Object tail, frame;
struct frame *f;
FOR_EACH_FRAME (tail, frame)
{
f = XFRAME (frame);
- if (FRAME_X_P (f)
+ if (FRAME_WINDOW_P (f)
&& FRAME_X_DISPLAY_INFO (f)->n_fonts > CLEAR_FONT_TABLE_NFONTS)
{
free_all_realized_faces (frame);
FOR_EACH_FRAME (tail, frame)
{
f = XFRAME (frame);
- if (FRAME_X_P (f))
+ if (FRAME_WINDOW_P (f))
{
clear_face_gcs (FRAME_FACE_CACHE (f));
clear_image_cache (f, 0);
}
}
}
-#endif /* HAVE_X_WINDOWS */
+#endif /* HAVE_WINDOW_SYSTEM */
}
Lisp_Object thorougly;
{
clear_face_cache (!NILP (thorougly));
+ ++face_change_count;
+ ++windows_or_buffers_changed;
return Qnil;
}
-#ifdef HAVE_X_WINDOWS
+#ifdef HAVE_WINDOW_SYSTEM
-/* Remove those fonts from the font table of frame F that are not used
- by fontsets. Called from clear_face_cache from time to time. */
+/* Remove those fonts from the font table of frame F exept for the
+ default ASCII font for the frame. Called from clear_face_cache
+ from time to time. */
static void
clear_font_table (f)
struct frame *f;
{
struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
- char *used;
- Lisp_Object rest, frame;
int i;
- xassert (FRAME_X_P (f));
+ xassert (FRAME_WINDOW_P (f));
- used = (char *) alloca (dpyinfo->n_fonts * sizeof *used);
- bzero (used, dpyinfo->n_fonts * sizeof *used);
+ /* Free those fonts that are not used by the frame F as the default. */
+ for (i = 0; i < dpyinfo->n_fonts; ++i)
+ {
+ struct font_info *font_info = dpyinfo->font_table + i;
- /* For all frames with the same x_display_info as F, record
- in `used' those fonts that are in use by fontsets. */
- FOR_EACH_FRAME (rest, frame)
- if (FRAME_X_DISPLAY_INFO (XFRAME (frame)) == dpyinfo)
- {
- struct frame *f = XFRAME (frame);
- struct fontset_data *fontset_data = FRAME_FONTSET_DATA (f);
+ if (!font_info->name
+ || font_info->font == FRAME_FONT (f))
+ continue;
- for (i = 0; i < fontset_data->n_fontsets; ++i)
- {
- struct fontset_info *info = fontset_data->fontset_table[i];
- int j;
-
- for (j = 0; j <= MAX_CHARSET; ++j)
- {
- int idx = info->font_indexes[j];
- if (idx >= 0)
- used[idx] = 1;
- }
- }
- }
+ /* Free names. */
+ if (font_info->full_name != font_info->name)
+ xfree (font_info->full_name);
+ xfree (font_info->name);
- /* Free those fonts that are not used by fontsets. */
- for (i = 0; i < dpyinfo->n_fonts; ++i)
- if (used[i] == 0 && dpyinfo->font_table[i].name)
- {
- struct font_info *font_info = dpyinfo->font_table + i;
-
- /* Free names. In xfns.c there is a comment that full_name
- should never be freed because it is always shared with
- something else. I don't think this is true anymore---see
- x_load_font. It's either equal to font_info->name or
- allocated via xmalloc, and there seems to be no place in
- the source files where full_name is transferred to another
- data structure. */
- if (font_info->full_name != font_info->name)
- xfree (font_info->full_name);
- xfree (font_info->name);
-
- /* Free the font. */
- BLOCK_INPUT;
- XFreeFont (dpyinfo->display, font_info->font);
- UNBLOCK_INPUT;
-
- /* Mark font table slot free. */
- font_info->font = NULL;
- font_info->name = font_info->full_name = NULL;
- }
-}
+ /* Free the font. */
+ BLOCK_INPUT;
+#ifdef HAVE_X_WINDOWS
+ XFreeFont (dpyinfo->display, font_info->font);
+#endif
+#ifdef WINDOWSNT
+ w32_unload_font (dpyinfo, font_info->font);
+#endif
+ UNBLOCK_INPUT;
+ /* Mark font table slot free. */
+ font_info->font = NULL;
+ font_info->name = font_info->full_name = NULL;
+ }
+}
-#endif /* HAVE_X_WINDOWS */
+#endif /* HAVE_WINDOW_SYSTEM */
\f
X Pixmaps
***********************************************************************/
-#ifdef HAVE_X_WINDOWS
+#ifdef HAVE_WINDOW_SYSTEM
DEFUN ("bitmap-spec-p", Fbitmap_spec_p, Sbitmap_spec_p, 1, 1, 0,
"Value is non-nil if OBJECT is a valid bitmap specification.\n\
Lisp_Object object;
{
int pixmap_p = 0;
-
+
if (STRINGP (object))
/* If OBJECT is a string, it's a file name. */
pixmap_p = 1;
Lisp_Object width, height, data;
height = width = data = Qnil;
-
+
if (CONSP (object))
{
width = XCAR (object);
{
int bytes_per_row = ((XFASTINT (width) + BITS_PER_CHAR - 1)
/ BITS_PER_CHAR);
- if (STRING_BYTES (XSTRING (data)) >= bytes_per_row * height)
+ if (STRING_BYTES (XSTRING (data)) >= bytes_per_row * XINT (height))
pixmap_p = 1;
}
}
return bitmap_id;
}
-#endif /* HAVE_X_WINDOWS */
+#endif /* HAVE_WINDOW_SYSTEM */
\f
Minimum font bounds
***********************************************************************/
-#ifdef HAVE_X_WINDOWS
+#ifdef HAVE_WINDOW_SYSTEM
/* Update the line_height of frame F. Return non-zero if line height
changes. */
frame_update_line_height (f)
struct frame *f;
{
- int fontset, line_height, changed_p;
-
- fontset = f->output_data.x->fontset;
- if (fontset > 0)
- line_height = FRAME_FONTSET_DATA (f)->fontset_table[fontset]->height;
- else
- line_height = FONT_HEIGHT (f->output_data.x->font);
-
- changed_p = line_height != f->output_data.x->line_height;
- f->output_data.x->line_height = line_height;
+ int line_height, changed_p;
+
+ line_height = FONT_HEIGHT (FRAME_FONT (f));
+ changed_p = line_height != FRAME_LINE_HEIGHT (f);
+ FRAME_LINE_HEIGHT (f) = line_height;
return changed_p;
}
-#endif /* HAVE_X_WINDOWS */
+#endif /* HAVE_WINDOW_SYSTEM */
\f
/***********************************************************************
Fonts
***********************************************************************/
-#ifdef HAVE_X_WINDOWS
+#ifdef HAVE_WINDOW_SYSTEM
-/* Load font or fontset of face FACE which is used on frame F.
- FONTSET is the fontset FACE should use or -1, if FACE doesn't use a
- fontset. FONT_NAME is the name of the font to load, if no fontset
- is used. It is null if no suitable font name could be determined
- for the face. */
+/* Load font of face FACE which is used on frame F to display
+ character C. The name of the font to load is determined by lface
+ and fontset of FACE. */
static void
-load_face_font_or_fontset (f, face, font_name, fontset)
+load_face_font (f, face, c)
struct frame *f;
struct face *face;
- char *font_name;
- int fontset;
+ int c;
{
struct font_info *font_info = NULL;
+ char *font_name;
face->font_info_id = -1;
- face->fontset = fontset;
face->font = NULL;
-
+
+ font_name = choose_face_font (f, face->lface, face->fontset, c);
+ if (!font_name)
+ return;
+
BLOCK_INPUT;
- if (fontset >= 0)
- font_info = FS_LOAD_FONT (f, FRAME_X_FONT_TABLE (f), CHARSET_ASCII,
- NULL, fontset);
- else if (font_name)
- font_info = FS_LOAD_FONT (f, FRAME_X_FONT_TABLE (f), face->charset,
- font_name, -1);
+ font_info = FS_LOAD_FACE_FONT (f, c, font_name, face);
UNBLOCK_INPUT;
if (font_info)
{
- char *s;
- int i;
-
- face->font_info_id = FONT_INFO_ID (f, font_info);
+ face->font_info_id = font_info->font_idx;
face->font = font_info->font;
face->font_name = font_info->full_name;
-
- /* Make the registry part of the font name readily accessible.
- The registry is used to find suitable faces for unibyte text. */
- s = font_info->full_name + strlen (font_info->full_name);
- i = 0;
- while (i < 2 && --s >= font_info->full_name)
- if (*s == '-')
- ++i;
-
- if (!STRINGP (face->registry)
- || xstricmp (XSTRING (face->registry)->data, s + 1) != 0)
+ if (face->gc)
{
- if (STRINGP (Vface_default_registry)
- && !xstricmp (XSTRING (Vface_default_registry)->data, s + 1))
- face->registry = Vface_default_registry;
- else
- face->registry = build_string (s + 1);
+ x_free_gc (f, face->gc);
+ face->gc = 0;
}
}
- else if (fontset >= 0)
- add_to_log ("Unable to load ASCII font of fontset %d",
- make_number (fontset), Qnil);
- else if (font_name)
+ else
add_to_log ("Unable to load font %s",
build_string (font_name), Qnil);
+ xfree (font_name);
}
-#endif /* HAVE_X_WINDOWS */
+#endif /* HAVE_WINDOW_SYSTEM */
\f
***********************************************************************/
/* A version of defined_color for non-X frames. */
+
int
tty_defined_color (f, color_name, color_def, alloc)
struct frame *f;
int alloc;
{
Lisp_Object color_desc;
- int color_idx = FACE_TTY_DEFAULT_COLOR, red = 0, green = 0, blue = 0;
+ unsigned long color_idx = FACE_TTY_DEFAULT_COLOR;
+ unsigned long red = 0, green = 0, blue = 0;
int status = 1;
if (*color_name && !NILP (Ffboundp (Qtty_color_desc)))
color_idx = FACE_TTY_DEFAULT_BG_COLOR;
}
- color_def->pixel = (unsigned long) color_idx;
+ if (color_idx != FACE_TTY_DEFAULT_COLOR)
+ status = 1;
+
+ color_def->pixel = color_idx;
color_def->red = red;
color_def->green = green;
color_def->blue = blue;
return status;
}
-/* Decide if color named COLOR is valid for the display associated
- with the frame F; if so, return the rgb values in COLOR_DEF. If
- ALLOC is nonzero, allocate a new colormap cell.
+
+/* Decide if color named COLOR_NAME is valid for the display
+ associated with the frame F; if so, return the rgb values in
+ COLOR_DEF. If ALLOC is nonzero, allocate a new colormap cell.
This does the right thing for any type of frame. */
+
int
defined_color (f, color_name, color_def, alloc)
struct frame *f;
#endif
#ifdef WINDOWSNT
else if (FRAME_W32_P (f))
- /* FIXME: w32_defined_color doesn't exist! w32fns.c defines
- defined_color which needs to be renamed, and the declaration
- of color_def therein should be changed. */
return w32_defined_color (f, color_name, color_def, alloc);
#endif
#ifdef macintosh
else if (FRAME_MAC_P (f))
- /* FIXME: mac_defined_color doesn't exist! */
return mac_defined_color (f, color_name, color_def, alloc);
#endif
else
abort ();
}
-/* Given the index of the tty color, return its name, a Lisp string. */
+
+/* Given the index IDX of a tty color on frame F, return its name, a
+ Lisp string. */
Lisp_Object
tty_color_name (f, idx)
struct frame *f;
int idx;
{
- char *color;
-
if (idx >= 0 && !NILP (Ffboundp (Qtty_color_by_index)))
{
Lisp_Object frame;
return msdos_stdcolor_name (idx);
#endif
+ if (idx == FACE_TTY_DEFAULT_FG_COLOR)
+ return build_string (unspecified_fg);
+ if (idx == FACE_TTY_DEFAULT_BG_COLOR)
+ return build_string (unspecified_bg);
+
#ifdef WINDOWSNT
- /* FIXME: When/if w32 supports colors in non-window mode, there should
- be a call here to a w32-specific function that returns the color
- by index using the default color mapping on a Windows console. */
+ return vga_stdcolor_name (idx);
#endif
- return
- idx == FACE_TTY_DEFAULT_FG_COLOR ? Qunspecified_fg
- : idx == FACE_TTY_DEFAULT_BG_COLOR ? Qunspecified_bg
- : Qunspecified;
+ return Qunspecified;
}
+
/* Return non-zero if COLOR_NAME is a shade of gray (or white or
black) on frame F. The algorithm is taken from 20.2 faces.el. */
< max (color.blue, color.red) / 20));
else
gray_p = 0;
-
+
return gray_p;
}
return Qnil;
}
+
/* Load color with name NAME for use by face FACE on frame F.
TARGET_INDEX must be one of LFACE_FOREGROUND_INDEX,
LFACE_BACKGROUND_INDEX, LFACE_UNDERLINE_INDEX, LFACE_OVERLINE_INDEX,
enum lface_attribute_index target_index;
{
XColor color;
-
+
xassert (STRINGP (name));
xassert (target_index == LFACE_FOREGROUND_INDEX
|| target_index == LFACE_BACKGROUND_INDEX
|| target_index == LFACE_OVERLINE_INDEX
|| target_index == LFACE_STRIKE_THROUGH_INDEX
|| target_index == LFACE_BOX_INDEX);
-
+
/* if the color map is full, defined_color will return a best match
to the values in an existing cell. */
if (!defined_color (f, XSTRING (name)->data, &color, 1))
{
add_to_log ("Unable to load color \"%s\"", name, Qnil);
-
+
switch (target_index)
{
case LFACE_FOREGROUND_INDEX:
face->foreground_defaulted_p = 1;
color.pixel = FRAME_FOREGROUND_PIXEL (f);
break;
-
+
case LFACE_BACKGROUND_INDEX:
face->background_defaulted_p = 1;
color.pixel = FRAME_BACKGROUND_PIXEL (f);
break;
-
+
case LFACE_UNDERLINE_INDEX:
face->underline_defaulted_p = 1;
color.pixel = FRAME_FOREGROUND_PIXEL (f);
break;
-
+
case LFACE_OVERLINE_INDEX:
face->overline_color_defaulted_p = 1;
color.pixel = FRAME_FOREGROUND_PIXEL (f);
break;
-
+
case LFACE_STRIKE_THROUGH_INDEX:
face->strike_through_color_defaulted_p = 1;
color.pixel = FRAME_FOREGROUND_PIXEL (f);
break;
-
+
case LFACE_BOX_INDEX:
face->box_color_defaulted_p = 1;
color.pixel = FRAME_FOREGROUND_PIXEL (f);
else
++ncolors_allocated;
#endif
-
+
return color.pixel;
}
-#ifdef HAVE_X_WINDOWS
+
+#ifdef HAVE_WINDOW_SYSTEM
/* Load colors for face FACE which is used on frame F. Colors are
specified by slots LFACE_BACKGROUND_INDEX and LFACE_FOREGROUND_INDEX
struct frame *f;
unsigned long pixel;
{
- Display *dpy = FRAME_X_DISPLAY (f);
- int class = FRAME_X_DISPLAY_INFO (f)->visual->class;
-
- if (pixel == BLACK_PIX_DEFAULT (f)
- || pixel == WHITE_PIX_DEFAULT (f))
- return;
-
+#ifdef HAVE_X_WINDOWS
BLOCK_INPUT;
-
- /* If display has an immutable color map, freeing colors is not
- necessary and some servers don't allow it. So don't do it. */
- if (! (class == StaticColor || class == StaticGray || class == TrueColor))
- {
- Colormap cmap = DefaultColormapOfScreen (FRAME_X_SCREEN (f));
- XFreeColors (dpy, cmap, &pixel, 1, 0);
- }
-
+ x_free_colors (f, &pixel, 1);
UNBLOCK_INPUT;
+#endif
}
struct frame *f;
struct face *face;
{
- int class = FRAME_X_DISPLAY_INFO (f)->visual->class;
-
- /* If display has an immutable color map, freeing colors is not
- necessary and some servers don't allow it. So don't do it. */
- if (class != StaticColor
- && class != StaticGray
- && class != TrueColor)
+#ifdef HAVE_X_WINDOWS
+ BLOCK_INPUT;
+
+ if (!face->foreground_defaulted_p)
{
- Display *dpy;
- Colormap cmap;
-
- BLOCK_INPUT;
- dpy = FRAME_X_DISPLAY (f);
- cmap = DefaultColormapOfScreen (FRAME_X_SCREEN (f));
-
- if (face->foreground != BLACK_PIX_DEFAULT (f)
- && face->foreground != WHITE_PIX_DEFAULT (f)
- && !face->foreground_defaulted_p)
- {
- XFreeColors (dpy, cmap, &face->foreground, 1, 0);
- IF_DEBUG (--ncolors_allocated);
- }
-
- if (face->background != BLACK_PIX_DEFAULT (f)
- && face->background != WHITE_PIX_DEFAULT (f)
- && !face->background_defaulted_p)
- {
- XFreeColors (dpy, cmap, &face->background, 1, 0);
- IF_DEBUG (--ncolors_allocated);
- }
+ x_free_colors (f, &face->foreground, 1);
+ IF_DEBUG (--ncolors_allocated);
+ }
- if (face->underline_p
- && !face->underline_defaulted_p
- && face->underline_color != BLACK_PIX_DEFAULT (f)
- && face->underline_color != WHITE_PIX_DEFAULT (f))
- {
- XFreeColors (dpy, cmap, &face->underline_color, 1, 0);
- IF_DEBUG (--ncolors_allocated);
- }
+ if (!face->background_defaulted_p)
+ {
+ x_free_colors (f, &face->background, 1);
+ IF_DEBUG (--ncolors_allocated);
+ }
- if (face->overline_p
- && !face->overline_color_defaulted_p
- && face->overline_color != BLACK_PIX_DEFAULT (f)
- && face->overline_color != WHITE_PIX_DEFAULT (f))
- {
- XFreeColors (dpy, cmap, &face->overline_color, 1, 0);
- IF_DEBUG (--ncolors_allocated);
- }
+ if (face->underline_p
+ && !face->underline_defaulted_p)
+ {
+ x_free_colors (f, &face->underline_color, 1);
+ IF_DEBUG (--ncolors_allocated);
+ }
- if (face->strike_through_p
- && !face->strike_through_color_defaulted_p
- && face->strike_through_color != BLACK_PIX_DEFAULT (f)
- && face->strike_through_color != WHITE_PIX_DEFAULT (f))
- {
- XFreeColors (dpy, cmap, &face->strike_through_color, 1, 0);
- IF_DEBUG (--ncolors_allocated);
- }
+ if (face->overline_p
+ && !face->overline_color_defaulted_p)
+ {
+ x_free_colors (f, &face->overline_color, 1);
+ IF_DEBUG (--ncolors_allocated);
+ }
- if (face->box != FACE_NO_BOX
- && !face->box_color_defaulted_p
- && face->box_color != BLACK_PIX_DEFAULT (f)
- && face->box_color != WHITE_PIX_DEFAULT (f))
- {
- XFreeColors (dpy, cmap, &face->box_color, 1, 0);
- IF_DEBUG (--ncolors_allocated);
- }
+ if (face->strike_through_p
+ && !face->strike_through_color_defaulted_p)
+ {
+ x_free_colors (f, &face->strike_through_color, 1);
+ IF_DEBUG (--ncolors_allocated);
+ }
- UNBLOCK_INPUT;
+ if (face->box != FACE_NO_BOX
+ && !face->box_color_defaulted_p)
+ {
+ x_free_colors (f, &face->box_color, 1);
+ IF_DEBUG (--ncolors_allocated);
}
-}
+
+ UNBLOCK_INPUT;
#endif /* HAVE_X_WINDOWS */
+}
+
+#endif /* HAVE_WINDOW_SYSTEM */
\f
XLFD_LAST
};
-/* An enumerator for each possible slant value of a font. Taken from
+/* An enumerator for each possible slant value of a font. Taken from
the XLFD specification. */
enum xlfd_slant
{"black", XLFD_WEIGHT_ULTRA_BOLD, &Qultra_bold},
{"bold", XLFD_WEIGHT_BOLD, &Qbold},
{"book", XLFD_WEIGHT_SEMI_LIGHT, &Qsemi_light},
+ {"demi", XLFD_WEIGHT_SEMI_BOLD, &Qsemi_bold},
{"demibold", XLFD_WEIGHT_SEMI_BOLD, &Qsemi_bold},
{"extralight", XLFD_WEIGHT_EXTRA_LIGHT, &Qextra_light},
{"extrabold", XLFD_WEIGHT_EXTRA_BOLD, &Qextra_bold},
/* Numeric values for those fields that interest us. See
split_font_name for which these are. */
int numeric[XLFD_LAST];
+
+ /* Lower value mean higher priority. */
+ int registry_priority;
};
/* The frame in effect when sorting font names. Set temporarily in
font height, then for weight, then for slant.' This variable can be
set via set-face-font-sort-order. */
+#ifdef macintosh
+static int font_sort_order[4] = { XLFD_SWIDTH, XLFD_POINT_SIZE, XLFD_WEIGHT, XLFD_SLANT };
+#else
static int font_sort_order[4];
-
+#endif
/* Look up FONT.fields[FIELD_INDEX] in TABLE which has DIM entries.
TABLE must be sorted by TABLE[i]->name in ascending order. Value
{
mid = (low + high) / 2;
cmp = strcmp (table[mid].name, s);
-
+
if (cmp < 0)
low = mid + 1;
else if (cmp > 0)
int dim;
struct font_name *font;
int field_index;
- int dflt;
+ Lisp_Object dflt;
{
struct table_entry *p;
p = xlfd_lookup_field_contents (table, dim, font, field_index);
return xlfd_symbolic_value (swidth_table, DIM (swidth_table),
font, XLFD_SWIDTH, Qnormal);
}
-
+
/* Look up the entry of SYMBOL in the vector TABLE which has DIM
entries. Value is a pointer to the matching table entry or null if
int i;
xassert (SYMBOLP (symbol));
-
+
for (i = 0; i < dim; ++i)
if (EQ (*table[i].symbol, symbol))
break;
}
-#ifdef HAVE_X_WINDOWS
+#ifdef HAVE_WINDOW_SYSTEM
/* Return non-zero if FONT is the name of a fixed-pitch font. */
struct font_name *font;
{
double resy = FRAME_X_DISPLAY_INFO (f)->resy;
- double font_resy = atoi (font->fields[XLFD_RESY]);
- double font_pt = atoi (font->fields[XLFD_POINT_SIZE]);
+ double font_pixel = atoi (font->fields[XLFD_PIXEL_SIZE]);
int real_pt;
- if (font_resy == 0 || font_pt == 0)
+ if (font_pixel == 0)
real_pt = 0;
else
- real_pt = (font_resy / resy) * font_pt + 0.5;
+ real_pt = PT_PER_INCH * 10.0 * font_pixel / resy + 0.5;
return real_pt;
}
+/* Return point size of PIXEL dots while considering Y-resultion (DPI)
+ of frame F. This function is used to guess a point size of font
+ when only the pixel height of the font is available. */
+
+static INLINE int
+pixel_point_size (f, pixel)
+ struct frame *f;
+ int pixel;
+{
+ double resy = FRAME_X_DISPLAY_INFO (f)->resy;
+ double real_pt;
+ int int_pt;
+
+ /* As one inch is PT_PER_INCH points, PT_PER_INCH/RESY gives the
+ point size of one dot. */
+ real_pt = pixel * PT_PER_INCH / resy;
+ int_pt = real_pt + 0.5;
+
+ return int_pt;
+}
+
+
/* Split XLFD font name FONT->name destructively into NUL-terminated,
lower-case fields in FONT->fields. NUMERIC_P non-zero means
compute numeric values for fields XLFD_POINT_SIZE, XLFD_SWIDTH,
{
font->fields[i] = p;
++i;
-
+
while (*p && *p != '-')
++p;
-
+
if (*p != '-')
break;
-
+
*p++ = 0;
}
}
font->numeric[XLFD_SWIDTH] = xlfd_numeric_swidth (font);
}
+ /* Initialize it to zero. It will be overridden by font_list while
+ trying alternate registries. */
+ font->registry_priority = 0;
+
return success_p;
}
/* Build an XLFD font name from font name fields in FONT. Value is a
pointer to the font name, which is allocated via xmalloc. */
-
+
static char *
build_font_name (font)
struct font_name *font;
For all fonts found, set FONTS[i].name to the name of the font,
allocated via xmalloc, and split font names into fields. Ignore
- fonts that we can't parse. Value is the number of fonts found.
-
- This is similar to x_list_fonts. The differences are:
-
- 1. It avoids consing.
- 2. It never calls XLoadQueryFont. */
+ fonts that we can't parse. Value is the number of fonts found. */
static int
x_face_list_fonts (f, pattern, fonts, nfonts, try_alternatives_p,
int nfonts, try_alternatives_p;
int scalable_fonts_p;
{
- Display *dpy = f ? FRAME_X_DISPLAY (f) : x_display_list->display;
- int n, i, j;
- char **names;
+ int n;
+
+ /* NTEMACS_TODO : currently this uses w32_list_fonts, but it may be
+ better to do it the other way around. */
+ Lisp_Object lfonts;
+ Lisp_Object lpattern, tem;
- /* Get the list of fonts matching PATTERN from the X server. */
+ lpattern = build_string (pattern);
+
+ /* Get the list of fonts matching PATTERN. */
+#ifdef WINDOWSNT
BLOCK_INPUT;
- names = XListFonts (dpy, pattern, nfonts, &n);
+ lfonts = w32_list_fonts (f, lpattern, 0, nfonts);
UNBLOCK_INPUT;
+#else
+ lfonts = x_list_fonts (f, lpattern, scalable_fonts_p ? -1 : 0, nfonts);
+#endif
- if (names)
+ /* Make a copy of the font names we got from X, and
+ split them into fields. */
+ n = 0;
+ for (tem = lfonts; CONSP (tem); tem = XCDR (tem))
{
- /* Make a copy of the font names we got from X, and
- split them into fields. */
- for (i = j = 0; i < n; ++i)
- {
- /* Make a copy of the font name. */
- fonts[j].name = xstrdup (names[i]);
+ Lisp_Object elt, tail;
+ char *name = XSTRING (XCAR (tem))->data;
- /* Ignore fonts having a name that we can't parse. */
- if (!split_font_name (f, fonts + j, 1))
- xfree (fonts[j].name);
- else if (font_scalable_p (fonts + j))
- {
-#if SCALABLE_FONTS
- if (!scalable_fonts_p
- || !may_use_scalable_font_p (fonts + j, names[i]))
- xfree (fonts[j].name);
- else
- ++j;
-#else /* !SCALABLE_FONTS */
- /* Always ignore scalable fonts. */
- xfree (fonts[j].name);
-#endif /* !SCALABLE_FONTS */
- }
- else
- ++j;
+ for (tail = Vface_ignored_fonts; CONSP (tail); tail = XCDR (tail))
+ {
+ elt = XCAR (tail);
+ if (STRINGP (elt)
+ && fast_c_string_match_ignore_case (elt, name) >= 0)
+ break;
}
+ if (!NILP (tail))
+ continue;
- n = j;
+ /* Make a copy of the font name. */
+ fonts[n].name = xstrdup (name);
- /* Free font names. */
- BLOCK_INPUT;
- XFreeFontNames (names);
- UNBLOCK_INPUT;
+ /* Ignore fonts having a name that we can't parse. */
+ if (!split_font_name (f, fonts + n, 1))
+ xfree (fonts[n].name);
+ else if (font_scalable_p (fonts + n))
+ {
+ if (!scalable_fonts_p
+ || !may_use_scalable_font_p (fonts + n, name))
+ xfree (fonts[n].name);
+ else
+ ++n;
+ }
+ else
+ ++n;
}
-
/* If no fonts found, try patterns from Valternate_fontname_alist. */
if (n == 0 && try_alternatives_p)
{
Lisp_Object patterns = XCAR (list);
Lisp_Object name;
-
+
while (CONSP (patterns)
/* If list is screwed up, give up. */
&& (name = XCAR (patterns),
patterns = XCDR (patterns);
}
}
-
+
return n;
}
-
+
/* Determine the first font matching PATTERN on frame F. Return in
*FONT the matching font name, split into fields. Value is non-zero
if (nfonts > 0)
{
bcopy (&fonts[0], font, sizeof *font);
-
+
fonts[0].name = NULL;
free_font_names (fonts, nfonts);
}
struct font_name **fonts;
{
int nfonts;
-
+
/* Get the list of fonts matching pattern. 100 should suffice. */
nfonts = DEFAULT_FONT_LIST_LIMIT;
if (INTEGERP (Vfont_list_limit) && XINT (Vfont_list_limit) > 0)
nfonts = XFASTINT (Vfont_list_limit);
-
+
*fonts = (struct font_name *) xmalloc (nfonts * sizeof **fonts);
-#if SCALABLE_FONTS
nfonts = x_face_list_fonts (f, pattern, *fonts, nfonts, 1, 1);
-#else
- nfonts = x_face_list_fonts (f, pattern, *fonts, nfonts, 1, 0);
-#endif
-
- /* Sort the resulting array and return it in *FONTS. If no
+
+ /* Sort the resulting array and return it in *FONTS. If no
fonts were found, make sure to set *FONTS to null. */
if (nfonts)
sort_fonts (f, *fonts, nfonts, cmpfn);
if (cmp == 0)
{
int i;
-
+
for (i = 0; i < DIM (font_sort_order) && cmp == 0; ++i)
{
int j = font_sort_order[i];
cmp = x->numeric[j] - y->numeric[j];
}
- if (cmp == 0)
+ if (cmp == 0)
+ {
+ /* Everything else being equal, we prefer fonts with an
+ y-resolution closer to that of the frame. */
+ int resy = FRAME_X_DISPLAY_INFO (font_frame)->resy;
+ int x_resy = x->numeric[XLFD_RESY];
+ int y_resy = y->numeric[XLFD_RESY];
+ cmp = abs (resy - x_resy) - abs (resy - y_resy);
+ }
+ }
+
+ return cmp;
+}
+
+
+/* Get a sorted list of fonts of family FAMILY on frame F. If PATTERN
+ is non-nil list fonts matching that pattern. Otherwise, if
+ REGISTRY is non-nil return only fonts with that registry, otherwise
+ return fonts of any registry. Set *FONTS to a vector of font_name
+ structures allocated from the heap containing the fonts found.
+ Value is the number of fonts found. */
+
+static int
+font_list_1 (f, pattern, family, registry, fonts)
+ struct frame *f;
+ Lisp_Object pattern, family, registry;
+ struct font_name **fonts;
+{
+ char *pattern_str, *family_str, *registry_str;
+
+ if (NILP (pattern))
+ {
+ family_str = (NILP (family) ? "*" : (char *) XSTRING (family)->data);
+ registry_str = (NILP (registry) ? "*" : (char *) XSTRING (registry)->data);
+
+ pattern_str = (char *) alloca (strlen (family_str)
+ + strlen (registry_str)
+ + 10);
+ strcpy (pattern_str, index (family_str, '-') ? "-" : "-*-");
+ strcat (pattern_str, family_str);
+ strcat (pattern_str, "-*-");
+ strcat (pattern_str, registry_str);
+ if (!index (registry_str, '-'))
{
- /* Everything else being equal, we prefer fonts with an
- y-resolution closer to that of the frame. */
- int resy = FRAME_X_DISPLAY_INFO (font_frame)->resy;
- int x_resy = x->numeric[XLFD_RESY];
- int y_resy = y->numeric[XLFD_RESY];
- cmp = abs (resy - x_resy) - abs (resy - y_resy);
+ if (registry_str[strlen (registry_str) - 1] == '*')
+ strcat (pattern_str, "-*");
+ else
+ strcat (pattern_str, "*-*");
}
}
+ else
+ pattern_str = (char *) XSTRING (pattern)->data;
- return cmp;
+ return sorted_font_list (f, pattern_str, cmp_font_names, fonts);
}
-/* Get a sorted list of fonts of family FAMILY on frame F. If PATTERN
- is non-null list fonts matching that pattern. Otherwise, if
- REGISTRY_AND_ENCODING is non-null return only fonts with that
- registry and encoding, otherwise return fonts of any registry and
- encoding. Set *FONTS to a vector of font_name structures allocated
- from the heap containing the fonts found. Value is the number of
- fonts found. */
+/* Concatenate font list FONTS1 and FONTS2. FONTS1 and FONTS2
+ contains NFONTS1 fonts and NFONTS2 fonts respectively. Return a
+ pointer to a newly allocated font list. FONTS1 and FONTS2 are
+ freed. */
+
+static struct font_name *
+concat_font_list (fonts1, nfonts1, fonts2, nfonts2)
+ struct font_name *fonts1, *fonts2;
+ int nfonts1, nfonts2;
+{
+ int new_nfonts = nfonts1 + nfonts2;
+ struct font_name *new_fonts;
+
+ new_fonts = (struct font_name *) xmalloc (sizeof *new_fonts * new_nfonts);
+ bcopy (fonts1, new_fonts, sizeof *new_fonts * nfonts1);
+ bcopy (fonts2, new_fonts + nfonts1, sizeof *new_fonts * nfonts2);
+ xfree (fonts1);
+ xfree (fonts2);
+ return new_fonts;
+}
+
+
+/* Get a sorted list of fonts of family FAMILY on frame F.
+
+ If PATTERN is non-nil list fonts matching that pattern.
+
+ If REGISTRY is non-nil, return fonts with that registry and the
+ alternative registries from Vface_alternative_font_registry_alist.
+
+ If REGISTRY is nil return fonts of any registry.
+
+ Set *FONTS to a vector of font_name structures allocated from the
+ heap containing the fonts found. Value is the number of fonts
+ found. */
static int
-font_list (f, pattern, family, registry_and_encoding, fonts)
+font_list (f, pattern, family, registry, fonts)
struct frame *f;
- char *pattern;
- char *family;
- char *registry_and_encoding;
+ Lisp_Object pattern, family, registry;
struct font_name **fonts;
{
- if (pattern == NULL)
+ int nfonts = font_list_1 (f, pattern, family, registry, fonts);
+
+ if (!NILP (registry)
+ && CONSP (Vface_alternative_font_registry_alist))
{
- if (family == NULL)
- family = "*";
-
- if (registry_and_encoding == NULL)
- registry_and_encoding = "*";
-
- pattern = (char *) alloca (strlen (family)
- + strlen (registry_and_encoding)
- + 10);
- if (index (family, '-'))
- sprintf (pattern, "-%s-*-%s", family, registry_and_encoding);
- else
- sprintf (pattern, "-*-%s-*-%s", family, registry_and_encoding);
+ Lisp_Object alter;
+
+ alter = Fassoc (registry, Vface_alternative_font_registry_alist);
+ if (CONSP (alter))
+ {
+ int reg_prio, i;
+
+ for (alter = XCDR (alter), reg_prio = 1;
+ CONSP (alter);
+ alter = XCDR (alter), reg_prio++)
+ if (STRINGP (XCAR (alter)))
+ {
+ int nfonts2;
+ struct font_name *fonts2;
+
+ nfonts2 = font_list_1 (f, pattern, family, XCAR (alter),
+ &fonts2);
+ for (i = 0; i < nfonts2; i++)
+ fonts2[i].registry_priority = reg_prio;
+ *fonts = (nfonts > 0
+ ? concat_font_list (*fonts, nfonts, fonts2, nfonts2)
+ : fonts2);
+ nfonts += nfonts2;
+ }
+ }
}
-
- return sorted_font_list (f, pattern, cmp_font_names, fonts);
+
+ return nfonts;
}
Lisp_Object list;
{
Lisp_Object tail = list;
-
+
while (!NILP (tail) && !NILP (XCDR (tail)))
{
Lisp_Object next = XCDR (tail);
int i, nfonts;
Lisp_Object result;
struct gcpro gcpro1;
- char *family_pattern;
- if (NILP (family))
- family_pattern = "*";
- else
- {
- CHECK_STRING (family, 1);
- family_pattern = LSTRDUPA (family);
- }
-
+ if (!NILP (family))
+ CHECK_STRING (family, 1);
+
result = Qnil;
GCPRO1 (result);
- nfonts = font_list (f, NULL, family_pattern, NULL, &fonts);
+ nfonts = font_list (f, Qnil, family, Qnil, &fonts);
for (i = nfonts - 1; i >= 0; --i)
{
Lisp_Object v = Fmake_vector (make_number (8), Qnil);
char *tem;
-#define ASET(VECTOR, IDX, VAL) (XVECTOR (VECTOR)->contents[IDX] = (VAL))
-
ASET (v, 0, build_string (fonts[i].fields[XLFD_FAMILY]));
ASET (v, 1, xlfd_symbolic_swidth (fonts + i));
ASET (v, 2, make_number (xlfd_point_size (f, fonts + i)));
fonts[i].fields[XLFD_ENCODING]);
ASET (v, 7, build_string (tem));
xfree (tem);
-
+
result = Fcons (v, result);
-
-#undef ASET
}
remove_duplicates (result);
for (limit = 500;;)
{
specbind (intern ("font-list-limit"), make_number (limit));
- nfonts = font_list (f, NULL, "*", NULL, &fonts);
-
+ nfonts = font_list (f, Qnil, Qnil, Qnil, &fonts);
+
if (nfonts == limit)
{
free_font_names (fonts, nfonts);
else
break;
}
-
+
result = Qnil;
GCPRO1 (result);
for (i = nfonts - 1; i >= 0; --i)
check_x ();
CHECK_STRING (pattern, 0);
-
+
if (NILP (maximum))
maxnames = 2000;
else
/* We can't simply call check_x_frame because this function may be
called before any frame is created. */
f = frame_or_selected_frame (frame, 2);
- if (!FRAME_X_P (f))
+ if (!FRAME_WINDOW_P (f))
{
/* Perhaps we have not yet created any frame. */
f = NULL;
{
/* This is of limited utility since it works with character
widths. Keep it for compatibility. --gerd. */
- int face_id = lookup_named_face (f, face, CHARSET_ASCII);
- struct face *face = FACE_FROM_ID (f, face_id);
+ int face_id = lookup_named_face (f, face, 0);
+ struct face *face = (face_id < 0
+ ? NULL
+ : FACE_FROM_ID (f, face_id));
- if (face->font)
- size = face->font->max_bounds.width;
+ if (face && face->font)
+ size = FONT_WIDTH (face->font);
else
- size = FRAME_FONT (f)->max_bounds.width;
+ size = FONT_WIDTH (FRAME_FONT (f));
if (!NILP (width))
size *= XINT (width);
}
}
-#endif /* HAVE_X_WINDOWS */
+#endif /* HAVE_WINDOW_SYSTEM */
\f
XVECTOR (LFACE)->contents[LFACE_STRIKE_THROUGH_INDEX]
#define LFACE_BOX(LFACE) \
XVECTOR (LFACE)->contents[LFACE_BOX_INDEX]
+#define LFACE_FONT(LFACE) \
+ XVECTOR (LFACE)->contents[LFACE_FONT_INDEX]
+#define LFACE_INHERIT(LFACE) \
+ XVECTOR (LFACE)->contents[LFACE_INHERIT_INDEX]
/* Non-zero if LFACE is a Lisp face. A Lisp face is a vector of size
LFACE_VECTOR_SIZE which has the symbol `face' in slot 0. */
&& XVECTOR (LFACE)->size == LFACE_VECTOR_SIZE \
&& EQ (XVECTOR (LFACE)->contents[0], Qface))
-
+
#if GLYPH_DEBUG
/* Check consistency of Lisp face attribute vector ATTRS. */
xassert (UNSPECIFIEDP (attrs[LFACE_SWIDTH_INDEX])
|| SYMBOLP (attrs[LFACE_SWIDTH_INDEX]));
xassert (UNSPECIFIEDP (attrs[LFACE_HEIGHT_INDEX])
- || INTEGERP (attrs[LFACE_HEIGHT_INDEX]));
+ || INTEGERP (attrs[LFACE_HEIGHT_INDEX])
+ || FLOATP (attrs[LFACE_HEIGHT_INDEX])
+ || FUNCTIONP (attrs[LFACE_HEIGHT_INDEX]));
xassert (UNSPECIFIEDP (attrs[LFACE_WEIGHT_INDEX])
|| SYMBOLP (attrs[LFACE_WEIGHT_INDEX]));
xassert (UNSPECIFIEDP (attrs[LFACE_SLANT_INDEX])
|| STRINGP (attrs[LFACE_FOREGROUND_INDEX]));
xassert (UNSPECIFIEDP (attrs[LFACE_BACKGROUND_INDEX])
|| STRINGP (attrs[LFACE_BACKGROUND_INDEX]));
+ xassert (UNSPECIFIEDP (attrs[LFACE_INHERIT_INDEX])
+ || NILP (attrs[LFACE_INHERIT_INDEX])
+ || SYMBOLP (attrs[LFACE_INHERIT_INDEX])
+ || CONSP (attrs[LFACE_INHERIT_INDEX]));
#ifdef HAVE_WINDOW_SYSTEM
xassert (UNSPECIFIEDP (attrs[LFACE_STIPPLE_INDEX])
|| SYMBOLP (attrs[LFACE_STIPPLE_INDEX])
|| !NILP (Fbitmap_spec_p (attrs[LFACE_STIPPLE_INDEX])));
+ xassert (UNSPECIFIEDP (attrs[LFACE_FONT_INDEX])
+ || NILP (attrs[LFACE_FONT_INDEX])
+ || STRINGP (attrs[LFACE_FONT_INDEX]));
#endif
}
#endif /* GLYPH_DEBUG == 0 */
-/* Resolve face name FACE_NAME. If FACE_NAME Is a string, intern it
+/* Resolve face name FACE_NAME. If FACE_NAME is a string, intern it
to make it a symvol. If FACE_NAME is an alias for another face,
return that face's name. */
Lisp_Object face_name;
{
Lisp_Object aliased;
-
+
if (STRINGP (face_name))
face_name = intern (XSTRING (face_name)->data);
- for (;;)
+ while (SYMBOLP (face_name))
{
aliased = Fget (face_name, Qface_alias);
if (NILP (aliased))
/* Return the face definition of FACE_NAME on frame F. F null means
- return the global definition. FACE_NAME may be a string or a
- symbol (apparently Emacs 20.2 allows strings as face names in face
- text properties; ediff uses that). If FACE_NAME is an alias for
- another face, return that face's definition. If SIGNAL_P is
+ return the definition for new frames. FACE_NAME may be a string or
+ a symbol (apparently Emacs 20.2 allowed strings as face names in
+ face text properties; Ediff uses that). If FACE_NAME is an alias
+ for another face, return that face's definition. If SIGNAL_P is
non-zero, signal an error if FACE_NAME is not a valid face name.
If SIGNAL_P is zero, value is nil if FACE_NAME is not a valid face
name. */
int i;
for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
- if (UNSPECIFIEDP (attrs[i]))
- break;
+ if (i != LFACE_FONT_INDEX && i != LFACE_INHERIT_INDEX)
+ if (UNSPECIFIEDP (attrs[i]))
+ break;
return i == LFACE_VECTOR_SIZE;
}
+#ifdef HAVE_WINDOW_SYSTEM
-#ifdef HAVE_X_WINDOWS
+/* Set font-related attributes of Lisp face LFACE from the fullname of
+ the font opened by FONTNAME. If FORCE_P is zero, set only
+ unspecified attributes of LFACE. The exception is `font'
+ attribute. It is set to FONTNAME as is regardless of FORCE_P.
-/* Set font-related attributes of Lisp face LFACE from XLFD font name
- FONT_NAME. If FORCE_P is zero, set only unspecified attributes of
- LFACE. MAY_FAIL_P non-zero means return 0 if FONT_NAME isn't a
- valid font name; otherwise this function tries to use a reasonable
- default font.
+ If FONTNAME is not available on frame F,
+ return 0 if MAY_FAIL_P is non-zero, otherwise abort.
+ If the fullname is not in a valid XLFD format,
+ return 0 if MAY_FAIL_P is non-zero, otherwise set normal values
+ in LFACE and return 1.
+ Otherwise, return 1. */
- Ignore fields of FONT_NAME containing wildcards. Value is zero if
- not successful because FONT_NAME was not in a valid format and
- MAY_FAIL_P was non-zero. A valid format is one that is suitable
- for split_font_name, see the comment there. */
-
static int
-set_lface_from_font_name (f, lface, font_name, force_p, may_fail_p)
+set_lface_from_font_name (f, lface, fontname, force_p, may_fail_p)
struct frame *f;
Lisp_Object lface;
- char *font_name;
+ Lisp_Object fontname;
int force_p, may_fail_p;
{
struct font_name font;
char *buffer;
int pt;
- int free_font_name_p = 0;
- int have_font_p = 0;
+ int have_xlfd_p;
+ int fontset;
+ char *font_name = XSTRING (fontname)->data;
+ struct font_info *font_info;
- /* If FONT_NAME contains wildcards, use the first matching font. */
- if (index (font_name, '*') || index (font_name, '?'))
- {
- if (first_font_matching (f, font_name, &font))
- free_font_name_p = have_font_p = 1;
- }
- else
- {
- font.name = STRDUPA (font_name);
- if (split_font_name (f, &font, 1))
- have_font_p = 1;
- else
- {
- /* The font name may be something like `6x13'. Make
- sure we use the full name. */
- struct font_info *font_info;
-
- BLOCK_INPUT;
- font_info = fs_load_font (f, FRAME_X_FONT_TABLE (f),
- CHARSET_ASCII, font_name, -1);
- if (font_info)
- {
- font.name = STRDUPA (font_info->full_name);
- split_font_name (f, &font, 1);
- have_font_p = 1;
- }
- UNBLOCK_INPUT;
- }
- }
+ /* If FONTNAME is actually a fontset name, get ASCII font name of it. */
+ fontset = fs_query_fontset (fontname, 0);
+ if (fontset >= 0)
+ font_name = XSTRING (fontset_ascii (fontset))->data;
+
+ /* Check if FONT_NAME is surely available on the system. Usually
+ FONT_NAME is already cached for the frame F and FS_LOAD_FONT
+ returns quickly. But, even if FONT_NAME is not yet cached,
+ caching it now is not futail because we anyway load the font
+ later. */
+ BLOCK_INPUT;
+ font_info = FS_LOAD_FONT (f, 0, font_name, -1);
+ UNBLOCK_INPUT;
- /* If FONT_NAME is completely bogus try to use something reasonable
- if this function must succeed. Otherwise, give up. */
- if (!have_font_p)
+ if (!font_info)
{
if (may_fail_p)
return 0;
- else if (first_font_matching (f, "-adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1",
- &font)
- || first_font_matching (f, "-misc-fixed-medium-r-normal-*-*-140-*-*-c-*-iso8859-1",
- &font)
- || first_font_matching (f, "-*-*-medium-r-normal-*-*-140-*-*-c-*-iso8859-1",
- &font)
- || first_font_matching (f, "-*-*-medium-r-*-*-*-*-*-*-c-*-iso8859-1",
- &font)
- || first_font_matching (f, "-*-fixed-*-*-*-*-*-140-*-*-c-*-iso8859-1",
- &font)
- || first_font_matching (f, "fixed", &font))
- free_font_name_p = 1;
- else
- abort ();
+ abort ();
}
-
+
+ font.name = STRDUPA (font_info->full_name);
+ have_xlfd_p = split_font_name (f, &font, 1);
/* Set attributes only if unspecified, otherwise face defaults for
- new frames would never take effect. */
-
+ new frames would never take effect. If we couldn't get a font
+ name conforming to XLFD, set normal values. */
+
if (force_p || UNSPECIFIEDP (LFACE_FAMILY (lface)))
{
- buffer = (char *) alloca (strlen (font.fields[XLFD_FAMILY])
- + strlen (font.fields[XLFD_FOUNDRY])
- + 2);
- sprintf (buffer, "%s-%s", font.fields[XLFD_FOUNDRY],
- font.fields[XLFD_FAMILY]);
- LFACE_FAMILY (lface) = build_string (buffer);
+ Lisp_Object val;
+ if (have_xlfd_p)
+ {
+ buffer = (char *) alloca (strlen (font.fields[XLFD_FAMILY])
+ + strlen (font.fields[XLFD_FOUNDRY])
+ + 2);
+ sprintf (buffer, "%s-%s", font.fields[XLFD_FOUNDRY],
+ font.fields[XLFD_FAMILY]);
+ val = build_string (buffer);
+ }
+ else
+ val = build_string ("*");
+ LFACE_FAMILY (lface) = val;
}
if (force_p || UNSPECIFIEDP (LFACE_HEIGHT (lface)))
{
- pt = xlfd_point_size (f, &font);
+ if (have_xlfd_p)
+ pt = xlfd_point_size (f, &font);
+ else
+ pt = pixel_point_size (f, font_info->height * 10);
xassert (pt > 0);
LFACE_HEIGHT (lface) = make_number (pt);
}
if (force_p || UNSPECIFIEDP (LFACE_SWIDTH (lface)))
- LFACE_SWIDTH (lface) = xlfd_symbolic_swidth (&font);
+ LFACE_SWIDTH (lface)
+ = have_xlfd_p ? xlfd_symbolic_swidth (&font) : Qnormal;
if (force_p || UNSPECIFIEDP (LFACE_WEIGHT (lface)))
- LFACE_WEIGHT (lface) = xlfd_symbolic_weight (&font);
+ LFACE_WEIGHT (lface)
+ = have_xlfd_p ? xlfd_symbolic_weight (&font) : Qnormal;
if (force_p || UNSPECIFIEDP (LFACE_SLANT (lface)))
- LFACE_SLANT (lface) = xlfd_symbolic_slant (&font);
+ LFACE_SLANT (lface)
+ = have_xlfd_p ? xlfd_symbolic_slant (&font) : Qnormal;
+
+ LFACE_FONT (lface) = fontname;
- if (free_font_name_p)
- xfree (font.name);
-
return 1;
}
-#endif /* HAVE_X_WINDOWS */
+#endif /* HAVE_WINDOW_SYSTEM */
+
+
+/* Merges the face height FROM with the face height TO, and returns the
+ merged height. If FROM is an invalid height, then INVALID is
+ returned instead. FROM may be a either an absolute face height or a
+ `relative' height, and TO must be an absolute height. The returned
+ value is always an absolute height. GCPRO is a lisp value that will
+ be protected from garbage-collection if this function makes a call
+ into lisp. */
+
+Lisp_Object
+merge_face_heights (from, to, invalid, gcpro)
+ Lisp_Object from, to, invalid, gcpro;
+{
+ int result = 0;
+
+ if (INTEGERP (from))
+ result = XINT (from);
+ else if (NUMBERP (from))
+ result = XFLOATINT (from) * XINT (to);
+#if 0 /* Probably not so useful. */
+ else if (CONSP (from) && CONSP (XCDR (from)))
+ {
+ if (EQ (XCAR(from), Qplus) || EQ (XCAR(from), Qminus))
+ {
+ if (INTEGERP (XCAR (XCDR (from))))
+ {
+ int inc = XINT (XCAR (XCDR (from)));
+ if (EQ (XCAR (from), Qminus))
+ inc = -inc;
+
+ result = XFASTINT (to);
+ if (result + inc > 0)
+ /* Note that `underflows' don't mean FROM is invalid, so
+ we just pin the result at TO if it would otherwise be
+ negative or 0. */
+ result += inc;
+ }
+ }
+ }
+#endif
+ else if (FUNCTIONP (from))
+ {
+ /* Call function with current height as argument.
+ From is the new height. */
+ Lisp_Object args[2], height;
+ struct gcpro gcpro1;
+ GCPRO1 (gcpro);
-/* Merge two Lisp face attribute vectors FROM and TO and store the
- resulting attributes in TO. Every non-nil attribute of FROM
- overrides the corresponding attribute of TO. */
+ args[0] = from;
+ args[1] = to;
+ height = safe_call (2, args);
+
+ UNGCPRO;
+
+ if (NUMBERP (height))
+ result = XFLOATINT (height);
+ }
+
+ if (result > 0)
+ return make_number (result);
+ else
+ return invalid;
+}
+
+
+/* Merge two Lisp face attribute vectors on frame F, FROM and TO, and
+ store the resulting attributes in TO, which must be already be
+ completely specified and contain only absolute attributes. Every
+ specified attribute of FROM overrides the corresponding attribute of
+ TO; relative attributes in FROM are merged with the absolute value in
+ TO and replace it. CYCLE_CHECK is used internally to detect loops in
+ face inheritance; it should be Qnil when called from other places. */
static INLINE void
-merge_face_vectors (from, to)
+merge_face_vectors (f, from, to, cycle_check)
+ struct frame *f;
Lisp_Object *from, *to;
+ Lisp_Object cycle_check;
{
int i;
+
+ /* If FROM inherits from some other faces, merge their attributes into
+ TO before merging FROM's direct attributes. Note that an :inherit
+ attribute of `unspecified' is the same as one of nil; we never
+ merge :inherit attributes, so nil is more correct, but lots of
+ other code uses `unspecified' as a generic value for face attributes. */
+ if (!UNSPECIFIEDP (from[LFACE_INHERIT_INDEX])
+ && !NILP (from[LFACE_INHERIT_INDEX]))
+ merge_face_inheritance (f, from[LFACE_INHERIT_INDEX], to, cycle_check);
+
+ /* If TO specifies a :font attribute, and FROM specifies some
+ font-related attribute, we need to clear TO's :font attribute
+ (because it will be inconsistent with whatever FROM specifies, and
+ FROM takes precedence). */
+ if (!NILP (to[LFACE_FONT_INDEX])
+ && (!UNSPECIFIEDP (from[LFACE_FAMILY_INDEX])
+ || !UNSPECIFIEDP (from[LFACE_HEIGHT_INDEX])
+ || !UNSPECIFIEDP (from[LFACE_WEIGHT_INDEX])
+ || !UNSPECIFIEDP (from[LFACE_SLANT_INDEX])
+ || !UNSPECIFIEDP (from[LFACE_SWIDTH_INDEX])))
+ to[LFACE_FONT_INDEX] = Qnil;
+
for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
if (!UNSPECIFIEDP (from[i]))
- to[i] = from[i];
+ if (i == LFACE_HEIGHT_INDEX && !INTEGERP (from[i]))
+ to[i] = merge_face_heights (from[i], to[i], to[i], cycle_check);
+ else
+ to[i] = from[i];
+
+ /* TO is always an absolute face, which should inherit from nothing.
+ We blindly copy the :inherit attribute above and fix it up here. */
+ to[LFACE_INHERIT_INDEX] = Qnil;
+}
+
+
+/* Checks the `cycle check' variable CHECK to see if it indicates that
+ EL is part of a cycle; CHECK must be either Qnil or a value returned
+ by an earlier use of CYCLE_CHECK. SUSPICIOUS is the number of
+ elements after which a cycle might be suspected; after that many
+ elements, this macro begins consing in order to keep more precise
+ track of elements.
+
+ Returns NIL if a cycle was detected, otherwise a new value for CHECK
+ that includes EL.
+
+ CHECK is evaluated multiple times, EL and SUSPICIOUS 0 or 1 times, so
+ the caller should make sure that's ok. */
+
+#define CYCLE_CHECK(check, el, suspicious) \
+ (NILP (check) \
+ ? make_number (0) \
+ : (INTEGERP (check) \
+ ? (XFASTINT (check) < (suspicious) \
+ ? make_number (XFASTINT (check) + 1) \
+ : Fcons (el, Qnil)) \
+ : (!NILP (Fmemq ((el), (check))) \
+ ? Qnil \
+ : Fcons ((el), (check)))))
+
+
+/* Merge face attributes from the face on frame F whose name is
+ INHERITS, into the vector of face attributes TO; INHERITS may also be
+ a list of face names, in which case they are applied in order.
+ CYCLE_CHECK is used to detect loops in face inheritance.
+ Returns true if any of the inherited attributes are `font-related'. */
+
+static void
+merge_face_inheritance (f, inherit, to, cycle_check)
+ struct frame *f;
+ Lisp_Object inherit;
+ Lisp_Object *to;
+ Lisp_Object cycle_check;
+{
+ if (SYMBOLP (inherit) && !EQ (inherit, Qunspecified))
+ /* Inherit from the named face INHERIT. */
+ {
+ Lisp_Object lface;
+
+ /* Make sure we're not in an inheritance loop. */
+ cycle_check = CYCLE_CHECK (cycle_check, inherit, 15);
+ if (NILP (cycle_check))
+ /* Cycle detected, ignore any further inheritance. */
+ return;
+
+ lface = lface_from_face_name (f, inherit, 0);
+ if (!NILP (lface))
+ merge_face_vectors (f, XVECTOR (lface)->contents, to, cycle_check);
+ }
+ else if (CONSP (inherit))
+ /* Handle a list of inherited faces by calling ourselves recursively
+ on each element. Note that we only do so for symbol elements, so
+ it's not possible to infinitely recurse. */
+ {
+ while (CONSP (inherit))
+ {
+ if (SYMBOLP (XCAR (inherit)))
+ merge_face_inheritance (f, XCAR (inherit), to, cycle_check);
+
+ /* Check for a circular inheritance list. */
+ cycle_check = CYCLE_CHECK (cycle_check, inherit, 15);
+ if (NILP (cycle_check))
+ /* Cycle detected. */
+ break;
+
+ inherit = XCDR (inherit);
+ }
+ }
}
Face specifications earlier in lists take precedence over later
specifications. */
-
+
static void
merge_face_vector_with_property (f, to, prop)
struct frame *f;
if (CONSP (prop))
{
Lisp_Object first = XCAR (prop);
-
+
if (EQ (first, Qforeground_color)
|| EQ (first, Qbackground_color))
{
if (STRINGP (value))
to[LFACE_FAMILY_INDEX] = value;
else
- add_to_log ("Illegal face font family", value, Qnil);
+ add_to_log ("Invalid face font family", value, Qnil);
}
else if (EQ (keyword, QCheight))
{
- if (INTEGERP (value))
- to[LFACE_HEIGHT_INDEX] = value;
+ Lisp_Object new_height =
+ merge_face_heights (value, to[LFACE_HEIGHT_INDEX],
+ Qnil, Qnil);
+
+ if (NILP (new_height))
+ add_to_log ("Invalid face font height", value, Qnil);
else
- add_to_log ("Illegal face font height", value, Qnil);
+ to[LFACE_HEIGHT_INDEX] = new_height;
}
else if (EQ (keyword, QCweight))
{
&& face_numeric_weight (value) >= 0)
to[LFACE_WEIGHT_INDEX] = value;
else
- add_to_log ("Illegal face weight", value, Qnil);
+ add_to_log ("Invalid face weight", value, Qnil);
}
else if (EQ (keyword, QCslant))
{
&& face_numeric_slant (value) >= 0)
to[LFACE_SLANT_INDEX] = value;
else
- add_to_log ("Illegal face slant", value, Qnil);
+ add_to_log ("Invalid face slant", value, Qnil);
}
else if (EQ (keyword, QCunderline))
{
|| STRINGP (value))
to[LFACE_UNDERLINE_INDEX] = value;
else
- add_to_log ("Illegal face underline", value, Qnil);
+ add_to_log ("Invalid face underline", value, Qnil);
}
else if (EQ (keyword, QCoverline))
{
|| STRINGP (value))
to[LFACE_OVERLINE_INDEX] = value;
else
- add_to_log ("Illegal face overline", value, Qnil);
+ add_to_log ("Invalid face overline", value, Qnil);
}
else if (EQ (keyword, QCstrike_through))
{
|| STRINGP (value))
to[LFACE_STRIKE_THROUGH_INDEX] = value;
else
- add_to_log ("Illegal face strike-through", value, Qnil);
+ add_to_log ("Invalid face strike-through", value, Qnil);
}
else if (EQ (keyword, QCbox))
{
|| NILP (value))
to[LFACE_BOX_INDEX] = value;
else
- add_to_log ("Illegal face box", value, Qnil);
+ add_to_log ("Invalid face box", value, Qnil);
}
else if (EQ (keyword, QCinverse_video)
|| EQ (keyword, QCreverse_video))
if (EQ (value, Qt) || NILP (value))
to[LFACE_INVERSE_INDEX] = value;
else
- add_to_log ("Illegal face inverse-video", value, Qnil);
+ add_to_log ("Invalid face inverse-video", value, Qnil);
}
else if (EQ (keyword, QCforeground))
{
if (STRINGP (value))
to[LFACE_FOREGROUND_INDEX] = value;
else
- add_to_log ("Illegal face foreground", value, Qnil);
+ add_to_log ("Invalid face foreground", value, Qnil);
}
else if (EQ (keyword, QCbackground))
{
if (STRINGP (value))
to[LFACE_BACKGROUND_INDEX] = value;
else
- add_to_log ("Illegal face background", value, Qnil);
+ add_to_log ("Invalid face background", value, Qnil);
}
else if (EQ (keyword, QCstipple))
{
if (!NILP (pixmap_p))
to[LFACE_STIPPLE_INDEX] = value;
else
- add_to_log ("Illegal face stipple", value, Qnil);
+ add_to_log ("Invalid face stipple", value, Qnil);
#endif
}
else if (EQ (keyword, QCwidth))
&& face_numeric_swidth (value) >= 0)
to[LFACE_SWIDTH_INDEX] = value;
else
- add_to_log ("Illegal face width", value, Qnil);
+ add_to_log ("Invalid face width", value, Qnil);
+ }
+ else if (EQ (keyword, QCinherit))
+ {
+ if (SYMBOLP (value))
+ to[LFACE_INHERIT_INDEX] = value;
+ else
+ {
+ Lisp_Object tail;
+ for (tail = value; CONSP (tail); tail = XCDR (tail))
+ if (!SYMBOLP (XCAR (tail)))
+ break;
+ if (NILP (tail))
+ to[LFACE_INHERIT_INDEX] = value;
+ else
+ add_to_log ("Invalid face inherit", value, Qnil);
+ }
}
else
add_to_log ("Invalid attribute %s in face property",
if (NILP (lface))
add_to_log ("Invalid face text property value: %s", prop, Qnil);
else
- merge_face_vectors (XVECTOR (lface)->contents, to);
+ merge_face_vectors (f, XVECTOR (lface)->contents, to, Qnil);
}
}
CHECK_SYMBOL (face, 0);
global_lface = lface_from_face_name (NULL, face, 0);
-
+
if (!NILP (frame))
{
CHECK_LIVE_FRAME (frame, 1);
global_lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE),
Qunspecified);
XVECTOR (global_lface)->contents[0] = Qface;
- Vface_new_frame_defaults = Fcons (Fcons (face, global_lface),
+ Vface_new_frame_defaults = Fcons (Fcons (face, global_lface),
Vface_new_frame_defaults);
-
+
/* Assign the new Lisp face a unique ID. The mapping from Lisp
face id to Lisp face is given by the vector lface_id_to_name.
The mapping from Lisp face to Lisp face id is given by the
lface_id_to_name = (Lisp_Object *) xrealloc (lface_id_to_name, sz);
lface_id_to_name_size = new_size;
}
-
+
lface_id_to_name[next_lface_id] = face;
Fput (face, Qface, make_number (next_lface_id));
++next_lface_id;
else if (f == NULL)
for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
XVECTOR (global_lface)->contents[i] = Qunspecified;
-
+
/* Add a frame-local definition. */
if (f)
{
Lisp_Object face, frame;
{
Lisp_Object lface;
-
+
if (!NILP (frame))
{
CHECK_LIVE_FRAME (frame, 1);
Lisp_Object from, to, frame, new_frame;
{
Lisp_Object lface, copy;
-
+
CHECK_SYMBOL (from, 0);
CHECK_SYMBOL (to, 1);
if (NILP (new_frame))
lface = lface_from_face_name (XFRAME (frame), from, 1);
copy = Finternal_make_lisp_face (to, new_frame);
}
-
+
bcopy (XVECTOR (lface)->contents, XVECTOR (copy)->contents,
LFACE_VECTOR_SIZE * sizeof (Lisp_Object));
-
+
return to;
}
DEFUN ("internal-set-lisp-face-attribute", Finternal_set_lisp_face_attribute,
Sinternal_set_lisp_face_attribute, 3, 4, 0,
"Set attribute ATTR of FACE to VALUE.\n\
-If optional argument FRAME is given, set the face attribute of face FACE\n\
-on that frame. If FRAME is t, set the attribute of the default for face\n\
-FACE (for new frames). If FRAME is omitted or nil, use the selected\n\
-frame.")
+FRAME being a frame means change the face on that frame.\n\
+FRAME nil means change change the face of the selected frame.\n\
+FRAME t means change the default for new frames.\n\
+FRAME 0 means change the face on all frames, and change the default\n\
+ for new frames.")
(face, attr, value, frame)
Lisp_Object face, attr, value, frame;
{
Lisp_Object lface;
Lisp_Object old_value = Qnil;
+ /* Set 1 if ATTR is QCfont. */
+ int font_attr_p = 0;
+ /* Set 1 if ATTR is one of font-related attributes other than QCfont. */
int font_related_attr_p = 0;
-
+
CHECK_SYMBOL (face, 0);
CHECK_SYMBOL (attr, 1);
face = resolve_face_name (face);
+ /* If FRAME is 0, change face on all frames, and change the
+ default for new frames. */
+ if (INTEGERP (frame) && XINT (frame) == 0)
+ {
+ Lisp_Object tail;
+ Finternal_set_lisp_face_attribute (face, attr, value, Qt);
+ FOR_EACH_FRAME (tail, frame)
+ Finternal_set_lisp_face_attribute (face, attr, value, frame);
+ return face;
+ }
+
/* Set lface to the Lisp attribute vector of FACE. */
if (EQ (frame, Qt))
lface = lface_from_face_name (NULL, face, 1);
{
if (NILP (frame))
frame = selected_frame;
-
+
CHECK_LIVE_FRAME (frame, 3);
lface = lface_from_face_name (XFRAME (frame), face, 0);
-
+
/* If a frame-local face doesn't exist yet, create one. */
if (NILP (lface))
lface = Finternal_make_lisp_face (face, frame);
{
if (!UNSPECIFIEDP (value))
{
- CHECK_NUMBER (value, 3);
- if (XINT (value) <= 0)
+ Lisp_Object test =
+ (EQ (face, Qdefault) ? value :
+ /* The default face must have an absolute size, otherwise, we do
+ a test merge with a random height to see if VALUE's ok. */
+ merge_face_heights (value, make_number(10), Qnil, Qnil));
+
+ if (!INTEGERP(test) || XINT(test) <= 0)
signal_error ("Invalid face height", value);
}
+
old_value = LFACE_HEIGHT (lface);
LFACE_HEIGHT (lface) = value;
font_related_attr_p = 1;
|| (STRINGP (value)
&& XSTRING (value)->size == 0))
signal_error ("Invalid face underline", value);
-
+
old_value = LFACE_UNDERLINE (lface);
LFACE_UNDERLINE (lface) = value;
}
|| (STRINGP (value)
&& XSTRING (value)->size == 0))
signal_error ("Invalid face overline", value);
-
+
old_value = LFACE_OVERLINE (lface);
LFACE_OVERLINE (lface) = value;
}
|| (STRINGP (value)
&& XSTRING (value)->size == 0))
signal_error ("Invalid face strike-through", value);
-
+
old_value = LFACE_STRIKE_THROUGH (lface);
LFACE_STRIKE_THROUGH (lface) = value;
}
else if (EQ (attr, QCbox))
{
int valid_p;
-
+
/* Allow t meaning a simple box of width 1 in foreground color
of the face. */
if (EQ (value, Qt))
else if (CONSP (value))
{
Lisp_Object tem;
-
+
tem = value;
while (CONSP (tem))
{
break;
v = XCAR (tem);
tem = XCDR (tem);
-
+
if (EQ (k, QCline_width))
{
if (!INTEGERP (v) || XINT (v) <= 0)
if (!valid_p)
signal_error ("Invalid face box", value);
-
+
old_value = LFACE_BOX (lface);
LFACE_BOX (lface) = value;
}
}
else if (EQ (attr, QCforeground))
{
- if (!UNSPECIFIEDP (value)
- && !EQ (value, Qunspecified_fg) && !EQ (value, Qunspecified_bg))
+ if (!UNSPECIFIEDP (value))
{
/* Don't check for valid color names here because it depends
on the frame (display) whether the color will be valid
}
else if (EQ (attr, QCbackground))
{
- if (!UNSPECIFIEDP (value)
- && !EQ (value, Qunspecified_bg) && !EQ (value, Qunspecified_fg))
+ if (!UNSPECIFIEDP (value))
{
/* Don't check for valid color names here because it depends
on the frame (display) whether the color will be valid
}
else if (EQ (attr, QCfont))
{
-#ifdef HAVE_X_WINDOWS
+#ifdef HAVE_WINDOW_SYSTEM
/* Set font-related attributes of the Lisp face from an
XLFD font name. */
struct frame *f;
+ Lisp_Object tmp;
CHECK_STRING (value, 3);
if (EQ (frame, Qt))
f = SELECTED_FRAME ();
else
f = check_x_frame (frame);
-
- if (!set_lface_from_font_name (f, lface, XSTRING (value)->data, 1, 1))
- signal_error ("Invalid font name", value);
-
- font_related_attr_p = 1;
-#endif /* HAVE_X_WINDOWS */
+
+ /* VALUE may be a fontset name or an alias of fontset. In such
+ a case, use the base fontset name. */
+ tmp = Fquery_fontset (value, Qnil);
+ if (!NILP (tmp))
+ value = tmp;
+
+ if (!set_lface_from_font_name (f, lface, value, 1, 1))
+ signal_error ("Invalid font or fontset name", value);
+
+ font_attr_p = 1;
+#endif /* HAVE_WINDOW_SYSTEM */
+ }
+ else if (EQ (attr, QCinherit))
+ {
+ Lisp_Object tail;
+ if (SYMBOLP (value))
+ tail = Qnil;
+ else
+ for (tail = value; CONSP (tail); tail = XCDR (tail))
+ if (!SYMBOLP (XCAR (tail)))
+ break;
+ if (NILP (tail))
+ LFACE_INHERIT (lface) = value;
+ else
+ signal_error ("Invalid face inheritance", value);
}
else if (EQ (attr, QCbold))
{
else
signal_error ("Invalid face attribute name", attr);
+ if (font_related_attr_p
+ && !UNSPECIFIEDP (value))
+ /* If a font-related attribute other than QCfont is specified, the
+ original `font' attribute nor that of default face is useless
+ to determine a new font. Thus, we set it to nil so that font
+ selection mechanism doesn't use it. */
+ LFACE_FONT (lface) = Qnil;
+
/* Changing a named face means that all realized faces depending on
that face are invalid. Since we cannot tell which realized faces
depend on the face, make sure they are all removed. This is done
++windows_or_buffers_changed;
}
-#ifdef HAVE_X_WINDOWS
+#ifdef HAVE_WINDOW_SYSTEM
- if (!EQ (frame, Qt)
- && !UNSPECIFIEDP (value)
+ if (!UNSPECIFIEDP (value)
&& NILP (Fequal (old_value, value)))
{
Lisp_Object param;
param = Qnil;
-
+
if (EQ (face, Qdefault))
{
/* Changed font-related attributes of the `default' face are
reflected in changed `font' frame parameters. */
- if (font_related_attr_p
+ if ((font_related_attr_p || font_attr_p)
&& lface_fully_specified_p (XVECTOR (lface)->contents))
set_font_frame_param (frame, lface);
else if (EQ (attr, QCforeground))
else if (EQ (attr, QCbackground))
param = Qbackground_color;
}
+#ifndef WINDOWSNT
else if (EQ (face, Qscroll_bar))
{
/* Changing the colors of `scroll-bar' sets frame parameters
else if (EQ (attr, QCbackground))
param = Qscroll_bar_background;
}
+#endif /* not WINDOWSNT */
else if (EQ (face, Qborder))
{
/* Changing background color of `border' sets frame parameter
if (EQ (attr, QCbackground))
param = Qmouse_color;
}
+ else if (EQ (face, Qmenu))
+ ++menu_face_change_count;
- if (SYMBOLP (param))
- Fmodify_frame_parameters (frame, Fcons (Fcons (param, value), Qnil));
+ if (!NILP (param))
+ if (EQ (frame, Qt))
+ /* Update `default-frame-alist', which is used for new frames. */
+ {
+ store_in_alist (&Vdefault_frame_alist, param, value);
+ }
+ else
+ /* Update the current frame's parameters. */
+ {
+ Lisp_Object cons;
+ cons = XCAR (Vparam_value_alist);
+ XCAR (cons) = param;
+ XCDR (cons) = value;
+ Fmodify_frame_parameters (frame, Vparam_value_alist);
+ }
}
-#endif /* HAVE_X_WINDOWS */
-
+#endif /* HAVE_WINDOW_SYSTEM */
+
return face;
}
-#ifdef HAVE_X_WINDOWS
+#ifdef HAVE_WINDOW_SYSTEM
-/* Set the `font' frame parameter of FRAME according to `default' face
- attributes LFACE. */
+/* Set the `font' frame parameter of FRAME determined from `default'
+ face attributes LFACE. If a face or fontset name is explicitely
+ specfied in LFACE, use it as is. Otherwise, determine a font name
+ from the other font-related atrributes of LFACE. In that case, if
+ there's no matching font, signals an error. */
static void
set_font_frame_param (frame, lface)
Lisp_Object frame, lface;
{
struct frame *f = XFRAME (frame);
- Lisp_Object frame_font;
- int fontset;
- char *font;
-
- /* Get FRAME's font parameter. */
- frame_font = Fassq (Qfont, f->param_alist);
- xassert (CONSP (frame_font) && STRINGP (XCDR (frame_font)));
- frame_font = XCDR (frame_font);
- fontset = fs_query_fontset (f, XSTRING (frame_font)->data);
- if (fontset >= 0)
+ if (FRAME_WINDOW_P (f))
{
- /* Frame parameter is a fontset name. Modify the fontset so
- that all its fonts reflect face attributes LFACE. */
- int charset;
- struct fontset_info *fontset_info;
-
- fontset_info = FRAME_FONTSET_DATA (f)->fontset_table[fontset];
+ Lisp_Object font_name;
+ char *font;
- for (charset = 0; charset < MAX_CHARSET; ++charset)
- if (fontset_info->fontname[charset])
- {
- font = choose_face_fontset_font (f, XVECTOR (lface)->contents,
- fontset, charset);
- Fset_fontset_font (frame_font, CHARSET_SYMBOL (charset),
- build_string (font), frame);
- xfree (font);
- }
- }
- else
- {
- /* Frame parameter is an X font name. I believe this can
- only happen in unibyte mode. */
- font = choose_face_font (f, XVECTOR (lface)->contents,
- -1, Vface_default_registry);
- if (font)
+ if (STRINGP (LFACE_FONT (lface)))
+ font_name = LFACE_FONT (lface);
+ else
{
- store_frame_param (f, Qfont, build_string (font));
+ /* Choose a font name that reflects LFACE's attributes and has
+ the registry and encoding pattern specified in the default
+ fontset (3rd arg: -1) for ASCII characters (4th arg: 0). */
+ font = choose_face_font (f, XVECTOR (lface)->contents, -1, 0);
+ if (!font)
+ error ("No font matches the specified attribute");
+ font_name = build_string (font);
xfree (font);
}
+
+ Fmodify_frame_parameters (frame, Fcons (Fcons (Qfont, font_name), Qnil));
}
}
face-set-after-frame-defaults. */
if (NILP (f->face_alist))
return;
-
+
if (EQ (param, Qforeground_color))
{
lface = lface_from_face_name (f, Qdefault, 1);
frame-update-face-colors to do that. */
XSETFRAME (frame, f);
call1 (Qframe_update_face_colors, frame);
-
+
lface = lface_from_face_name (f, Qdefault, 1);
LFACE_BACKGROUND (lface) = (STRINGP (new_value)
? new_value : Qunspecified);
(resource, class, frame)
Lisp_Object resource, class, frame;
{
- Lisp_Object value;
+ Lisp_Object value = Qnil;
+#ifndef WINDOWSNT
+#ifndef macintosh
CHECK_STRING (resource, 0);
CHECK_STRING (class, 1);
CHECK_LIVE_FRAME (frame, 2);
value = display_x_get_resource (FRAME_X_DISPLAY_INFO (XFRAME (frame)),
resource, class, Qnil, Qnil);
UNBLOCK_INPUT;
+#endif /* not macintosh */
+#endif /* not WINDOWSNT */
return value;
}
If VALUE is "on" or "true", return t. If VALUE is "off" or
"false", return nil. Otherwise, if SIGNAL_P is non-zero, signal an
error; if SIGNAL_P is zero, return 0. */
-
+
static Lisp_Object
face_boolean_x_resource_value (value, signal_p)
Lisp_Object value;
Lisp_Object result = make_number (0);
xassert (STRINGP (value));
-
+
if (xstricmp (XSTRING (value)->data, "on") == 0
|| xstricmp (XSTRING (value)->data, "true") == 0)
result = Qt;
return Finternal_set_lisp_face_attribute (face, attr, value, frame);
}
+#endif /* HAVE_WINDOW_SYSTEM */
\f
+#ifdef HAVE_X_WINDOWS
/***********************************************************************
Menu face
***********************************************************************/
#ifdef USE_X_TOOLKIT
+#include "../lwlib/lwlib-utils.h"
+
/* Structure used to pass X resources to functions called via
XtApplyToWidgets. */
{
Widget submenu = 0;
struct x_resources *res = (struct x_resources *) p;
-
+
XtSetValues (w, res->av, res->ac);
XtVaGetValues (w, XmNsubMenuId, &submenu, NULL);
if (submenu)
}
xassert (ac <= sizeof av / sizeof *av);
-
+
if (ac)
{
struct x_resources res;
-
+
XtSetValues (widget, av, ac);
res.av = av, res.ac = ac;
XtApplyToWidgets (widget, xm_apply_resources, &res);
}
}
-
#endif /* USE_MOTIF */
#ifdef USE_LUCID
if (ac)
{
struct x_resources res;
-
+
XtSetValues (widget, av, ac);
/* We must do children here in case we're handling a pop-up menu
will need the `menu' face. */
if (f->face_cache->used == 0)
recompute_basic_faces (f);
-
+
+ BLOCK_INPUT;
#ifdef USE_LUCID
xl_set_menu_resources_from_menu_face (f, widget);
#endif
#ifdef USE_MOTIF
xm_set_menu_resources_from_menu_face (f, widget);
#endif
+ UNBLOCK_INPUT;
}
#endif /* USE_X_TOOLKIT */
Lisp_Object symbol, keyword, frame;
{
Lisp_Object lface, value = Qnil;
-
+
CHECK_SYMBOL (symbol, 0);
CHECK_SYMBOL (keyword, 1);
value = LFACE_STIPPLE (lface);
else if (EQ (keyword, QCwidth))
value = LFACE_SWIDTH (lface);
+ else if (EQ (keyword, QCinherit))
+ value = LFACE_INHERIT (lface);
+ else if (EQ (keyword, QCfont))
+ value = LFACE_FONT (lface);
else
signal_error ("Invalid face attribute name", keyword);
Lisp_Object attr;
{
Lisp_Object result = Qnil;
-
+
CHECK_SYMBOL (attr, 0);
-
+
if (EQ (attr, QCweight)
|| EQ (attr, QCslant)
|| EQ (attr, QCwidth))
/* Extract permissible symbols from tables. */
struct table_entry *table;
int i, dim;
-
+
if (EQ (attr, QCweight))
table = weight_table, dim = DIM (weight_table);
else if (EQ (attr, QCslant))
return result;
}
-
+
DEFUN ("internal-merge-in-global-face", Finternal_merge_in_global_face,
- Sinternal_merge_in_global_face, 2, 2, 0,
- "Add attributes from frame-default definition of FACE to FACE on FRAME.")
+ Sinternal_merge_in_global_face, 2, 2, 0,
+ "Add attributes from frame-default definition of FACE to FACE on FRAME.\n\
+Default face attributes override any local face attributes.")
(face, frame)
Lisp_Object face, frame;
{
- Lisp_Object global_lface, local_lface;
+ int i;
+ Lisp_Object global_lface, local_lface, *gvec, *lvec;
+
CHECK_LIVE_FRAME (frame, 1);
global_lface = lface_from_face_name (NULL, face, 1);
local_lface = lface_from_face_name (XFRAME (frame), face, 0);
if (NILP (local_lface))
local_lface = Finternal_make_lisp_face (face, frame);
- merge_face_vectors (XVECTOR (global_lface)->contents,
- XVECTOR (local_lface)->contents);
- return face;
+
+ /* Make every specified global attribute override the local one.
+ BEWARE!! This is only used from `face-set-after-frame-default' where
+ the local frame is defined from default specs in `face-defface-spec'
+ and those should be overridden by global settings. Hence the strange
+ "global before local" priority. */
+ lvec = XVECTOR (local_lface)->contents;
+ gvec = XVECTOR (global_lface)->contents;
+ for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
+ if (! UNSPECIFIEDP (gvec[i]))
+ lvec[i] = gvec[i];
+
+ return Qnil;
}
return fonts with the same size as the font of a face. This is
done in fontset.el. */
-DEFUN ("face-font", Fface_font, Sface_font, 1, 2, 0,
+DEFUN ("face-font", Fface_font, Sface_font, 1, 2, 0,
"Return the font name of face FACE, or nil if it is unspecified.\n\
If the optional argument FRAME is given, report on face FACE in that frame.\n\
If FRAME is t, report on the defaults for face FACE (for new frames).\n\
if (!UNSPECIFIEDP (LFACE_WEIGHT (lface))
&& !EQ (LFACE_WEIGHT (lface), Qnormal))
result = Fcons (Qbold, result);
-
+
if (!NILP (LFACE_SLANT (lface))
&& !EQ (LFACE_SLANT (lface), Qnormal))
result = Fcons (Qitalic, result);
-
+
return result;
}
else
{
struct frame *f = frame_or_selected_frame (frame, 1);
- int face_id = lookup_named_face (f, face, CHARSET_ASCII);
+ int face_id = lookup_named_face (f, face, 0);
struct face *face = FACE_FROM_ID (f, face_id);
- return build_string (face->font_name);
+ return face ? build_string (face->font_name) : Qnil;
}
}
switch (XTYPE (a))
{
case Lisp_String:
- equal_p = (XSTRING (a)->size == XSTRING (b)->size
+ equal_p = ((STRING_BYTES (XSTRING (a))
+ == STRING_BYTES (XSTRING (b)))
&& bcmp (XSTRING (a)->data, XSTRING (b)->data,
- XSTRING (a)->size) == 0);
+ STRING_BYTES (XSTRING (a))) == 0);
break;
-
+
case Lisp_Int:
case Lisp_Symbol:
equal_p = 0;
break;
-
+
default:
equal_p = !NILP (Fequal (a, b));
break;
}
}
}
-
+
return equal_p;
}
int equal_p;
struct frame *f;
Lisp_Object lface1, lface2;
-
+
if (EQ (frame, Qt))
f = NULL;
else
return equal_p ? Qt : Qnil;
}
-
+
DEFUN ("internal-lisp-face-empty-p", Finternal_lisp_face_empty_p,
Sinternal_lisp_face_empty_p, 1, 2, 0,
"True if FACE has no attribute specified.\n\
frame = selected_frame;
CHECK_LIVE_FRAME (frame, 0);
f = XFRAME (frame);
-
+
if (EQ (frame, Qt))
lface = lface_from_face_name (NULL, face, 1);
else
for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
if (!UNSPECIFIEDP (XVECTOR (lface)->contents[i]))
break;
-
+
return i == LFACE_VECTOR_SIZE ? Qt : Qnil;
}
DEFUN ("frame-face-alist", Fframe_face_alist, Sframe_face_alist,
- 0, 1, 0,
+ 0, 1, 0,
"Return an alist of frame-local faces defined on FRAME.\n\
For internal use only.")
(frame)
return (hash_string_case_insensitive (v[LFACE_FAMILY_INDEX])
^ hash_string_case_insensitive (v[LFACE_FOREGROUND_INDEX])
^ hash_string_case_insensitive (v[LFACE_BACKGROUND_INDEX])
- ^ (unsigned) v[LFACE_WEIGHT_INDEX]
- ^ (unsigned) v[LFACE_SLANT_INDEX]
- ^ (unsigned) v[LFACE_SWIDTH_INDEX]
+ ^ XFASTINT (v[LFACE_WEIGHT_INDEX])
+ ^ XFASTINT (v[LFACE_SLANT_INDEX])
+ ^ XFASTINT (v[LFACE_SWIDTH_INDEX])
^ XFASTINT (v[LFACE_HEIGHT_INDEX]));
}
/* Return non-zero if LFACE1 and LFACE2 specify the same font (without
considering charsets/registries). They do if they specify the same
- family, point size, weight, width and slant. Both LFACE1 and
- LFACE2 must be fully-specified. */
+ family, point size, weight, width, slant, and fontset. Both LFACE1
+ and LFACE2 must be fully-specified. */
static INLINE int
lface_same_font_attributes_p (lface1, lface2)
&& lface_fully_specified_p (lface2));
return (xstricmp (XSTRING (lface1[LFACE_FAMILY_INDEX])->data,
XSTRING (lface2[LFACE_FAMILY_INDEX])->data) == 0
- && (XFASTINT (lface1[LFACE_HEIGHT_INDEX])
- == XFASTINT (lface2[LFACE_HEIGHT_INDEX]))
+ && EQ (lface1[LFACE_HEIGHT_INDEX], lface2[LFACE_HEIGHT_INDEX])
&& EQ (lface1[LFACE_SWIDTH_INDEX], lface2[LFACE_SWIDTH_INDEX])
&& EQ (lface1[LFACE_WEIGHT_INDEX], lface2[LFACE_WEIGHT_INDEX])
- && EQ (lface1[LFACE_SLANT_INDEX], lface2[LFACE_SLANT_INDEX]));
+ && EQ (lface1[LFACE_SLANT_INDEX], lface2[LFACE_SLANT_INDEX])
+ && (EQ (lface1[LFACE_FONT_INDEX], lface2[LFACE_FONT_INDEX])
+ || (STRINGP (lface1[LFACE_FONT_INDEX])
+ && STRINGP (lface2[LFACE_FONT_INDEX])
+ && xstricmp (XSTRING (lface1[LFACE_FONT_INDEX])->data,
+ XSTRING (lface2[LFACE_FONT_INDEX])->data))));
}
***********************************************************************/
/* Allocate and return a new realized face for Lisp face attribute
- vector ATTR, charset CHARSET, and registry REGISTRY. */
+ vector ATTR. */
static struct face *
-make_realized_face (attr, charset, registry)
+make_realized_face (attr)
Lisp_Object *attr;
- int charset;
- Lisp_Object registry;
{
struct face *face = (struct face *) xmalloc (sizeof *face);
bzero (face, sizeof *face);
- face->charset = charset;
- face->registry = registry;
+ face->ascii_face = face;
bcopy (attr, face->lface, sizeof face->lface);
return face;
}
{
if (face)
{
-#ifdef HAVE_X_WINDOWS
- if (FRAME_X_P (f))
+#ifdef HAVE_WINDOW_SYSTEM
+ if (FRAME_WINDOW_P (f))
{
+ /* Free fontset of FACE if it is ASCII face. */
+ if (face->fontset >= 0 && face == face->ascii_face)
+ free_face_fontset (f, face);
if (face->gc)
{
x_free_gc (f, face->gc);
face->gc = 0;
}
-
+
free_face_colors (f, face);
x_destroy_bitmap (f, face->stipple);
}
-#endif /* HAVE_X_WINDOWS */
+#endif /* HAVE_WINDOW_SYSTEM */
xfree (face);
}
struct frame *f;
struct face *face;
{
-#ifdef HAVE_X_WINDOWS
- xassert (FRAME_X_P (f));
-
+#ifdef HAVE_WINDOW_SYSTEM
+ xassert (FRAME_WINDOW_P (f));
+
if (face->gc == 0)
{
XGCValues xgcv;
xgcv.foreground = face->foreground;
xgcv.background = face->background;
+#ifdef HAVE_X_WINDOWS
xgcv.graphics_exposures = False;
-
+#endif
/* The font of FACE may be null if we couldn't load it. */
if (face->font)
{
+#ifdef HAVE_X_WINDOWS
xgcv.font = face->font->fid;
+#endif
+#ifdef WINDOWSNT
+ xgcv.font = face->font;
+#endif
+#ifdef macintosh
+ xgcv.font = face->font;
+#endif
mask |= GCFont;
}
BLOCK_INPUT;
+#ifdef HAVE_X_WINDOWS
if (face->stipple)
{
xgcv.fill_style = FillOpaqueStippled;
xgcv.stipple = x_bitmap_pixmap (f, face->stipple);
mask |= GCFillStyle | GCStipple;
}
-
+#endif
face->gc = x_create_gc (f, mask, &xgcv);
UNBLOCK_INPUT;
}
-#endif
-}
-
-
-/* Non-zero if FACE is suitable for displaying ISO8859-1. Used in
- macro FACE_SUITABLE_FOR_CHARSET_P to avoid realizing a new face for
- ISO8859-1 if the ASCII face suffices. */
-
-int
-face_suitable_for_iso8859_1_p (face)
- struct face *face;
-{
- int len = strlen (face->font_name);
- return len >= 9 && xstricmp (face->font_name + len - 9, "iso8859-1") == 0;
-}
-
-
-/* Value is non-zero if FACE is suitable for displaying characters
- of CHARSET. CHARSET < 0 means unibyte text. */
-
-INLINE int
-face_suitable_for_charset_p (face, charset)
- struct face *face;
- int charset;
-{
- int suitable_p = 0;
-
- if (charset < 0)
- {
- if (EQ (face->registry, Vface_default_registry)
- || !NILP (Fequal (face->registry, Vface_default_registry)))
- suitable_p = 1;
- }
- else if (face->charset == charset)
- suitable_p = 1;
- else if (face->charset == CHARSET_ASCII
- && charset == charset_latin_iso8859_1)
- suitable_p = face_suitable_for_iso8859_1_p (face);
- else if (face->charset == charset_latin_iso8859_1
- && charset == CHARSET_ASCII)
- suitable_p = 1;
-
- return suitable_p;
+#endif /* HAVE_WINDOW_SYSTEM */
}
-
\f
/***********************************************************************
Face Cache
clear_face_gcs (c)
struct face_cache *c;
{
- if (c && FRAME_X_P (c->f))
+ if (c && FRAME_WINDOW_P (c->f))
{
-#ifdef HAVE_X_WINDOWS
+#ifdef HAVE_WINDOW_SYSTEM
int i;
for (i = BASIC_FACE_ID_SENTINEL; i < c->used; ++i)
{
face->gc = 0;
}
}
-#endif /* HAVE_X_WINDOWS */
+#endif /* HAVE_WINDOW_SYSTEM */
}
}
int i, size;
struct frame *f = c->f;
+ /* We must block input here because we can't process X events
+ safely while only some faces are freed, or when the frame's
+ current matrix still references freed faces. */
+ BLOCK_INPUT;
+
for (i = 0; i < c->used; ++i)
{
free_realized_face (f, c->faces_by_id[i]);
c->faces_by_id[i] = NULL;
}
-
+
c->used = 0;
size = FACE_CACHE_BUCKETS_SIZE * sizeof *c->buckets;
bzero (c->buckets, size);
clear_current_matrices (f);
++windows_or_buffers_changed;
}
+
+ UNBLOCK_INPUT;
+ }
+}
+
+
+/* Free all faces realized for multibyte characters on frame F that
+ has FONTSET. */
+
+void
+free_realized_multibyte_face (f, fontset)
+ struct frame *f;
+ int fontset;
+{
+ struct face_cache *cache = FRAME_FACE_CACHE (f);
+ struct face *face;
+ int i;
+
+ /* We must block input here because we can't process X events safely
+ while only some faces are freed, or when the frame's current
+ matrix still references freed faces. */
+ BLOCK_INPUT;
+
+ for (i = 0; i < cache->used; i++)
+ {
+ face = cache->faces_by_id[i];
+ if (face
+ && face != face->ascii_face
+ && face->fontset == fontset)
+ {
+ uncache_face (cache, face);
+ free_realized_face (f, face);
+ }
+ }
+
+ /* Must do a thorough redisplay the next time. Mark current
+ matrices as invalid because they will reference faces freed
+ above. This function is also called when a frame is destroyed.
+ In this case, the root window of F is nil. */
+ if (WINDOWP (f->root_window))
+ {
+ clear_current_matrices (f);
+ ++windows_or_buffers_changed;
}
+
+ UNBLOCK_INPUT;
}
/* Cache realized face FACE in face cache C. HASH is the hash value
of FACE. If FACE->fontset >= 0, add the new face to the end of the
collision list of the face hash table of C. This is done because
- otherwise lookup_face would find FACE for every charset, even if
- faces with the same attributes but for specific charsets exist. */
+ otherwise lookup_face would find FACE for every character, even if
+ faces with the same attributes but for specific characters exist. */
static void
cache_face (c, face, hash)
if (c->faces_by_id[i] == NULL)
break;
face->id = i;
-
+
/* Maybe enlarge C->faces_by_id. */
if (i == c->used && c->used == c->size)
{
xassert (n == 1);
}
#endif /* GLYPH_DEBUG */
-
+
c->faces_by_id[i] = face;
if (i == c->used)
++c->used;
struct face *face;
{
int i = face->hash % FACE_CACHE_BUCKETS_SIZE;
-
+
if (face->prev)
face->prev->next = face->next;
else
c->buckets[i] = face->next;
-
+
if (face->next)
face->next->prev = face->prev;
-
+
c->faces_by_id[face->id] = NULL;
if (face->id == c->used)
--c->used;
/* Look up a realized face with face attributes ATTR in the face cache
- of frame F. The face will be used to display characters of
- CHARSET. CHARSET < 0 means the face will be used to display
- unibyte text. The value of face-default-registry is used to choose
- a font for the face in that case. Value is the ID of the face
- found. If no suitable face is found, realize a new one. */
+ of frame F. The face will be used to display character C. Value
+ is the ID of the face found. If no suitable face is found, realize
+ a new one. In that case, if C is a multibyte character, BASE_FACE
+ is a face that has the same attributes. */
INLINE int
-lookup_face (f, attr, charset)
+lookup_face (f, attr, c, base_face)
struct frame *f;
Lisp_Object *attr;
- int charset;
+ int c;
+ struct face *base_face;
{
- struct face_cache *c = FRAME_FACE_CACHE (f);
+ struct face_cache *cache = FRAME_FACE_CACHE (f);
unsigned hash;
int i;
struct face *face;
- xassert (c != NULL);
+ xassert (cache != NULL);
check_lface_attrs (attr);
/* Look up ATTR in the face cache. */
hash = lface_hash (attr);
i = hash % FACE_CACHE_BUCKETS_SIZE;
-
- for (face = c->buckets[i]; face; face = face->next)
+
+ for (face = cache->buckets[i]; face; face = face->next)
if (face->hash == hash
&& (!FRAME_WINDOW_P (f)
- || FACE_SUITABLE_FOR_CHARSET_P (face, charset))
+ || FACE_SUITABLE_FOR_CHAR_P (face, c))
&& lface_equal_p (face->lface, attr))
break;
/* If not found, realize a new face. */
if (face == NULL)
- {
- face = realize_face (c, attr, charset);
- cache_face (c, face, hash);
- }
+ face = realize_face (cache, attr, c, base_face, -1);
#if GLYPH_DEBUG
xassert (face == FACE_FROM_ID (f, face->id));
- if (FRAME_X_P (f))
- xassert (charset < 0 || FACE_SUITABLE_FOR_CHARSET_P (face, charset));
+
+/* When this function is called from face_for_char (in this case, C is
+ a multibyte character), a fontset of a face returned by
+ realize_face is not yet set, i.e. FACE_SUITABLE_FOR_CHAR_P (FACE,
+ C) is not sutisfied. The fontset is set for this face by
+ face_for_char later. */
+#if 0
+ if (FRAME_WINDOW_P (f))
+ xassert (FACE_SUITABLE_FOR_CHAR_P (face, c));
+#endif
#endif /* GLYPH_DEBUG */
-
+
return face->id;
}
/* Return the face id of the realized face for named face SYMBOL on
- frame F suitable for displaying characters from CHARSET. CHARSET <
- 0 means unibyte text. */
+ frame F suitable for displaying character C. Value is -1 if the
+ face couldn't be determined, which might happen if the default face
+ isn't realized and cannot be realized. */
int
-lookup_named_face (f, symbol, charset)
+lookup_named_face (f, symbol, c)
struct frame *f;
Lisp_Object symbol;
- int charset;
+ int c;
{
Lisp_Object attrs[LFACE_VECTOR_SIZE];
Lisp_Object symbol_attrs[LFACE_VECTOR_SIZE];
struct face *default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
+ if (default_face == NULL)
+ {
+ if (!realize_basic_faces (f))
+ return -1;
+ default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
+ }
+
get_lface_attributes (f, symbol, symbol_attrs, 1);
bcopy (default_face->lface, attrs, sizeof attrs);
- merge_face_vectors (symbol_attrs, attrs);
- return lookup_face (f, attrs, charset);
+ merge_face_vectors (f, symbol_attrs, attrs, Qnil);
+ return lookup_face (f, attrs, c, NULL);
}
int lface_id;
{
int face_id;
-
+
if (lface_id >= 0 && lface_id < lface_id_to_name_size)
{
Lisp_Object face_name = lface_id_to_name[lface_id];
- face_id = lookup_named_face (f, face_name, CHARSET_ASCII);
+ face_id = lookup_named_face (f, face_name, 0);
}
else
face_id = -1;
smaller_face (f, face_id, steps)
struct frame *f;
int face_id, steps;
- {
-#ifdef HAVE_X_WINDOWS
+{
+#ifdef HAVE_WINDOW_SYSTEM
struct face *face;
Lisp_Object attrs[LFACE_VECTOR_SIZE];
int pt, last_pt, last_height;
/* Try in increments of 1/2 pt. */
delta = steps < 0 ? 5 : -5;
steps = abs (steps);
-
+
face = FACE_FROM_ID (f, face_id);
bcopy (face->lface, attrs, sizeof attrs);
pt = last_pt = XFASTINT (attrs[LFACE_HEIGHT_INDEX]);
/* Look up a face for a slightly smaller/larger font. */
pt += delta;
attrs[LFACE_HEIGHT_INDEX] = make_number (pt);
- new_face_id = lookup_face (f, attrs, CHARSET_ASCII);
+ new_face_id = lookup_face (f, attrs, 0, NULL);
new_face = FACE_FROM_ID (f, new_face_id);
/* If height changes, count that as one step. */
- if (FONT_HEIGHT (new_face->font) != last_height)
+ if ((delta < 0 && FONT_HEIGHT (new_face->font) < last_height)
+ || (delta > 0 && FONT_HEIGHT (new_face->font) > last_height))
{
--steps;
last_height = FONT_HEIGHT (new_face->font);
return new_face_id;
-#else /* not HAVE_X_WINDOWS */
+#else /* not HAVE_WINDOW_SYSTEM */
return face_id;
-
-#endif /* not HAVE_X_WINDOWS */
+
+#endif /* not HAVE_WINDOW_SYSTEM */
}
int face_id;
int height;
{
-#ifdef HAVE_X_WINDOWS
+#ifdef HAVE_WINDOW_SYSTEM
struct face *face;
Lisp_Object attrs[LFACE_VECTOR_SIZE];
face = FACE_FROM_ID (f, face_id);
bcopy (face->lface, attrs, sizeof attrs);
attrs[LFACE_HEIGHT_INDEX] = make_number (height);
- face_id = lookup_face (f, attrs, CHARSET_ASCII);
-#endif /* HAVE_X_WINDOWS */
-
+ face_id = lookup_face (f, attrs, 0, NULL);
+#endif /* HAVE_WINDOW_SYSTEM */
+
return face_id;
}
+
/* Return the face id of the realized face for named face SYMBOL on
- frame F suitable for displaying characters from CHARSET (CHARSET <
- 0 means unibyte text), and use attributes of the face FACE_ID for
- attributes that aren't completely specified by SYMBOL. This is
- like lookup_named_face, except that the default attributes come
- from FACE_ID, not from the default face. FACE_ID is assumed to
- be already realized. */
+ frame F suitable for displaying character C, and use attributes of
+ the face FACE_ID for attributes that aren't completely specified by
+ SYMBOL. This is like lookup_named_face, except that the default
+ attributes come from FACE_ID, not from the default face. FACE_ID
+ is assumed to be already realized. */
int
-lookup_derived_face (f, symbol, charset, face_id)
+lookup_derived_face (f, symbol, c, face_id)
struct frame *f;
Lisp_Object symbol;
- int charset;
+ int c;
int face_id;
{
Lisp_Object attrs[LFACE_VECTOR_SIZE];
get_lface_attributes (f, symbol, symbol_attrs, 1);
bcopy (default_face->lface, attrs, sizeof attrs);
- merge_face_vectors (symbol_attrs, attrs);
- return lookup_face (f, attrs, charset);
+ merge_face_vectors (f, symbol_attrs, attrs, Qnil);
+ return lookup_face (f, attrs, c, default_face);
}
Lisp_Object list;
int i;
int indices[4];
-
+
CHECK_LIST (order, 0);
bzero (indices, sizeof indices);
i = 0;
bcopy (indices, font_sort_order, sizeof font_sort_order);
free_all_realized_faces (Qnil);
}
-
+
return Qnil;
}
}
-#ifdef HAVE_X_WINDOWS
-
-/* Return the X registry and encoding of font name FONT_NAME on frame F.
- Value is nil if not successful. */
-
-static Lisp_Object
-deduce_unibyte_registry (f, font_name)
- struct frame *f;
- char *font_name;
+DEFUN ("internal-set-alternative-font-registry-alist",
+ Finternal_set_alternative_font_registry_alist,
+ Sinternal_set_alternative_font_registry_alist, 1, 1, 0,
+ "Define alternative font registries to try in face font selection.\n\
+ALIST is an alist of (REGISTRY ALTERNATIVE1 ALTERNATIVE2 ...) entries.\n\
+Each ALTERNATIVE is tried in order if no fonts of font registry REGISTRY can\n\
+be found. Value is ALIST.")
+ (alist)
+ Lisp_Object alist;
{
- struct font_name font;
- Lisp_Object registry = Qnil;
-
- font.name = STRDUPA (font_name);
- if (split_font_name (f, &font, 0))
- {
- char *buffer;
-
- /* Extract registry and encoding. */
- buffer = (char *) alloca (strlen (font.fields[XLFD_REGISTRY])
- + strlen (font.fields[XLFD_ENCODING])
- + 10);
- strcpy (buffer, font.fields[XLFD_REGISTRY]);
- strcat (buffer, "-");
- strcat (buffer, font.fields[XLFD_ENCODING]);
- registry = build_string (buffer);
- }
-
- return registry;
+ CHECK_LIST (alist, 0);
+ Vface_alternative_font_registry_alist = alist;
+ free_all_realized_faces (Qnil);
+ return alist;
}
+#ifdef HAVE_WINDOW_SYSTEM
+
/* Value is non-zero if FONT is the name of a scalable font. The
X11R6 XLFD spec says that point size, pixel size, and average width
are zero for scalable fonts. Intlfonts contain at least one
struct font_name *font;
{
char *s = font->fields[XLFD_AVGWIDTH];
- return *s == '0' && *(s + 1) == '\0';
+ return (*s == '0' && *(s + 1) == '\0')
+#ifdef WINDOWSNT
+ /* Windows implementation of XLFD is slightly broken for backward
+ compatibility with previous broken versions, so test for
+ wildcards as well as 0. */
+ || *s == '*'
+#endif
+ ;
}
+/* Ignore the difference of font point size less than this value. */
+
+#define FONT_POINT_SIZE_QUANTUM 5
+
/* Value is non-zero if FONT1 is a better match for font attributes
VALUES than FONT2. VALUES is an array of face attribute values in
font sort order. COMPARE_PT_P zero means don't compare point
int compare_pt_p;
{
int i;
-
+
for (i = 0; i < 4; ++i)
{
int xlfd_idx = font_sort_order[i];
{
int delta1 = abs (values[i] - font1->numeric[xlfd_idx]);
int delta2 = abs (values[i] - font2->numeric[xlfd_idx]);
-
+
+ if (xlfd_idx == XLFD_POINT_SIZE
+ && abs (delta1 - delta2) < FONT_POINT_SIZE_QUANTUM)
+ continue;
if (delta1 > delta2)
return 0;
else if (delta1 < delta2)
}
}
}
-
- return 0;
-}
+ return (font1->registry_priority < font2->registry_priority);
+}
-#if SCALABLE_FONTS
/* Value is non-zero if FONT is an exact match for face attributes in
SPECIFIED. SPECIFIED is an array of face attribute values in font
struct font_name *font;
{
int i;
-
+
for (i = 0; i < 4; ++i)
if (specified[i] != font->numeric[font_sort_order[i]])
break;
if (font->numeric[XLFD_RESY] != 0)
{
pt = resy / font->numeric[XLFD_RESY] * specified_pt + 0.5;
- pixel_value = font->numeric[XLFD_RESY] / 720.0 * pt;
+ pixel_value = font->numeric[XLFD_RESY] / (PT_PER_INCH * 10.0) * pt;
}
else
{
pt = specified_pt;
- pixel_value = resy / 720.0 * pt;
+ pixel_value = resy / (PT_PER_INCH * 10.0) * pt;
}
-
+
/* Set point size of the font. */
sprintf (point_size, "%d", (int) pt);
font->fields[XLFD_POINT_SIZE] = point_size;
font->numeric[XLFD_POINT_SIZE] = pt;
-
+
/* Set pixel size. */
sprintf (pixel_size, "%d", pixel_value);
font->fields[XLFD_PIXEL_SIZE] = pixel_size;
font->numeric[XLFD_PIXEL_SIZE] = pixel_value;
-
+
/* If font doesn't specify its resolution, use the
resolution of the display. */
if (font->numeric[XLFD_RESY] == 0)
font->fields[XLFD_RESY] = buffer;
font->numeric[XLFD_RESY] = resy;
}
-
+
if (strcmp (font->fields[XLFD_RESX], "0") == 0)
{
char buffer[20];
else if (CONSP (Vscalable_fonts_allowed))
{
Lisp_Object tail, regexp;
-
+
for (tail = Vscalable_fonts_allowed; CONSP (tail); tail = XCDR (tail))
{
regexp = XCAR (tail);
return 1;
}
}
-
+
return 0;
}
-#endif /* SCALABLE_FONTS != 0 */
/* Return the name of the best matching font for face attributes
{
char *font_name;
struct font_name *best;
- int i, pt;
+ int i, pt = 0;
int specified[4];
int exact_p;
for (i = 0; i < DIM (font_sort_order); ++i)
{
int xlfd_idx = font_sort_order[i];
-
+
if (xlfd_idx == XLFD_SWIDTH)
specified[i] = face_numeric_swidth (attrs[LFACE_SWIDTH_INDEX]);
else if (xlfd_idx == XLFD_POINT_SIZE)
abort ();
}
-#if SCALABLE_FONTS
-
- /* Set to 1 */
exact_p = 0;
-
+
/* Start with the first non-scalable font in the list. */
for (i = 0; i < nfonts; ++i)
if (!font_scalable_p (fonts + i))
if (i < nfonts)
{
best = fonts + i;
-
+
for (i = 1; i < nfonts; ++i)
if (!font_scalable_p (fonts + i)
&& better_font_p (specified, fonts + i, best, 1))
if (exact_p)
break;
}
-
+
}
else
best = NULL;
/* A scalable font is better if
1. its weight, slant, swidth attributes are better, or.
-
+
2. the best non-scalable font doesn't have the required
point size, and the scalable fonts weight, slant, swidth
isn't worse. */
non_scalable_has_exact_height_p = 1;
else
non_scalable_has_exact_height_p = 0;
-
+
for (i = 0; i < nfonts; ++i)
if (font_scalable_p (fonts + i))
{
font_name = build_scalable_font_name (f, best, pt);
else
font_name = build_font_name (best);
-
-#else /* !SCALABLE_FONTS */
-
- /* Find the best non-scalable font. */
- best = fonts;
-
- for (i = 1; i < nfonts; ++i)
- {
- xassert (!font_scalable_p (fonts + i));
- if (better_font_p (specified, fonts + i, best, 1))
- best = fonts + i;
- }
-
- font_name = build_font_name (best);
-
-#endif /* !SCALABLE_FONTS */
/* Free font_name structures. */
free_font_names (fonts, nfonts);
-
+
return font_name;
}
try_font_list (f, attrs, pattern, family, registry, fonts)
struct frame *f;
Lisp_Object *attrs;
- char *pattern, *family, *registry;
+ Lisp_Object pattern, family, registry;
struct font_name **fonts;
{
int nfonts;
- if (family == NULL)
- family = LSTRDUPA (attrs[LFACE_FAMILY_INDEX]);
-
+ if (NILP (family) && STRINGP (attrs[LFACE_FAMILY_INDEX]))
+ family = attrs[LFACE_FAMILY_INDEX];
+
nfonts = font_list (f, pattern, family, registry, fonts);
-
- if (nfonts == 0)
+ if (nfonts == 0 && !NILP (family))
{
Lisp_Object alter;
-
- /* Try alternative font families from
- Vface_alternative_font_family_alist. */
- alter = Fassoc (build_string (family),
- Vface_alternative_font_family_alist);
+
+ /* Try alternative font families. */
+ alter = Fassoc (family, Vface_alternative_font_family_alist);
if (CONSP (alter))
for (alter = XCDR (alter);
CONSP (alter) && nfonts == 0;
alter = XCDR (alter))
{
if (STRINGP (XCAR (alter)))
- {
- family = LSTRDUPA (XCAR (alter));
- nfonts = font_list (f, NULL, family, registry, fonts);
- }
+ nfonts = font_list (f, Qnil, XCAR (alter), registry, fonts);
}
-
+
/* Try font family of the default face or "fixed". */
if (nfonts == 0)
{
struct face *dflt = FACE_FROM_ID (f, DEFAULT_FACE_ID);
if (dflt)
- family = LSTRDUPA (dflt->lface[LFACE_FAMILY_INDEX]);
- else
- family = "fixed";
- nfonts = font_list (f, NULL, family, registry, fonts);
- }
-
- /* Try any family with the given registry. */
- if (nfonts == 0)
- nfonts = font_list (f, NULL, "*", registry, fonts);
- }
-
- return nfonts;
-}
-
-
-/* Return the registry and encoding pattern that fonts for CHARSET
- should match. Value is allocated from the heap. */
-
-char *
-x_charset_registry (charset)
- int charset;
-{
- Lisp_Object prop, charset_plist;
- char *registry;
-
- /* Get registry and encoding from the charset's plist. */
- charset_plist = CHARSET_TABLE_INFO (charset, CHARSET_PLIST_IDX);
- prop = Fplist_get (charset_plist, Qx_charset_registry);
-
- if (STRINGP (prop))
- {
- if (index (XSTRING (prop)->data, '-'))
- registry = xstrdup (XSTRING (prop)->data);
- else
- {
- /* If registry doesn't contain a `-', make it a pattern. */
- registry = (char *) xmalloc (STRING_BYTES (XSTRING (prop)) + 5);
- strcpy (registry, XSTRING (prop)->data);
- strcat (registry, "*-*");
+ family = dflt->lface[LFACE_FAMILY_INDEX];
+ else
+ family = build_string ("fixed");
+ nfonts = font_list (f, Qnil, family, registry, fonts);
}
+
+ /* Try any family with the given registry. */
+ if (nfonts == 0)
+ nfonts = font_list (f, Qnil, Qnil, registry, fonts);
}
- else if (STRINGP (Vface_default_registry))
- registry = xstrdup (XSTRING (Vface_default_registry)->data);
- else
- registry = xstrdup ("iso8859-1");
- return registry;
+ return nfonts;
}
-/* Return the fontset id of the fontset name or alias name given by
- the family attribute of ATTRS on frame F. Value is -1 if the
- family attribute of ATTRS doesn't name a fontset. */
+/* Return the fontset id of the base fontset name or alias name given
+ by the fontset attribute of ATTRS. Value is -1 if the fontset
+ attribute of ATTRS doesn't name a fontset. */
static int
-face_fontset (f, attrs)
- struct frame *f;
+face_fontset (attrs)
Lisp_Object *attrs;
{
- Lisp_Object name = attrs[LFACE_FAMILY_INDEX];
- int fontset;
-
- name = Fquery_fontset (name, Qnil);
- if (NILP (name))
- fontset = -1;
- else
- fontset = fs_query_fontset (f, XSTRING (name)->data);
+ Lisp_Object name;
- return fontset;
+ name = attrs[LFACE_FONT_INDEX];
+ if (!STRINGP (name))
+ return -1;
+ return fs_query_fontset (name, 0);
}
-/* Get the font to use for the face realizing the fully-specified Lisp
- face ATTRS for charset CHARSET on frame F. CHARSET < 0 means
- unibyte text; UNIBYTE_REGISTRY is the registry and encoding to use
- in this case. Value is the font name which is allocated from the
- heap (which means that it must be freed eventually). */
+/* Choose a name of font to use on frame F to display character C with
+ Lisp face attributes specified by ATTRS. The font name is
+ determined by the font-related attributes in ATTRS and the name
+ pattern for C in FONTSET. Value is the font name which is
+ allocated from the heap and must be freed by the caller, or NULL if
+ we can get no information about the font name of C. It is assured
+ that we always get some information for a single byte
+ character. */
static char *
-choose_face_font (f, attrs, charset, unibyte_registry)
+choose_face_font (f, attrs, fontset, c)
struct frame *f;
Lisp_Object *attrs;
- int charset;
- Lisp_Object unibyte_registry;
+ int fontset, c;
{
+ Lisp_Object pattern;
+ char *font_name = NULL;
struct font_name *fonts;
int nfonts;
- char *registry;
-
- /* ATTRS must be fully-specified. */
- xassert (lface_fully_specified_p (attrs));
-
- if (STRINGP (unibyte_registry))
- registry = xstrdup (XSTRING (unibyte_registry)->data);
- else
- registry = x_charset_registry (charset);
-
- nfonts = try_font_list (f, attrs, NULL, NULL, registry, &fonts);
- xfree (registry);
- return best_matching_font (f, attrs, fonts, nfonts);
-}
+ /* Get (foundry and) family name and registry (and encoding) name of
+ a font for C. */
+ pattern = fontset_font_pattern (f, fontset, c);
+ if (NILP (pattern))
+ {
+ xassert (!SINGLE_BYTE_CHAR_P (c));
+ return NULL;
+ }
+ /* If what we got is a name pattern, return it. */
+ if (STRINGP (pattern))
+ return xstrdup (XSTRING (pattern)->data);
-/* Choose a font to use on frame F to display CHARSET using FONTSET
- with Lisp face attributes specified by ATTRS. CHARSET may be any
- valid charset. CHARSET < 0 means unibyte text. If the fontset
- doesn't contain a font pattern for charset, use the pattern for
- CHARSET_ASCII. Value is the font name which is allocated from the
- heap and must be freed by the caller. */
+ /* Family name may be specified both in ATTRS and car part of
+ PATTERN. The former has higher priority if C is a single byte
+ character. */
+ if (STRINGP (attrs[LFACE_FAMILY_INDEX])
+ && SINGLE_BYTE_CHAR_P (c))
+ XCAR (pattern) = Qnil;
-static char *
-choose_face_fontset_font (f, attrs, fontset, charset)
- struct frame *f;
- Lisp_Object *attrs;
- int fontset, charset;
-{
- char *pattern;
- char *font_name = NULL;
- struct fontset_info *fontset_info;
- struct font_name *fonts;
- int nfonts;
-
- xassert (fontset >= 0 && fontset < FRAME_FONTSET_DATA (f)->n_fontsets);
-
- /* For unibyte text, use the ASCII font of the fontset. Using the
- ASCII font seems to be the most reasonable thing we can do in
- this case. */
- if (charset < 0)
- charset = CHARSET_ASCII;
-
- /* Get the font name pattern to use for CHARSET from the fontset. */
- fontset_info = FRAME_FONTSET_DATA (f)->fontset_table[fontset];
- pattern = fontset_info->fontname[charset];
- if (!pattern)
- pattern = fontset_info->fontname[CHARSET_ASCII];
- xassert (pattern);
-
- /* Get a list of fonts matching that pattern and choose the
+ /* Get a list of fonts matching that pattern and choose the
best match for the specified face attributes from it. */
- nfonts = try_font_list (f, attrs, pattern, NULL, NULL, &fonts);
+ nfonts = try_font_list (f, attrs, Qnil, XCAR (pattern), XCDR (pattern),
+ &fonts);
font_name = best_matching_font (f, attrs, fonts, nfonts);
return font_name;
}
-#endif /* HAVE_X_WINDOWS */
+#endif /* HAVE_WINDOW_SYSTEM */
\f
struct frame *f;
{
int success_p = 0;
-
+
+ /* Block input there so that we won't be surprised by an X expose
+ event, for instance without having the faces set up. */
+ BLOCK_INPUT;
+
if (realize_default_face (f))
{
realize_named_face (f, Qmode_line, MODE_LINE_FACE_ID);
realize_named_face (f, Qcursor, CURSOR_FACE_ID);
realize_named_face (f, Qmouse, MOUSE_FACE_ID);
realize_named_face (f, Qmenu, MENU_FACE_ID);
+
+ /* Reflect changes in the `menu' face in menu bars. */
+ if (menu_face_change_count)
+ {
+ menu_face_change_count = 0;
+
+#ifdef USE_X_TOOLKIT
+ if (FRAME_X_P (f))
+ {
+ Widget menu = f->output_data.x->menubar_widget;
+ if (menu)
+ x_set_menu_resources_from_menu_face (f, menu);
+ }
+#endif /* USE_X_TOOLKIT */
+ }
+
success_p = 1;
}
+ UNBLOCK_INPUT;
return success_p;
}
struct face_cache *c = FRAME_FACE_CACHE (f);
Lisp_Object lface;
Lisp_Object attrs[LFACE_VECTOR_SIZE];
- Lisp_Object unibyte_registry;
Lisp_Object frame_font;
struct face *face;
- int fontset;
/* If the `default' face is not yet known, create it. */
lface = lface_from_face_name (f, Qdefault, 0);
lface = Finternal_make_lisp_face (Qdefault, frame);
}
-#ifdef HAVE_X_WINDOWS
- if (FRAME_X_P (f))
+#ifdef HAVE_WINDOW_SYSTEM
+ if (FRAME_WINDOW_P (f))
{
/* Set frame_font to the value of the `font' frame parameter. */
frame_font = Fassq (Qfont, f->param_alist);
xassert (CONSP (frame_font) && STRINGP (XCDR (frame_font)));
frame_font = XCDR (frame_font);
-
- fontset = fs_query_fontset (f, XSTRING (frame_font)->data);
- if (fontset >= 0)
- {
- /* If frame_font is a fontset name, don't use that for
- determining font-related attributes of the default face
- because it is just an artificial name. Use the ASCII font of
- the fontset, instead. */
- struct font_info *font_info;
- struct font_name font;
-
- BLOCK_INPUT;
- font_info = FS_LOAD_FONT (f, FRAME_X_FONT_TABLE (f), CHARSET_ASCII,
- NULL, fontset);
- UNBLOCK_INPUT;
-
- /* Set weight etc. from the ASCII font. */
- if (!set_lface_from_font_name (f, lface, font_info->full_name, 0, 0))
- return 0;
-
- /* Remember registry and encoding of the frame font. */
- unibyte_registry = deduce_unibyte_registry (f, font_info->full_name);
- if (STRINGP (unibyte_registry))
- Vface_default_registry = unibyte_registry;
- else
- Vface_default_registry = build_string ("iso8859-1");
-
- /* But set the family to the fontset alias name. Implementation
- note: When a font is passed to Emacs via `-fn FONT', a
- fontset is created in `x-win.el' whose name ends in
- `fontset-startup'. This fontset has an alias name that is
- equal to frame_font. */
- xassert (STRINGP (frame_font));
- font.name = LSTRDUPA (frame_font);
-
- if (!split_font_name (f, &font, 1)
- || xstricmp (font.fields[XLFD_REGISTRY], "fontset") != 0
- || xstricmp (font.fields[XLFD_ENCODING], "startup") != 0)
- LFACE_FAMILY (lface) = frame_font;
- }
- else
- {
- /* Frame parameters contain a real font. Fill default face
- attributes from that font. */
- if (!set_lface_from_font_name (f, lface,
- XSTRING (frame_font)->data, 0, 0))
- return 0;
-
- /* Remember registry and encoding of the frame font. */
- unibyte_registry
- = deduce_unibyte_registry (f, XSTRING (frame_font)->data);
- if (STRINGP (unibyte_registry))
- Vface_default_registry = unibyte_registry;
- else
- Vface_default_registry = build_string ("iso8859-1");
- }
+ set_lface_from_font_name (f, lface, frame_font, 1, 1);
}
-#endif /* HAVE_X_WINDOWS */
+#endif /* HAVE_WINDOW_SYSTEM */
if (!FRAME_WINDOW_P (f))
{
LFACE_WEIGHT (lface) = Qnormal;
LFACE_SLANT (lface) = Qnormal;
}
-
+
if (UNSPECIFIEDP (LFACE_UNDERLINE (lface)))
LFACE_UNDERLINE (lface) = Qnil;
-
+
if (UNSPECIFIEDP (LFACE_OVERLINE (lface)))
LFACE_OVERLINE (lface) = Qnil;
-
+
if (UNSPECIFIEDP (LFACE_STRIKE_THROUGH (lface)))
LFACE_STRIKE_THROUGH (lface) = Qnil;
-
+
if (UNSPECIFIEDP (LFACE_BOX (lface)))
LFACE_BOX (lface) = Qnil;
-
+
if (UNSPECIFIEDP (LFACE_INVERSE (lface)))
LFACE_INVERSE (lface) = Qnil;
-
+
if (UNSPECIFIEDP (LFACE_FOREGROUND (lface)))
{
/* This function is called so early that colors are not yet
set in the frame parameter list. */
Lisp_Object color = Fassq (Qforeground_color, f->param_alist);
-
+
if (CONSP (color) && STRINGP (XCDR (color)))
LFACE_FOREGROUND (lface) = XCDR (color);
- else if (FRAME_X_P (f))
+ else if (FRAME_WINDOW_P (f))
return 0;
- else if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
- LFACE_FOREGROUND (lface) = Qunspecified_fg;
+ else if (FRAME_TERMCAP_P (f)
+ || FRAME_MSDOS_P (f)
+ || FRAME_W32_CONSOLE_P (f))
+ LFACE_FOREGROUND (lface) = build_string (unspecified_fg);
else
abort ();
}
-
+
if (UNSPECIFIEDP (LFACE_BACKGROUND (lface)))
{
/* This function is called so early that colors are not yet
Lisp_Object color = Fassq (Qbackground_color, f->param_alist);
if (CONSP (color) && STRINGP (XCDR (color)))
LFACE_BACKGROUND (lface) = XCDR (color);
- else if (FRAME_X_P (f))
+ else if (FRAME_WINDOW_P (f))
return 0;
- else if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
- LFACE_BACKGROUND (lface) = Qunspecified_bg;
+ else if (FRAME_TERMCAP_P (f)
+ || FRAME_MSDOS_P (f)
+ || FRAME_W32_CONSOLE_P (f))
+ LFACE_BACKGROUND (lface) = build_string (unspecified_bg);
else
abort ();
}
-
+
if (UNSPECIFIEDP (LFACE_STIPPLE (lface)))
LFACE_STIPPLE (lface) = Qnil;
xassert (lface_fully_specified_p (XVECTOR (lface)->contents));
check_lface (lface);
bcopy (XVECTOR (lface)->contents, attrs, sizeof attrs);
- face = realize_face (c, attrs, CHARSET_ASCII);
-
- /* Remove the former default face. */
- if (c->used > DEFAULT_FACE_ID)
- {
- struct face *default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
- uncache_face (c, default_face);
- free_realized_face (f, default_face);
- }
-
- /* Insert the new default face. */
- cache_face (c, face, lface_hash (attrs));
- xassert (face->id == DEFAULT_FACE_ID);
+ face = realize_face (c, attrs, 0, NULL, DEFAULT_FACE_ID);
return 1;
}
/* Merge SYMBOL's face with the default face. */
get_lface_attributes (f, symbol, symbol_attrs, 1);
- merge_face_vectors (symbol_attrs, attrs);
+ merge_face_vectors (f, symbol_attrs, attrs, Qnil);
/* Realize the face. */
- new_face = realize_face (c, attrs, CHARSET_ASCII);
-
- /* Remove the former face. */
- if (c->used > id)
- {
- struct face *old_face = c->faces_by_id[id];
- uncache_face (c, old_face);
- free_realized_face (f, old_face);
- }
-
- /* Insert the new face. */
- cache_face (c, new_face, lface_hash (attrs));
- xassert (new_face->id == id);
+ new_face = realize_face (c, attrs, 0, NULL, id);
}
/* Realize the fully-specified face with attributes ATTRS in face
- cache C for character set CHARSET or for unibyte text if CHARSET <
- 0. Value is a pointer to the newly created realized face. */
+ cache CACHE for character C. If C is a multibyte character,
+ BASE_FACE is a face that has the same attributes. Otherwise,
+ BASE_FACE is ignored. If FORMER_FACE_ID is non-negative, it is an
+ ID of face to remove before caching the new face. Value is a
+ pointer to the newly created realized face. */
static struct face *
-realize_face (c, attrs, charset)
- struct face_cache *c;
+realize_face (cache, attrs, c, base_face, former_face_id)
+ struct face_cache *cache;
Lisp_Object *attrs;
- int charset;
+ int c;
+ struct face *base_face;
+ int former_face_id;
{
struct face *face;
-
+
/* LFACE must be fully specified. */
- xassert (c != NULL);
+ xassert (cache != NULL);
check_lface_attrs (attrs);
- if (FRAME_X_P (c->f))
- face = realize_x_face (c, attrs, charset);
- else if (FRAME_TERMCAP_P (c->f) || FRAME_MSDOS_P (c->f))
- face = realize_tty_face (c, attrs, charset);
+ if (former_face_id >= 0 && cache->used > former_face_id)
+ {
+ /* Remove the former face. */
+ struct face *former_face = cache->faces_by_id[former_face_id];
+ uncache_face (cache, former_face);
+ free_realized_face (cache->f, former_face);
+ }
+
+ if (FRAME_WINDOW_P (cache->f))
+ face = realize_x_face (cache, attrs, c, base_face);
+ else if (FRAME_TERMCAP_P (cache->f)
+ || FRAME_MSDOS_P (cache->f)
+ || FRAME_W32_CONSOLE_P (cache->f))
+ face = realize_tty_face (cache, attrs, c);
else
abort ();
+ /* Insert the new face. */
+ cache_face (cache, face, lface_hash (attrs));
+#ifdef HAVE_WINDOW_SYSTEM
+ if (FRAME_WINDOW_P (cache->f) && face->font == NULL)
+ load_face_font (cache->f, face, c);
+#endif /* HAVE_WINDOW_SYSTEM */
return face;
}
/* Realize the fully-specified face with attributes ATTRS in face
- cache C for character set CHARSET or for unibyte text if CHARSET <
- 0. Do it for X frame C->f. Value is a pointer to the newly
- created realized face. */
+ cache CACHE for character C. Do it for X frame CACHE->f. If C is
+ a multibyte character, BASE_FACE is a face that has the same
+ attributes. Otherwise, BASE_FACE is ignored. If the new face
+ doesn't share font with the default face, a fontname is allocated
+ from the heap and set in `font_name' of the new face, but it is not
+ yet loaded here. Value is a pointer to the newly created realized
+ face. */
static struct face *
-realize_x_face (c, attrs, charset)
- struct face_cache *c;
+realize_x_face (cache, attrs, c, base_face)
+ struct face_cache *cache;
Lisp_Object *attrs;
- int charset;
+ int c;
+ struct face *base_face;
{
-#ifdef HAVE_X_WINDOWS
+#ifdef HAVE_WINDOW_SYSTEM
struct face *face, *default_face;
struct frame *f;
Lisp_Object stipple, overline, strike_through, box;
- Lisp_Object unibyte_registry;
- struct gcpro gcpro1;
- xassert (FRAME_X_P (c->f));
-
- /* If realizing a face for use in unibyte text, get the X registry
- and encoding to use from Vface_default_registry. */
- if (charset < 0)
- unibyte_registry = (STRINGP (Vface_default_registry)
- ? Vface_default_registry
- : build_string ("iso8859-1"));
- else
- unibyte_registry = Qnil;
- GCPRO1 (unibyte_registry);
+ xassert (FRAME_WINDOW_P (cache->f));
+ xassert (SINGLE_BYTE_CHAR_P (c)
+ || base_face);
/* Allocate a new realized face. */
- face = make_realized_face (attrs, charset, unibyte_registry);
+ face = make_realized_face (attrs);
+
+ f = cache->f;
+
+ /* If C is a multibyte character, we share all face attirbutes with
+ BASE_FACE including the realized fontset. But, we must load a
+ different font. */
+ if (!SINGLE_BYTE_CHAR_P (c))
+ {
+ bcopy (base_face, face, sizeof *face);
+ face->gc = 0;
+
+ /* Don't try to free the colors copied bitwise from BASE_FACE. */
+ face->foreground_defaulted_p = 1;
+ face->background_defaulted_p = 1;
+ face->underline_defaulted_p = 1;
+ face->overline_color_defaulted_p = 1;
+ face->strike_through_color_defaulted_p = 1;
+ face->box_color_defaulted_p = 1;
+
+ /* to force realize_face to load font */
+ face->font = NULL;
+ return face;
+ }
+
+ /* Now we are realizing a face for ASCII (and unibyte) characters. */
- f = c->f;
/* Determine the font to use. Most of the time, the font will be
the same as the font of the default face, so try that first. */
default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
if (default_face
- && FACE_SUITABLE_FOR_CHARSET_P (default_face, charset)
+ && FACE_SUITABLE_FOR_CHAR_P (default_face, c)
&& lface_same_font_attributes_p (default_face->lface, attrs))
{
face->font = default_face->font;
face->fontset = default_face->fontset;
face->font_info_id = default_face->font_info_id;
face->font_name = default_face->font_name;
- face->registry = default_face->registry;
- }
- else if (charset >= 0)
- {
- /* For all charsets, we use our own font selection functions to
- choose a best matching font for the specified face
- attributes. If the face specifies a fontset alias name, the
- fontset determines the font name pattern, otherwise we
- construct a font pattern from face attributes and charset. */
-
- char *font_name = NULL;
- int fontset = face_fontset (f, attrs);
+ face->ascii_face = face;
- if (fontset < 0)
- font_name = choose_face_font (f, attrs, charset, Qnil);
- else
- {
- font_name = choose_face_fontset_font (f, attrs, fontset, charset);
- fontset = -1;
- }
-
- load_face_font_or_fontset (f, face, font_name, fontset);
- xfree (font_name);
+ /* But, as we can't share the fontset, make a new realized
+ fontset that has the same base fontset as of the default
+ face. */
+ face->fontset
+ = make_fontset_for_ascii_face (f, default_face->fontset);
}
else
{
- /* Unibyte case, and font is not equal to that of the default
- face. UNIBYTE_REGISTRY is the X registry and encoding the
- font should have. What is a reasonable thing to do if the
- user specified a fontset alias name for the face in this
- case? We choose a font by taking the ASCII font of the
- fontset, but using UNIBYTE_REGISTRY for its registry and
- encoding. */
-
- char *font_name = NULL;
- int fontset = face_fontset (f, attrs);
-
- if (fontset < 0)
- font_name = choose_face_font (f, attrs, charset, unibyte_registry);
- else
- font_name = choose_face_fontset_font (f, attrs, fontset, charset);
-
- load_face_font_or_fontset (f, face, font_name, -1);
- xfree (font_name);
+ /* If the face attribute ATTRS specifies a fontset, use it as
+ the base of a new realized fontset. Otherwise, use the same
+ base fontset as of the default face. The base determines
+ registry and encoding of a font. It may also determine
+ foundry and family. The other fields of font name pattern
+ are constructed from ATTRS. */
+ int fontset = face_fontset (attrs);
+
+ if ((fontset == -1) && default_face)
+ fontset = default_face->fontset;
+ face->fontset = make_fontset_for_ascii_face (f, fontset);
+ face->font = NULL; /* to force realize_face to load font */
+
+#ifdef macintosh
+ /* Load the font if it is specified in ATTRS. This fixes
+ changing frame font on the Mac. */
+ if (STRINGP (attrs[LFACE_FONT_INDEX]))
+ {
+ struct font_info *font_info =
+ FS_LOAD_FONT (f, 0, XSTRING (attrs[LFACE_FONT_INDEX])->data, -1);
+ if (font_info)
+ face->font = font_info->font;
+ }
+#endif
}
/* Load colors, and set remaining attributes. */
-
+
load_face_colors (f, face, attrs);
/* Set up box. */
}
/* Text underline, overline, strike-through. */
-
+
if (EQ (attrs[LFACE_UNDERLINE_INDEX], Qt))
- {
+ {
/* Use default color (same as foreground color). */
face->underline_p = 1;
face->underline_defaulted_p = 1;
if (!NILP (stipple))
face->stipple = load_pixmap (f, stipple, &face->pixmap_w, &face->pixmap_h);
- UNGCPRO;
- xassert (face->fontset < 0);
- xassert (FACE_SUITABLE_FOR_CHARSET_P (face, charset));
+ xassert (FACE_SUITABLE_FOR_CHAR_P (face, c));
return face;
-#endif /* HAVE_X_WINDOWS */
+#endif /* HAVE_WINDOW_SYSTEM */
+}
+
+
+/* Map a specified color of face FACE on frame F to a tty color index.
+ IDX is either LFACE_FOREGROUND_INDEX or LFACE_BACKGROUND_INDEX, and
+ specifies which color to map. Set *DEFAULTED to 1 if mapping to the
+ default foreground/background colors. */
+
+static void
+map_tty_color (f, face, idx, defaulted)
+ struct frame *f;
+ struct face *face;
+ enum lface_attribute_index idx;
+ int *defaulted;
+{
+ Lisp_Object frame, color, def;
+ int foreground_p = idx == LFACE_FOREGROUND_INDEX;
+ unsigned long default_pixel, default_other_pixel, pixel;
+
+ xassert (idx == LFACE_FOREGROUND_INDEX || idx == LFACE_BACKGROUND_INDEX);
+
+ if (foreground_p)
+ {
+ pixel = default_pixel = FACE_TTY_DEFAULT_FG_COLOR;
+ default_other_pixel = FACE_TTY_DEFAULT_BG_COLOR;
+ }
+ else
+ {
+ pixel = default_pixel = FACE_TTY_DEFAULT_BG_COLOR;
+ default_other_pixel = FACE_TTY_DEFAULT_FG_COLOR;
+ }
+
+ XSETFRAME (frame, f);
+ color = face->lface[idx];
+
+ if (STRINGP (color)
+ && XSTRING (color)->size
+ && CONSP (Vtty_defined_color_alist)
+ && (def = assq_no_quit (color, call1 (Qtty_color_alist, frame)),
+ CONSP (def)))
+ {
+ /* Associations in tty-defined-color-alist are of the form
+ (NAME INDEX R G B). We need the INDEX part. */
+ pixel = XINT (XCAR (XCDR (def)));
+ }
+
+ if (pixel == default_pixel && STRINGP (color))
+ {
+ pixel = load_color (f, face, color, idx);
+
+#if defined (MSDOS) || defined (WINDOWSNT)
+ /* If the foreground of the default face is the default color,
+ use the foreground color defined by the frame. */
+#ifdef MSDOS
+ if (FRAME_MSDOS_P (f))
+ {
+#endif /* MSDOS */
+ if (pixel == default_pixel
+ || pixel == FACE_TTY_DEFAULT_COLOR)
+ {
+ if (foreground_p)
+ pixel = FRAME_FOREGROUND_PIXEL (f);
+ else
+ pixel = FRAME_BACKGROUND_PIXEL (f);
+ face->lface[idx] = tty_color_name (f, pixel);
+ *defaulted = 1;
+ }
+ else if (pixel == default_other_pixel)
+ {
+ if (foreground_p)
+ pixel = FRAME_BACKGROUND_PIXEL (f);
+ else
+ pixel = FRAME_FOREGROUND_PIXEL (f);
+ face->lface[idx] = tty_color_name (f, pixel);
+ *defaulted = 1;
+ }
+#ifdef MSDOS
+ }
+#endif
+#endif /* MSDOS or WINDOWSNT */
+ }
+
+ if (foreground_p)
+ face->foreground = pixel;
+ else
+ face->background = pixel;
}
/* Realize the fully-specified face with attributes ATTRS in face
- cache C for character set CHARSET or for unibyte text if CHARSET <
- 0. Do it for TTY frame C->f. Value is a pointer to the newly
- created realized face. */
+ cache CACHE for character C. Do it for TTY frame CACHE->f. Value is a
+ pointer to the newly created realized face. */
static struct face *
-realize_tty_face (c, attrs, charset)
- struct face_cache *c;
+realize_tty_face (cache, attrs, c)
+ struct face_cache *cache;
Lisp_Object *attrs;
- int charset;
+ int c;
{
struct face *face;
int weight, slant;
- Lisp_Object color;
- Lisp_Object tty_defined_color_alist =
- Fsymbol_value (intern ("tty-defined-color-alist"));
- Lisp_Object tty_color_alist = intern ("tty-color-alist");
- Lisp_Object frame;
int face_colors_defaulted = 0;
+ struct frame *f = cache->f;
/* Frame must be a termcap frame. */
- xassert (FRAME_TERMCAP_P (c->f) || FRAME_MSDOS_P (c->f));
-
+ xassert (FRAME_TERMCAP_P (cache->f)
+ || FRAME_MSDOS_P (cache->f)
+ || FRAME_W32_CONSOLE_P (cache->f));
+
/* Allocate a new realized face. */
- face = make_realized_face (attrs, charset, Qnil);
- face->font_name = FRAME_MSDOS_P (c->f) ? "ms-dos" : "tty";
+ face = make_realized_face (attrs);
+ face->font_name = FRAME_MSDOS_P (cache->f) ? "ms-dos"
+ : FRAME_W32_CONSOLE_P (cache->f) ? "w32console" : "tty";
- /* Map face attributes to TTY appearances. We map slant to
+ /* Map face attributes to TTY appearances. We map slant to
dimmed text because we want italic text to appear differently
and because dimmed text is probably used infrequently. */
weight = face_numeric_weight (attrs[LFACE_WEIGHT_INDEX]);
face->tty_reverse_p = 1;
/* Map color names to color indices. */
- face->foreground = FACE_TTY_DEFAULT_FG_COLOR;
- face->background = FACE_TTY_DEFAULT_BG_COLOR;
-
- XSETFRAME (frame, c->f);
- color = attrs[LFACE_FOREGROUND_INDEX];
- if (STRINGP (color)
- && XSTRING (color)->size
- && !NILP (tty_defined_color_alist)
- && (color = Fassoc (color, call1 (tty_color_alist, frame)),
- CONSP (color)))
- /* Associations in tty-defined-color-alist are of the form
- (NAME INDEX R G B). We need the INDEX part. */
- face->foreground = XINT (XCAR (XCDR (color)));
-
- if (face->foreground == FACE_TTY_DEFAULT_FG_COLOR
- && STRINGP (attrs[LFACE_FOREGROUND_INDEX]))
- {
- face->foreground = load_color (c->f, face,
- attrs[LFACE_FOREGROUND_INDEX],
- LFACE_FOREGROUND_INDEX);
-#ifdef MSDOS
- /* If the foreground of the default face is the default color,
- use the foreground color defined by the frame. */
- if (FRAME_MSDOS_P (c->f))
- {
- if (face->foreground == FACE_TTY_DEFAULT_FG_COLOR
- || face->foreground == FACE_TTY_DEFAULT_COLOR)
- {
- face->foreground = FRAME_FOREGROUND_PIXEL (f);
- attrs[LFACE_FOREGROUND_INDEX] =
- msdos_stdcolor_name (face->foreground);
- face_colors_defaulted = 1;
- }
- else if (face->foreground == FACE_TTY_DEFAULT_BG_COLOR)
- {
- face->foreground = FRAME_BACKGROUND_PIXEL (f);
- attrs[LFACE_FOREGROUND_INDEX] =
- msdos_stdcolor_name (face->foreground);
- face_colors_defaulted = 1;
- }
- }
-#endif
- }
-
- color = attrs[LFACE_BACKGROUND_INDEX];
- if (STRINGP (color)
- && XSTRING (color)->size
- && !NILP (tty_defined_color_alist)
- && (color = Fassoc (color, call1 (tty_color_alist, frame)),
- CONSP (color)))
- /* Associations in tty-defined-color-alist are of the form
- (NAME INDEX R G B). We need the INDEX part. */
- face->background = XINT (XCAR (XCDR (color)));
-
- if (face->background == FACE_TTY_DEFAULT_BG_COLOR
- && STRINGP (attrs[LFACE_BACKGROUND_INDEX]))
- {
- face->background = load_color (c->f, face,
- attrs[LFACE_BACKGROUND_INDEX],
- LFACE_BACKGROUND_INDEX);
-#ifdef MSDOS
- /* If the background of the default face is the default color,
- use the background color defined by the frame. */
- if (FRAME_MSDOS_P (c->f))
- {
- if (face->background == FACE_TTY_DEFAULT_BG_COLOR
- || face->background == FACE_TTY_DEFAULT_COLOR)
- {
- face->background = FRAME_BACKGROUND_PIXEL (f);
- attrs[LFACE_BACKGROUND_INDEX] =
- msdos_stdcolor_name (face->background);
- face_colors_defaulted = 1;
- }
- else if (face->background == FACE_TTY_DEFAULT_FG_COLOR)
- {
- face->background = FRAME_FOREGROUND_PIXEL (f);
- attrs[LFACE_BACKGROUND_INDEX] =
- msdos_stdcolor_name (face->background);
- face_colors_defaulted = 1;
- }
- }
-#endif
- }
-
+ map_tty_color (f, face, LFACE_FOREGROUND_INDEX, &face_colors_defaulted);
+ map_tty_color (f, face, LFACE_BACKGROUND_INDEX, &face_colors_defaulted);
+
/* Swap colors if face is inverse-video. If the colors are taken
from the frame colors, they are already inverted, since the
frame-creation function calls x-handle-reverse-video. */
if (face->tty_reverse_p && !face_colors_defaulted)
{
unsigned long tem = face->foreground;
-
face->foreground = face->background;
face->background = tem;
}
+ if (tty_suppress_bold_inverse_default_colors_p
+ && face->tty_bold_p
+ && face->background == FACE_TTY_DEFAULT_FG_COLOR
+ && face->foreground == FACE_TTY_DEFAULT_BG_COLOR)
+ face->tty_bold_p = 0;
+
return face;
}
+DEFUN ("tty-suppress-bold-inverse-default-colors",
+ Ftty_suppress_bold_inverse_default_colors,
+ Stty_suppress_bold_inverse_default_colors, 1, 1, 0,
+ "Suppress/allow boldness of faces with inverse default colors.\n\
+SUPPRESS non-nil means suppress it.\n\
+This affects bold faces on TTYs whose foreground is the default background\n\
+color of the display and whose background is the default foreground color.\n\
+For such faces, the bold face attribute is ignored if this variable\n\
+is non-nil.")
+ (suppress)
+ Lisp_Object suppress;
+{
+ tty_suppress_bold_inverse_default_colors_p = !NILP (suppress);
+ ++face_change_count;
+ return suppress;
+}
+
+
\f
/***********************************************************************
Computing Faces
Lisp_Object prop;
{
int face_id;
- int charset = (NILP (current_buffer->enable_multibyte_characters)
- ? -1
- : CHAR_CHARSET (ch));
-
+
+ if (NILP (current_buffer->enable_multibyte_characters))
+ ch = -1;
+
if (NILP (prop))
- face_id = FACE_FOR_CHARSET (f, DEFAULT_FACE_ID, charset);
+ {
+ struct face *face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
+ face_id = FACE_FOR_CHAR (f, face, ch);
+ }
else
{
Lisp_Object attrs[LFACE_VECTOR_SIZE];
struct face *default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
bcopy (default_face->lface, attrs, sizeof attrs);
merge_face_vector_with_property (f, attrs, prop);
- face_id = lookup_face (f, attrs, charset);
+ face_id = lookup_face (f, attrs, ch, NULL);
}
return face_id;
If MOUSE is non-zero, use the character's mouse-face, not its face.
- The face returned is suitable for displaying CHARSET_ASCII if
- current_buffer->enable_multibyte_characters is non-nil. Otherwise,
- the face is suitable for displaying unibyte text. */
+ The face returned is suitable for displaying ASCII characters. */
int
face_at_buffer_position (w, pos, region_beg, region_end,
Lisp_Object propname = mouse ? Qmouse_face : Qface;
Lisp_Object limit1, end;
struct face *default_face;
- int multibyte_p = !NILP (current_buffer->enable_multibyte_characters);
/* W must display the current buffer. We could write this function
to use the frame and buffer of W, but right now it doesn't. */
len = 40;
overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object));
noverlays = overlays_at (pos, 0, &overlay_vec, &len,
- &next_overlay, NULL);
+ &next_overlay, NULL, 0);
/* If there are more than 40, make enough space for all, and try
again. */
len = noverlays;
overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object));
noverlays = overlays_at (pos, 0, &overlay_vec, &len,
- &next_overlay, NULL);
+ &next_overlay, NULL, 0);
}
if (next_overlay < endpos)
*endptr = endpos;
default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
-
+
/* Optimize common cases where we can use the default face. */
if (noverlays == 0
&& NILP (prop)
- && !(pos >= region_beg && pos < region_end)
- && (multibyte_p
- || !FRAME_WINDOW_P (f)
- || FACE_SUITABLE_FOR_CHARSET_P (default_face, -1)))
+ && !(pos >= region_beg && pos < region_end))
return DEFAULT_FACE_ID;
/* Begin with attributes from the default face. */
if (pos >= region_beg && pos < region_end)
{
Lisp_Object region_face = lface_from_face_name (f, Qregion, 0);
- merge_face_vectors (XVECTOR (region_face)->contents, attrs);
-
+ merge_face_vectors (f, XVECTOR (region_face)->contents, attrs, Qnil);
+
if (region_end < endpos)
endpos = region_end;
}
*endptr = endpos;
/* Look up a realized face with the given face attributes,
- or realize a new one. Charset is ignored for tty frames. */
- return lookup_face (f, attrs, multibyte_p ? CHARSET_ASCII : -1);
+ or realize a new one for ASCII characters. */
+ return lookup_face (f, attrs, 0, NULL);
}
/* Compute the face at character position POS in Lisp string STRING on
- window W, for charset CHARSET_ASCII.
+ window W, for ASCII characters.
If STRING is an overlay string, it comes from position BUFPOS in
current_buffer, otherwise BUFPOS is zero to indicate that STRING is
not an overlay string. W must display the current buffer.
REGION_BEG and REGION_END give the start and end positions of the
- region; both are -1 if no region is visible. BASE_FACE_ID is the
- id of the basic face to merge with. It is usually equal to
- DEFAULT_FACE_ID but can be MODE_LINE_FACE_ID or HEADER_LINE_FACE_ID
- for strings displayed in the mode or top line.
-
+ region; both are -1 if no region is visible.
+
+ BASE_FACE_ID is the id of a face to merge with. For strings coming
+ from overlays or the `display' property it is the face at BUFPOS.
+
Set *ENDPTR to the next position where to check for faces in
STRING; -1 if the face is constant from POS to the end of the
string.
Value is the id of the face to use. The face returned is suitable
- for displaying CHARSET_ASCII if STRING is multibyte. Otherwise,
- the face is suitable for displaying unibyte text. */
+ for displaying ASCII characters. */
int
face_at_string_position (w, string, pos, bufpos, region_beg,
if we don't have fonts, so we can stop here if not working
on a window-system frame. */
|| !FRAME_WINDOW_P (f)
- || FACE_SUITABLE_FOR_CHARSET_P (base_face, -1)))
+ || FACE_SUITABLE_FOR_CHAR_P (base_face, 0)))
return base_face->id;
/* Begin with attributes from the base face. */
&& bufpos < region_end)
{
Lisp_Object region_face = lface_from_face_name (f, Qregion, 0);
- merge_face_vectors (XVECTOR (region_face)->contents, attrs);
+ merge_face_vectors (f, XVECTOR (region_face)->contents, attrs, Qnil);
}
/* Look up a realized face with the given face attributes,
- or realize a new one. */
- return lookup_face (f, attrs, multibyte_p ? CHARSET_ASCII : -1);
+ or realize a new one for ASCII characters. */
+ return lookup_face (f, attrs, 0, NULL);
}
if (NILP (n))
{
int i;
-
+
fprintf (stderr, "font selection order: ");
for (i = 0; i < DIM (font_sort_order); ++i)
fprintf (stderr, "%d ", font_sort_order[i]);
fprintf (stderr, "alternative fonts: ");
debug_print (Vface_alternative_font_family_alist);
fprintf (stderr, "\n");
-
+
for (i = 0; i < FRAME_FACE_CACHE (SELECTED_FRAME ())->used; ++i)
Fdump_face (make_number (i));
}
error ("Not a valid face");
dump_realized_face (face);
}
-
+
return Qnil;
}
staticpro (&Qbitmap_spec_p);
Qframe_update_face_colors = intern ("frame-update-face-colors");
staticpro (&Qframe_update_face_colors);
-
+
/* Lisp face attribute keywords. */
QCfamily = intern (":family");
staticpro (&QCfamily);
QCunderline = intern (":underline");
staticpro (&QCunderline);
QCinverse_video = intern (":inverse-video");
- staticpro (&QCinverse_video);
+ staticpro (&QCinverse_video);
QCreverse_video = intern (":reverse-video");
staticpro (&QCreverse_video);
QCforeground = intern (":foreground");
staticpro (&QCstrike_through);
QCbox = intern (":box");
staticpro (&QCbox);
+ QCinherit = intern (":inherit");
+ staticpro (&QCinherit);
/* Symbols used for Lisp face attribute values. */
QCcolor = intern (":color");
staticpro (&Qforeground_color);
Qunspecified = intern ("unspecified");
staticpro (&Qunspecified);
- Qunspecified_fg = intern ("unspecified-fg");
- staticpro (&Qunspecified_fg);
- Qunspecified_bg = intern ("unspecified-bg");
- staticpro (&Qunspecified_bg);
- Qx_charset_registry = intern ("x-charset-registry");
- staticpro (&Qx_charset_registry);
Qface_alias = intern ("face-alias");
staticpro (&Qface_alias);
Qdefault = intern ("default");
staticpro (&Qtty_color_desc);
Qtty_color_by_index = intern ("tty-color-by-index");
staticpro (&Qtty_color_by_index);
+ Qtty_color_alist = intern ("tty-color-alist");
+ staticpro (&Qtty_color_alist);
+
+ Vparam_value_alist = Fcons (Fcons (Qnil, Qnil), Qnil);
+ staticpro (&Vparam_value_alist);
+ Vface_alternative_font_family_alist = Qnil;
+ staticpro (&Vface_alternative_font_family_alist);
+ Vface_alternative_font_registry_alist = Qnil;
+ staticpro (&Vface_alternative_font_registry_alist);
defsubr (&Sinternal_make_lisp_face);
defsubr (&Sinternal_lisp_face_p);
defsubr (&Sinternal_set_lisp_face_attribute);
-#ifdef HAVE_X_WINDOWS
+#ifdef HAVE_WINDOW_SYSTEM
defsubr (&Sinternal_set_lisp_face_attribute_from_resource);
- defsubr (&Sface_color_gray_p);
- defsubr (&Sface_color_supported_p);
#endif
+ defsubr (&Scolor_gray_p);
+ defsubr (&Scolor_supported_p);
defsubr (&Sinternal_get_lisp_face_attribute);
defsubr (&Sinternal_lisp_face_attribute_values);
defsubr (&Sinternal_lisp_face_equal_p);
defsubr (&Sframe_face_alist);
defsubr (&Sinternal_set_font_selection_order);
defsubr (&Sinternal_set_alternative_font_family_alist);
+ defsubr (&Sinternal_set_alternative_font_registry_alist);
#if GLYPH_DEBUG
defsubr (&Sdump_face);
defsubr (&Sshow_face_resources);
#endif /* GLYPH_DEBUG */
defsubr (&Sclear_face_cache);
+ defsubr (&Stty_suppress_bold_inverse_default_colors);
+
+#if defined DEBUG_X_COLORS && defined HAVE_X_WINDOWS
+ defsubr (&Sdump_colors);
+#endif
DEFVAR_LISP ("font-list-limit", &Vfont_list_limit,
"*Limit for font matching.\n\
DEFVAR_LISP ("face-new-frame-defaults", &Vface_new_frame_defaults,
"List of global face definitions (for internal use only.)");
Vface_new_frame_defaults = Qnil;
-
+
DEFVAR_LISP ("face-default-stipple", &Vface_default_stipple,
"*Default stipple pattern used on monochrome displays.\n\
This stipple pattern is used on monochrome displays\n\
See `set-face-stipple' for possible values for this variable.");
Vface_default_stipple = build_string ("gray3");
- DEFVAR_LISP ("face-default-registry", &Vface_default_registry,
- "Default registry and encoding to use.\n\
-This registry and encoding is used for unibyte text. It is set up\n\
-from the specified frame font when Emacs starts. (For internal use only.)");
- Vface_default_registry = Qnil;
-
- DEFVAR_LISP ("face-alternative-font-family-alist",
- &Vface_alternative_font_family_alist, "");
- Vface_alternative_font_family_alist = Qnil;
+ DEFVAR_LISP ("tty-defined-color-alist", &Vtty_defined_color_alist,
+ "An alist of defined terminal colors and their RGB values.");
+ Vtty_defined_color_alist = Qnil;
-#if SCALABLE_FONTS
-
DEFVAR_LISP ("scalable-fonts-allowed", &Vscalable_fonts_allowed,
"Allowed scalable fonts.\n\
A value of nil means don't allow any scalable fonts.\n\
A value of t means allow any scalable font.\n\
Otherwise, value must be a list of regular expressions. A font may be\n\
scaled if its name matches a regular expression in the list.");
+#if defined (WINDOWSNT) || defined (macintosh)
+ /* Windows uses mainly truetype fonts, so disallowing scalable fonts
+ by default limits the fonts available severely. */
+ Vscalable_fonts_allowed = Qt;
+#else
Vscalable_fonts_allowed = Qnil;
-
-#endif /* SCALABLE_FONTS */
+#endif
-#ifdef HAVE_X_WINDOWS
+ DEFVAR_LISP ("face-ignored-fonts", &Vface_ignored_fonts,
+ "List of ignored fonts.\n\
+Each element is a regular expression that matches names of fonts to ignore.");
+ Vface_ignored_fonts = Qnil;
+
+#ifdef HAVE_WINDOW_SYSTEM
defsubr (&Sbitmap_spec_p);
defsubr (&Sx_list_fonts);
defsubr (&Sinternal_face_x_get_resource);
defsubr (&Sx_family_fonts);
defsubr (&Sx_font_family_list);
-#endif /* HAVE_X_WINDOWS */
+#endif /* HAVE_WINDOW_SYSTEM */
}
HCoop / bpt / emacs.git / blobdiff