/* "Face" primitives.
- Copyright (C) 1993 Free Software Foundation.
+ Copyright (C) 1993, 1994 Free Software Foundation.
This file is part of GNU Emacs.
#include <sys/types.h>
#include <sys/stat.h>
-#include "config.h"
+#include <config.h>
#include "lisp.h"
-#ifdef HAVE_X_WINDOWS
+#ifdef HAVE_FACES
+#ifdef HAVE_X_WINDOWS
#include "xterm.h"
+#endif
+#ifdef MSDOS
+#include "dosfns.h"
+#endif
#include "buffer.h"
#include "dispextern.h"
#include "frame.h"
#include "blockinput.h"
#include "window.h"
+#include "intervals.h"
-/* Compensate for bug in Xos.h on some systems. */
+#ifdef HAVE_X_WINDOWS
+/* Compensate for bug in Xos.h on some systems, on which it requires
+ time.h. On some such systems, Xos.h tries to redefine struct
+ timeval and struct timezone if USG is #defined while it is
+ #included. */
#ifdef XOS_NEEDS_TIME_H
+
#include <time.h>
+#undef USG
+#include <X11/Xos.h>
+#define USG
#define __TIMEVAL__
-#endif
-/* These don't seem to be used. */
-#if 0
-/* Display Context for the icons */
-#include <X11/Intrinsic.h>
-#include <X11/StringDefs.h>
-#include <X11/Xmu/Drawing.h>
-#endif
+#else
#include <X11/Xos.h>
+#endif
+#endif /* HAVE_X_WINDOWS */
\f
/* An explanation of the face data structures. */
/* ========================= Face Data Structures =========================
- All lisp code uses symbols as face names.
+ Let FACE-NAME be a symbol naming a face.
- Each frame has a face_alist member (with the frame-face-alist and
- set-frame-face-alist accessors), associating the face names with
- vectors of the form
+ Let FACE-VECTOR be (assq FACE-NAME (frame-face-alist FRAME))
+ FACE-VECTOR is either nil, or a vector of the form
[face NAME ID FONT FOREGROUND BACKGROUND BACKGROUND-PIXMAP UNDERLINE-P]
where
face is the symbol `face',
BACKGROUND-PIXMAP is the name of an x bitmap filename, which we don't
use right now, and
UNDERLINE-P is non-nil if the face should be underlined.
- If any of these elements are nil, that allows the frame's parameters to
- show through.
- (lisp/faces.el maintains these association lists.)
-
- The frames' private alists hold the frame-local definitions for the
- faces. The lisp variable global-face-data contains the global
- defaults for faces. (See lisp/faces.el for this too.)
-
- In the C code, we also have a `struct face' with the elements
- `foreground', `background', `font', and `underline',
- which specify its visual appearance, and elements
- `gc' and `cached_index';
- `gc' may be an X GC which has been built for the given display
- parameters. Faces with GC's are called `display faces'. Whether
- or not a face has a GC depends on what data structure the face is
- in; we explain these more below. (See src/dispextern.h.)
-
- Each frame also has members called `faces' and `n_faces' (with the
- accessors FRAME_FACES and FRAME_N_FACES), which define an array of
- struct face pointers, indexed by face ID (element 2 of the
- vector). These are called "frame faces".
- Element 0 is the default face --- the one used for normal text.
- Element 1 is the modeline face.
- These faces have their GC's set; the rest do not.
- If faces[i] is filled in (i.e. non-zero) on one frame, then it must
- be filled in on all frames. Code assumes that face ID's can be
- used on any frame. (See src/xterm.h.)
-
- The global variables `face_vector' and `nfaces' define another
- array of struct face pointers, with their GC's set. This array
- acts as a cache of GC's to be used by all frames. The function
- `intern_face', passed a struct face *, searches face_vector for a
- struct face with the same parameters, adds a new one with a GC if
- it doesn't find one, and returns it. If you have a `struct face',
- and you want a GC for it, call intern_face on that struct, and it
- will return a `struct face *' with its GC set. The faces in
- face_vector are called `cached faces.' (See src/xfaces.c.)
-
- The `GLYPH' data type is an unsigned integer type; the bottom byte
- is a character code, and the byte above that is a face id. The
- `struct frame_glyphs' structure, used to describe frames' current
- or desired contents, is essentially a matrix of GLYPHs; the face
- ID's in a struct frame_glyphs are indices into FRAME_FACES. (See
- src/dispextern.h.)
+ If any of these elements are nil, that parameter is considered
+ unspecified; parameters from faces specified by lower-priority
+ overlays or text properties, or the parameters of the frame itself,
+ can show through. (lisp/faces.el maintains these lists.)
+
+ (assq FACE-NAME global-face-data) returns a vector describing the
+ global parameters for that face.
+
+ Let PARAM-FACE be FRAME->output_data.x->param_faces[Faref (FACE-VECTOR, 2)].
+ PARAM_FACE is a struct face whose members are the Xlib analogues of
+ the parameters in FACE-VECTOR. If an element of FACE-VECTOR is
+ nil, then the corresponding member of PARAM_FACE is FACE_DEFAULT.
+ These faces are called "parameter faces", because they're the ones
+ lisp manipulates to control what gets displayed. Elements 0 and 1
+ of FRAME->output_data.x->param_faces are special - they describe the
+ default and mode line faces. None of the faces in param_faces have
+ GC's. (See src/dispextern.h for the definition of struct face.
+ lisp/faces.el maintains the isomorphism between face_alist and
+ param_faces.)
+
+ The functions compute_char_face and compute_glyph_face find and
+ combine the parameter faces associated with overlays and text
+ properties. The resulting faces are called "computed faces"; none
+ of their members are FACE_DEFAULT; they are completely specified.
+ They then call intern_compute_face to search
+ FRAME->output_data.x->computed_faces for a matching face, add one if
+ none is found, and return the index into
+ FRAME->output_data.x->computed_faces. FRAME's glyph matrices use these
+ indices to record the faces of the matrix characters, and the X
+ display hooks consult compute_faces to decide how to display these
+ characters. Elements 0 and 1 of computed_faces always describe the
+ default and mode-line faces.
+
+ Each computed face belongs to a particular frame.
+
+ Computed faces have graphics contexts some of the time.
+ intern_face builds a GC for a specified computed face
+ if it doesn't have one already.
+ clear_face_cache clears out the GCs of all computed faces.
+ This is done from time to time so that we don't hold on to
+ lots of GCs that are no longer needed.
+
+ If a computed face has 0 as its font,
+ it is unused, and can be reused by new_computed_face.
+
+ Constraints:
+
+ Symbols naming faces must have associations on all frames; for any
+ FRAME, for all FACE-NAME, if (assq FACE-NAME (frame-face-alist
+ FRAME)) is non-nil, it must be non-nil for all frames.
+
+ Analogously, indices into param_faces must be valid on all frames;
+ if param_faces[i] is a non-zero face pointer on one frame, then it
+ must be filled in on all frames. Code assumes that face ID's can
+ be used on any frame.
Some subtleties:
- Since face_vector is just a cache --- there are no pointers into it
- from the rest of the code, and everyone accesses it through
- intern_face --- we could just free its GC's and throw the whole
- thing away without breaking anything. This gives us a simple way
- to garbage-collect old GC's nobody's using any more - we can just
- purge face_vector, and then let subsequent calls to intern_face
- refill it as needed. The function clear_face_vector performs this
- purge.
-
- We're often applying intern_face to faces in frames' local arrays -
- for example, we do this while sending GLYPHs from a struct
- frame_glyphs to X during redisplay. It would be nice to avoid
- searching all of face_vector every time we intern a frame's face.
- So, when intern_face finds a match for FACE in face_vector, it
- stores the index of the match in FACE's cached_index member, and
- checks there first next time. */
-
+ Why do we keep param_faces and computed_faces separate?
+ computed_faces contains an element for every combination of facial
+ parameters we have ever displayed. indices into param_faces have
+ to be valid on all frames. If they were the same array, then that
+ array would grow very large on all frames, because any facial
+ combination displayed on any frame would need to be a valid entry
+ on all frames. */
\f
/* Definitions and declarations. */
-/* A table of display faces. */
-struct face **face_vector;
-/* The length in use of the table. */
-int nfaces;
-/* The allocated length of the table. */
-int nfaces_allocated;
-
/* The number of face-id's in use (same for all frames). */
-int next_face_id;
+static int next_face_id;
/* The number of the face to use to indicate the region. */
-int region_face;
+static int region_face;
/* This is what appears in a slot in a face to signify that the face
does not specify that display aspect. */
#define FACE_DEFAULT (~0)
-Lisp_Object Qface, Qwindow, Qpriority;
+Lisp_Object Qface, Qmouse_face;
+Lisp_Object Qpixmap_spec_p;
-static void build_face ();
-int face_name_id_number ();
+int face_name_id_number ( /* FRAME_PTR, Lisp_Object name */ );
-struct face *intern_face ();
-static void ensure_face_ready ();
+struct face *intern_face ( /* FRAME_PTR, struct face * */ );
+static int new_computed_face ( /* FRAME_PTR, struct face * */ );
+static int intern_computed_face ( /* FRAME_PTR, struct face * */ );
+static void ensure_face_ready ( /* FRAME_PTR, int id */ );
+void recompute_basic_faces ( /* FRAME_PTR f */ );
\f
/* Allocating, copying, and comparing struct faces. */
result->background = face->background;
result->stipple = face->stipple;
result->underline = face->underline;
+ result->pixmap_h = face->pixmap_h;
+ result->pixmap_w = face->pixmap_w;
return result;
}
&& face1->underline == face2->underline);
}
\f
-/* Interning faces in the `face_vector' cache, and clearing that cache. */
-
-/* Return the unique display face corresponding to the user-level face FACE.
- If there isn't one, make one, and find a slot in the face_vector to
- put it in. */
-static struct face *
-get_cached_face (f, face)
- struct frame *f;
- struct face *face;
-{
- int i, empty = -1;
- struct face *result;
-
- /* Perhaps FACE->cached_index is valid; this could happen if FACE is
- in a frame's face list. */
- if (face->cached_index >= 0
- && face->cached_index < nfaces
- && face_eql (face_vector[face->cached_index], face))
- return face_vector[face->cached_index];
-
- /* Look for an existing display face that does the job.
- Also find an empty slot if any. */
- for (i = 0; i < nfaces; i++)
- {
- if (face_eql (face_vector[i], face))
- return face_vector[i];
- if (face_vector[i] == 0)
- empty = i;
- }
+/* Managing graphics contexts of faces. */
- /* If no empty slots, make one. */
- if (empty < 0 && nfaces == nfaces_allocated)
- {
- int newsize = nfaces + 20;
- face_vector
- = (struct face **) xrealloc (face_vector,
- newsize * sizeof (struct face *));
- nfaces_allocated = newsize;
- }
-
- if (empty < 0)
- empty = nfaces++;
-
- /* Put a new display face in the empty slot. */
- result = copy_face (face);
- face_vector[empty] = result;
-
- /* Make a graphics context for it. */
- build_face (f, result);
-
- return result;
-}
-
-/* Given a frame face, return an equivalent display face
- (one which has a graphics context). */
+#ifdef HAVE_X_WINDOWS
+/* Given a computed face, construct its graphics context if necessary. */
struct face *
intern_face (f, face)
struct frame *f;
struct face *face;
-{
- /* If it's equivalent to the default face, use that. */
- if (face_eql (face, FRAME_DEFAULT_FACE (f)))
- {
- if (!FRAME_DEFAULT_FACE (f)->gc)
- build_face (f, FRAME_DEFAULT_FACE (f));
- return FRAME_DEFAULT_FACE (f);
- }
-
- /* If it's equivalent to the mode line face, use that. */
- if (face_eql (face, FRAME_MODE_LINE_FACE (f)))
- {
- if (!FRAME_MODE_LINE_FACE (f)->gc)
- build_face (f, FRAME_MODE_LINE_FACE (f));
- return FRAME_MODE_LINE_FACE (f);
- }
-
- /* If it's not one of the frame's default faces, it shouldn't have a GC. */
- if (face->gc)
- abort ();
-
- /* Get a specialized display face. */
- return get_cached_face (f, face);
-}
-
-/* Clear out face_vector and start anew.
- This should be done from time to time just to avoid
- keeping too many graphics contexts in face_vector
- that are no longer needed. */
-
-void
-clear_face_vector ()
-{
- Lisp_Object rest;
- Display *dpy = x_current_display;
- int i;
-
- BLOCK_INPUT;
- /* Free the display faces in the face_vector. */
- for (i = 0; i < nfaces; i++)
- {
- struct face *face = face_vector[i];
- if (face->gc)
- XFreeGC (dpy, face->gc);
- xfree (face);
- }
- nfaces = 0;
-
- UNBLOCK_INPUT;
-}
-\f
-/* Allocating and freeing X resources for display faces. */
-
-/* Make a graphics context for face FACE, which is on frame F,
- if that can be done. */
-static void
-build_face (f, face)
- struct frame *f;
- struct face *face;
{
GC gc;
XGCValues xgcv;
unsigned long mask;
+ if (face->gc)
+ return face;
+
BLOCK_INPUT;
if (face->foreground != FACE_DEFAULT)
xgcv.foreground = face->foreground;
else
- xgcv.foreground = f->display.x->foreground_pixel;
+ xgcv.foreground = f->output_data.x->foreground_pixel;
if (face->background != FACE_DEFAULT)
xgcv.background = face->background;
else
- xgcv.background = f->display.x->background_pixel;
+ xgcv.background = f->output_data.x->background_pixel;
- if (face->font && (int) face->font != FACE_DEFAULT)
+ if (face->font && face->font != (XFontStruct *) FACE_DEFAULT)
xgcv.font = face->font->fid;
else
- xgcv.font = f->display.x->font->fid;
+ xgcv.font = f->output_data.x->font->fid;
xgcv.graphics_exposures = 0;
mask = GCForeground | GCBackground | GCFont | GCGraphicsExposures;
- gc = XCreateGC (x_current_display, FRAME_X_WINDOW (f),
- mask, &xgcv);
-
-#if 0
if (face->stipple && face->stipple != FACE_DEFAULT)
- XSetStipple (x_current_display, gc, face->stipple);
-#endif
+ {
+ xgcv.fill_style = FillStippled;
+ xgcv.stipple = x_bitmap_pixmap (f, face->stipple);
+ mask |= GCFillStyle | GCStipple;
+ }
+
+ gc = XCreateGC (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+ mask, &xgcv);
face->gc = gc;
UNBLOCK_INPUT;
+
+ return face;
+}
+
+/* Clear out all graphics contexts for all computed faces
+ except for the default and mode line faces.
+ This should be done from time to time just to avoid
+ keeping too many graphics contexts that are no longer needed. */
+
+void
+clear_face_cache ()
+{
+ Lisp_Object tail, frame;
+
+ BLOCK_INPUT;
+ FOR_EACH_FRAME (tail, frame)
+ {
+ FRAME_PTR f = XFRAME (frame);
+ if (FRAME_X_P (f))
+ {
+ int i;
+ Display *dpy = FRAME_X_DISPLAY (f);
+
+ for (i = 2; i < FRAME_N_COMPUTED_FACES (f); i++)
+ {
+ struct face *face = FRAME_COMPUTED_FACES (f) [i];
+ if (face->gc)
+ XFreeGC (dpy, face->gc);
+ face->gc = 0;
+ }
+ }
+ }
+
+ UNBLOCK_INPUT;
}
+\f
+/* Allocating, freeing, and duplicating fonts, colors, and pixmaps.
-/* Allocating, freeing, and duplicating fonts, colors, and pixmaps. */
+ These functions operate on param faces only.
+ Computed faces get their fonts, colors and pixmaps
+ by merging param faces. */
static XFontStruct *
load_font (f, name)
CHECK_STRING (name, 0);
BLOCK_INPUT;
- font = XLoadQueryFont (x_current_display, (char *) XSTRING (name)->data);
+ font = XLoadQueryFont (FRAME_X_DISPLAY (f), (char *) XSTRING (name)->data);
UNBLOCK_INPUT;
if (! font)
struct frame *f;
XFontStruct *font;
{
+ int len = FRAME_N_COMPUTED_FACES (f);
+ int i;
+
if (!font || font == ((XFontStruct *) FACE_DEFAULT))
return;
BLOCK_INPUT;
- XFreeFont (x_current_display, font);
+ /* Invalidate any computed faces which use this font,
+ and free their GC's if they have any. */
+ for (i = 2; i < len; i++)
+ {
+ struct face *face = FRAME_COMPUTED_FACES (f)[i];
+ if (face->font == font)
+ {
+ Display *dpy = FRAME_X_DISPLAY (f);
+ if (face->gc)
+ XFreeGC (dpy, face->gc);
+ face->gc = 0;
+ /* This marks the computed face as available to reuse. */
+ face->font = 0;
+ }
+ }
+
+ XFreeFont (FRAME_X_DISPLAY (f), font);
UNBLOCK_INPUT;
}
struct frame *f;
Lisp_Object name;
{
- Display *dpy = x_current_display;
- Colormap cmap;
XColor color;
int result;
if (NILP (name))
return FACE_DEFAULT;
- cmap = DefaultColormapOfScreen (DefaultScreenOfDisplay (x_current_display));
-
CHECK_STRING (name, 0);
- BLOCK_INPUT;
- result = XParseColor (dpy, cmap, (char *) XSTRING (name)->data, &color);
- UNBLOCK_INPUT;
+ /* if the colormap is full, defined_color will return a best match
+ to the values in an an existing cell. */
+ result = defined_color(f, (char *) XSTRING (name)->data, &color, 1);
if (! result)
Fsignal (Qerror, Fcons (build_string ("undefined color"),
Fcons (name, Qnil)));
- BLOCK_INPUT;
- result = XAllocColor (dpy, cmap, &color);
- UNBLOCK_INPUT;
- if (! result)
- Fsignal (Qerror, Fcons (build_string ("X server cannot allocate color"),
- Fcons (name, Qnil)));
return (unsigned long) color.pixel;
}
struct frame *f;
unsigned long pixel;
{
- /* Since faces get built by copying parameters from other faces, the
- allocation counts for the colors get all screwed up. I don't see
- any solution that will take less than 10 minutes, and it's better
- to have a color leak than a crash, so I'm just dyking this out.
- This isn't really a color leak, anyway - if we ask for it again,
- we'll get the same pixel. */
-#if 0
Colormap cmap;
- Display *dpy = x_current_display;
+ Display *dpy = FRAME_X_DISPLAY (f);
+ int class = FRAME_X_DISPLAY_INFO (f)->visual->class;
+
if (pixel == FACE_DEFAULT
- || pixel == BLACK_PIX_DEFAULT
- || pixel == WHITE_PIX_DEFAULT)
+ || pixel == BLACK_PIX_DEFAULT (f)
+ || pixel == WHITE_PIX_DEFAULT (f))
return;
- cmap = DefaultColormapOfScreen (DefaultScreenOfDisplay (x_current_display));
+ cmap = DefaultColormapOfScreen (DefaultScreenOfDisplay (dpy));
+
+ /* 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))
+ {
+ int len = FRAME_N_COMPUTED_FACES (f);
+ int i;
+
+ BLOCK_INPUT;
+ /* Invalidate any computed faces which use this color,
+ and free their GC's if they have any. */
+ for (i = 2; i < len; i++)
+ {
+ struct face *face = FRAME_COMPUTED_FACES (f)[i];
+ if (face->foreground == pixel
+ || face->background == pixel)
+ {
+ Display *dpy = FRAME_X_DISPLAY (f);
+ if (face->gc)
+ XFreeGC (dpy, face->gc);
+ face->gc = 0;
+ /* This marks the computed face as available to reuse. */
+ face->font = 0;
+ }
+ }
+
+ XFreeColors (dpy, cmap, &pixel, 1, (unsigned long)0);
+ UNBLOCK_INPUT;
+ }
+}
+
+DEFUN ("pixmap-spec-p", Fpixmap_spec_p, Spixmap_spec_p, 1, 1, 0,
+ "Return t if OBJECT is a valid pixmap specification.")
+ (object)
+ Lisp_Object object;
+{
+ Lisp_Object height, width;
+
+ return ((STRINGP (object)
+ || (CONSP (object)
+ && CONSP (XCONS (object)->cdr)
+ && CONSP (XCONS (XCONS (object)->cdr)->cdr)
+ && NILP (XCONS (XCONS (XCONS (object)->cdr)->cdr)->cdr)
+ && (width = XCONS (object)->car, INTEGERP (width))
+ && (height = XCONS (XCONS (object)->cdr)->car, INTEGERP (height))
+ && STRINGP (XCONS (XCONS (XCONS (object)->cdr)->cdr)->car)
+ && XINT (width) > 0
+ && XINT (height) > 0
+ /* The string must have enough bits for width * height. */
+ && ((XSTRING (XCONS (XCONS (XCONS (object)->cdr)->cdr)->car)->size
+ * (BITS_PER_INT / sizeof (int)))
+ >= XFASTINT (width) * XFASTINT (height))))
+ ? Qt : Qnil);
+}
+
+/* Load a bitmap according to NAME (which is either a file name
+ or a pixmap spec). Return the bitmap_id (see xfns.c)
+ or get an error if NAME is invalid.
+
+ Store the bitmap width in *W_PTR and height in *H_PTR. */
+
+static long
+load_pixmap (f, name, w_ptr, h_ptr)
+ FRAME_PTR f;
+ Lisp_Object name;
+ unsigned int *w_ptr, *h_ptr;
+{
+ int bitmap_id;
+ Lisp_Object tem;
+
+ if (NILP (name))
+ return FACE_DEFAULT;
+
+ tem = Fpixmap_spec_p (name);
+ if (NILP (tem))
+ wrong_type_argument (Qpixmap_spec_p, name);
+
BLOCK_INPUT;
- XFreeColors (dpy, cmap, &pixel, 1, 0);
+
+ if (CONSP (name))
+ {
+ /* Decode a bitmap spec into a bitmap. */
+
+ int h, w;
+ Lisp_Object bits;
+
+ w = XINT (Fcar (name));
+ h = XINT (Fcar (Fcdr (name)));
+ bits = Fcar (Fcdr (Fcdr (name)));
+
+ bitmap_id = x_create_bitmap_from_data (f, XSTRING (bits)->data,
+ w, h);
+ }
+ else
+ {
+ /* It must be a string -- a file name. */
+ bitmap_id = x_create_bitmap_from_file (f, name);
+ }
UNBLOCK_INPUT;
-#endif
+
+ if (bitmap_id < 0)
+ Fsignal (Qerror, Fcons (build_string ("invalid or undefined bitmap"),
+ Fcons (name, Qnil)));
+
+ *w_ptr = x_bitmap_width (f, bitmap_id);
+ *h_ptr = x_bitmap_height (f, bitmap_id);
+
+ return bitmap_id;
+}
+
+#else /* !HAVE_X_WINDOWS */
+
+/* Stubs for MSDOS when not under X. */
+
+struct face *
+intern_face (f, face)
+ struct frame *f;
+ struct face *face;
+{
+ return face;
+}
+
+void
+clear_face_cache ()
+{
+ /* No action. */
}
+
+#ifdef MSDOS
+unsigned long
+load_color (f, name)
+ FRAME_PTR f;
+ Lisp_Object name;
+{
+ Lisp_Object result;
+
+ if (NILP (name))
+ return FACE_DEFAULT;
+
+ CHECK_STRING (name, 0);
+ result = call1 (Qmsdos_color_translate, name);
+ if (INTEGERP (result))
+ return XINT (result);
+ else
+ Fsignal (Qerror, Fcons (build_string ("undefined color"),
+ Fcons (name, Qnil)));
+}
+#endif
+#endif /* !HAVE_X_WINDOWS */
+
\f
-/* Initializing face arrays for frames. */
+/* Managing parameter face arrays for frames. */
void
init_frame_faces (f)
ensure_face_ready (f, 0);
ensure_face_ready (f, 1);
+ FRAME_N_COMPUTED_FACES (f) = 0;
+ FRAME_SIZE_COMPUTED_FACES (f) = 0;
+
+ new_computed_face (f, FRAME_PARAM_FACES (f)[0]);
+ new_computed_face (f, FRAME_PARAM_FACES (f)[1]);
recompute_basic_faces (f);
+#ifdef MULTI_FRAME
/* Find another X frame. */
{
Lisp_Object tail, frame, result;
if (FRAMEP (result))
{
int i;
- int n_faces = XFRAME (result)->display.x->n_faces;
- struct face **faces = XFRAME (result)->display.x->faces;
+ int n_faces = FRAME_N_PARAM_FACES (XFRAME (result));
+ struct face **faces = FRAME_PARAM_FACES (XFRAME (result));
for (i = 2; i < n_faces; i++)
if (faces[i])
ensure_face_ready (f, i);
}
}
+#endif /* MULTI_FRAME */
}
/* Called from Fdelete_frame. */
+
void
free_frame_faces (f)
struct frame *f;
{
- Display *dpy = x_current_display;
+ Display *dpy = FRAME_X_DISPLAY (f);
int i;
BLOCK_INPUT;
- for (i = 0; i < FRAME_N_FACES (f); i++)
+ for (i = 0; i < FRAME_N_PARAM_FACES (f); i++)
{
- struct face *face = FRAME_FACES (f) [i];
+ struct face *face = FRAME_PARAM_FACES (f) [i];
+ if (face)
+ {
+ unload_font (f, face->font);
+ unload_color (f, face->foreground);
+ unload_color (f, face->background);
+ x_destroy_bitmap (f, face->stipple);
+ xfree (face);
+ }
+ }
+ xfree (FRAME_PARAM_FACES (f));
+ FRAME_PARAM_FACES (f) = 0;
+ FRAME_N_PARAM_FACES (f) = 0;
+
+ /* All faces in FRAME_COMPUTED_FACES use resources copied from
+ FRAME_PARAM_FACES; we can free them without fuss.
+ But we do free the GCs and the face objects themselves. */
+ for (i = 0; i < FRAME_N_COMPUTED_FACES (f); i++)
+ {
+ struct face *face = FRAME_COMPUTED_FACES (f) [i];
if (face)
{
if (face->gc)
XFreeGC (dpy, face->gc);
- if (! face->copy)
- {
- unload_font (f, face->font);
- unload_color (f, face->foreground);
- unload_color (f, face->background);
-#if 0
- unload_pixmap (f, face->stipple);
-#endif
- }
xfree (face);
}
}
- xfree (FRAME_FACES (f));
- FRAME_FACES (f) = 0;
- FRAME_N_FACES (f) = 0;
+ xfree (FRAME_COMPUTED_FACES (f));
+ FRAME_COMPUTED_FACES (f) = 0;
+ FRAME_N_COMPUTED_FACES (f) = 0;
UNBLOCK_INPUT;
}
\f
/* Interning faces in a frame's face array. */
-/* Find a match for NEW_FACE in a FRAME's face array, and add it if we don't
- find one. */
static int
-intern_frame_face (frame, new_face)
- struct frame *frame;
+new_computed_face (f, new_face)
+ struct frame *f;
struct face *new_face;
{
- int len = FRAME_N_FACES (frame);
+ int len = FRAME_N_COMPUTED_FACES (f);
int i;
- /* Search for a face already on FRAME equivalent to FACE. */
+ /* Search for an unused computed face in the middle of the table. */
for (i = 0; i < len; i++)
{
- struct face *frame_face = FRAME_FACES (frame)[i];
-
- if (frame_face && face_eql (new_face, frame_face))
- return i;
+ struct face *face = FRAME_COMPUTED_FACES (f)[i];
+ if (face->font == 0)
+ {
+ FRAME_COMPUTED_FACES (f)[i] = copy_face (new_face);
+ return i;
+ }
}
- /* We didn't find one; add a new one. */
- i = next_face_id++;
-
- ensure_face_ready (frame, i);
- bcopy (new_face, FRAME_FACES (frame)[i], sizeof (*new_face));
- FRAME_FACES (frame)[i]->copy = 1;
+ if (i >= FRAME_SIZE_COMPUTED_FACES (f))
+ {
+ int new_size = i + 32;
+
+ FRAME_COMPUTED_FACES (f)
+ = (struct face **) (FRAME_SIZE_COMPUTED_FACES (f) == 0
+ ? xmalloc (new_size * sizeof (struct face *))
+ : xrealloc (FRAME_COMPUTED_FACES (f),
+ new_size * sizeof (struct face *)));
+ FRAME_SIZE_COMPUTED_FACES (f) = new_size;
+ }
+ i = FRAME_N_COMPUTED_FACES (f)++;
+ FRAME_COMPUTED_FACES (f)[i] = copy_face (new_face);
return i;
}
-/* Make face id ID valid on frame F. */
+
+/* Find a match for NEW_FACE in a FRAME's computed face array, and add
+ it if we don't find one. */
+static int
+intern_computed_face (f, new_face)
+ struct frame *f;
+ struct face *new_face;
+{
+ int len = FRAME_N_COMPUTED_FACES (f);
+ int i;
+
+ /* Search for a computed face already on F equivalent to FACE. */
+ for (i = 0; i < len; i++)
+ {
+ if (! FRAME_COMPUTED_FACES (f)[i])
+ abort ();
+ if (face_eql (new_face, FRAME_COMPUTED_FACES (f)[i]))
+ return i;
+ }
+
+ /* We didn't find one; add a new one. */
+ return new_computed_face (f, new_face);
+}
+
+/* Make parameter face id ID valid on frame F. */
static void
ensure_face_ready (f, id)
struct frame *f;
int id;
{
- if (FRAME_N_FACES (f) <= id)
+ if (FRAME_N_PARAM_FACES (f) <= id)
{
int n = id + 10;
int i;
- if (!FRAME_N_FACES (f))
- FRAME_FACES (f)
+ if (!FRAME_N_PARAM_FACES (f))
+ FRAME_PARAM_FACES (f)
= (struct face **) xmalloc (sizeof (struct face *) * n);
else
- FRAME_FACES (f)
- = (struct face **) xrealloc (FRAME_FACES (f),
+ FRAME_PARAM_FACES (f)
+ = (struct face **) xrealloc (FRAME_PARAM_FACES (f),
sizeof (struct face *) * n);
- bzero (FRAME_FACES (f) + FRAME_N_FACES (f),
- (n - FRAME_N_FACES (f)) * sizeof (struct face *));
- FRAME_N_FACES (f) = n;
+ bzero (FRAME_PARAM_FACES (f) + FRAME_N_PARAM_FACES (f),
+ (n - FRAME_N_PARAM_FACES (f)) * sizeof (struct face *));
+ FRAME_N_PARAM_FACES (f) = n;
}
- if (FRAME_FACES (f) [id] == 0)
- FRAME_FACES (f) [id] = allocate_face ();
+ if (FRAME_PARAM_FACES (f) [id] == 0)
+ FRAME_PARAM_FACES (f) [id] = allocate_face ();
}
\f
-/* Computing faces appropriate for a given piece of text in a buffer. */
-
-/* Return non-zero if FONT1 and FONT2 have the same size bounding box.
+#ifdef HAVE_X_WINDOWS
+/* Return non-zero if FONT1 and FONT2 have the same width.
+ We do not check the height, because we can now deal with
+ different heights.
We assume that they're both character-cell fonts. */
+
int
same_size_fonts (font1, font2)
XFontStruct *font1, *font2;
XCharStruct *bounds2 = &font2->min_bounds;
return (bounds1->width == bounds2->width);
-/* Checking the following caused bad results in some cases
- when fonts that should be the same size
- actually have very slightly different size.
- It is possible that this reintroduces the bug whereby line positions
- were not right. However, the right way to fix that is to change xterm.c
- so that the vertical positions of lines
- depend only on the height of the frame's font.
- && bounds1->ascent == bounds2->ascent
- && bounds1->descent == bounds2->descent); */
}
+/* Update the line_height of frame F according to the biggest font in
+ any face. Return nonzero if if line_height changes. */
+
+int
+frame_update_line_height (f)
+ FRAME_PTR f;
+{
+ int i;
+ int biggest = FONT_HEIGHT (f->output_data.x->font);
+
+ for (i = 0; i < f->output_data.x->n_param_faces; i++)
+ if (f->output_data.x->param_faces[i] != 0
+ && f->output_data.x->param_faces[i]->font != (XFontStruct *) FACE_DEFAULT)
+ {
+ int height = FONT_HEIGHT (f->output_data.x->param_faces[i]->font);
+ if (height > biggest)
+ biggest = height;
+ }
+
+ if (biggest == f->output_data.x->line_height)
+ return 0;
+
+ f->output_data.x->line_height = biggest;
+ return 1;
+}
+#endif /* not HAVE_X_WINDOWS */
+\f
/* Modify face TO by copying from FROM all properties which have
nondefault settings. */
+
static void
merge_faces (from, to)
struct face *from, *to;
{
- /* Only merge the font if it's the same size as the base font. */
+ /* Only merge the font if it's the same width as the base font.
+ Otherwise ignore it, since we can't handle it properly. */
if (from->font != (XFontStruct *) FACE_DEFAULT
&& same_size_fonts (from->font, to->font))
to->font = from->font;
if (from->background != FACE_DEFAULT)
to->background = from->background;
if (from->stipple != FACE_DEFAULT)
- to->stipple = from->stipple;
+ {
+ to->stipple = from->stipple;
+ to->pixmap_h = from->pixmap_h;
+ to->pixmap_w = from->pixmap_w;
+ }
if (from->underline)
to->underline = from->underline;
}
/* Set up the basic set of facial parameters, based on the frame's
data; all faces are deltas applied to this. */
+
static void
compute_base_face (f, face)
FRAME_PTR f;
struct face *face;
{
- struct x_display *d = f->display.x;
-
face->gc = 0;
- face->foreground = d->foreground_pixel;
- face->background = d->background_pixel;
- face->font = d->font;
+ face->foreground = FRAME_FOREGROUND_PIXEL (f);
+ face->background = FRAME_BACKGROUND_PIXEL (f);
+ face->font = FRAME_FONT (f);
face->stipple = 0;
face->underline = 0;
-
- /* Avoid a face comparison by making this invalid. */
- face->cached_index = -1;
}
+/* Return the face ID to use to display a special glyph which selects
+ FACE_CODE as the face ID, assuming that ordinarily the face would
+ be CURRENT_FACE. F is the frame. */
-struct sortvec
+int
+compute_glyph_face (f, face_code, current_face)
+ struct frame *f;
+ int face_code, current_face;
{
- Lisp_Object overlay;
- int beg, end;
- int priority;
-};
+ struct face face;
-static int
-sort_overlays (s1, s2)
- struct sortvec *s1, *s2;
-{
- if (s1->priority != s2->priority)
- return s1->priority - s2->priority;
- if (s1->beg != s2->beg)
- return s1->beg - s2->beg;
- if (s1->end != s2->end)
- return s2->end - s1->end;
- return 0;
+ face = *FRAME_COMPUTED_FACES (f)[current_face];
+
+ if (face_code >= 0 && face_code < FRAME_N_PARAM_FACES (f)
+ && FRAME_PARAM_FACES (f) [face_code] != 0)
+ merge_faces (FRAME_PARAM_FACES (f) [face_code], &face);
+
+ return intern_computed_face (f, &face);
}
+/* Return the face ID to use to display a special glyph which selects
+ FACE_CODE as the face ID, assuming that ordinarily the face would
+ be CURRENT_FACE. F is the frame. */
+
+int
+compute_glyph_face_1 (f, face_name, current_face)
+ struct frame *f;
+ Lisp_Object face_name;
+ int current_face;
+{
+ struct face face;
+
+ face = *FRAME_COMPUTED_FACES (f)[current_face];
+
+ if (!NILP (face_name))
+ {
+ int facecode = face_name_id_number (f, face_name);
+ if (facecode >= 0 && facecode < FRAME_N_PARAM_FACES (f)
+ && FRAME_PARAM_FACES (f) [facecode] != 0)
+ merge_faces (FRAME_PARAM_FACES (f) [facecode], &face);
+ }
+
+ return intern_computed_face (f, &face);
+}
+\f
/* Return the face ID associated with a buffer position POS.
Store into *ENDPTR the position at which a different face is needed.
This does not take account of glyphs that specify their own face codes.
F is the frame in use for display, and W is a window displaying
the current buffer.
- REGION_BEG, REGION_END delimit the region, so it can be highlighted. */
+ REGION_BEG, REGION_END delimit the region, so it can be highlighted.
+
+ LIMIT is a position not to scan beyond. That is to limit
+ the time this function can take.
+
+ If MOUSE is nonzero, use the character's mouse-face, not its face. */
int
-compute_char_face (f, w, pos, region_beg, region_end, endptr)
+compute_char_face (f, w, pos, region_beg, region_end, endptr, limit, mouse)
struct frame *f;
struct window *w;
int pos;
int region_beg, region_end;
int *endptr;
+ int limit;
+ int mouse;
{
struct face face;
Lisp_Object prop, position;
int i, j, noverlays;
int facecode;
Lisp_Object *overlay_vec;
- struct sortvec *sortvec;
Lisp_Object frame;
int endpos;
+ Lisp_Object propname;
/* 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. */
if (XBUFFER (w->buffer) != current_buffer)
abort ();
- XSET (frame, Lisp_Frame, f);
+ XSETFRAME (frame, f);
endpos = ZV;
if (pos < region_beg && region_beg < endpos)
endpos = region_beg;
- XFASTINT (position) = pos;
- prop = Fget_text_property (position, Qface, w->buffer);
+ XSETFASTINT (position, pos);
+
+ if (mouse)
+ propname = Qmouse_face;
+ else
+ propname = Qface;
+
+ prop = Fget_text_property (position, propname, w->buffer);
+
{
- Lisp_Object end;
+ Lisp_Object limit1, end;
- end = Fnext_single_property_change (position, Qface, w->buffer);
+ XSETFASTINT (limit1, (limit < endpos ? limit : endpos));
+ end = Fnext_single_property_change (position, propname, w->buffer, limit1);
if (INTEGERP (end))
endpos = XINT (end);
}
len = 40;
overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object));
- noverlays = overlays_at (pos, 0, &overlay_vec, &len, &next_overlay);
+ noverlays = overlays_at (pos, 0, &overlay_vec, &len,
+ &next_overlay, (int *) 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);
+ noverlays = overlays_at (pos, 0, &overlay_vec, &len,
+ &next_overlay, (int *) 0);
}
if (next_overlay < endpos)
compute_base_face (f, &face);
- if (!NILP (prop))
+ if (CONSP (prop))
{
- facecode = face_name_id_number (f, prop);
- if (facecode >= 0 && facecode < FRAME_N_FACES (f)
- && FRAME_FACES (f) [facecode] != 0)
- merge_faces (FRAME_FACES (f) [facecode], &face);
- }
+ /* We have a list of faces, merge them in reverse order */
+ Lisp_Object length;
+ int len;
+ Lisp_Object *faces;
- /* Put the valid and relevant overlays into sortvec. */
- sortvec = (struct sortvec *) alloca (noverlays * sizeof (struct sortvec));
+ length = Fsafe_length (prop);
+ len = XFASTINT (length);
- for (i = 0, j = 0; i < noverlays; i++)
- {
- Lisp_Object overlay = overlay_vec[i];
-
- if (OVERLAY_VALID (overlay)
- && OVERLAY_POSITION (OVERLAY_START (overlay)) > 0
- && OVERLAY_POSITION (OVERLAY_END (overlay)) > 0)
+ /* Put them into an array */
+ faces = (Lisp_Object *) alloca (len * sizeof (Lisp_Object));
+ for (j = 0; j < len; j++)
{
- Lisp_Object window;
- window = Foverlay_get (overlay, Qwindow);
-
- /* Also ignore overlays limited to one window
- if it's not the window we are using. */
- if (XTYPE (window) != Lisp_Window
- || XWINDOW (window) == w)
- {
- Lisp_Object tem;
-
- /* This overlay is good and counts:
- put it in sortvec. */
- sortvec[j].overlay = overlay;
- sortvec[j].beg = OVERLAY_POSITION (OVERLAY_START (overlay));
- sortvec[j].end = OVERLAY_POSITION (OVERLAY_END (overlay));
- tem = Foverlay_get (overlay, Qpriority);
- if (INTEGERP (tem))
- sortvec[j].priority = XINT (tem);
- else
- sortvec[j].priority = 0;
- j++;
- }
+ faces[j] = Fcar (prop);
+ prop = Fcdr (prop);
+ }
+ /* So that we can merge them in the reverse order */
+ for (j = len - 1; j >= 0; j--)
+ {
+ facecode = face_name_id_number (f, faces[j]);
+ if (facecode >= 0 && facecode < FRAME_N_PARAM_FACES (f)
+ && FRAME_PARAM_FACES (f) [facecode] != 0)
+ merge_faces (FRAME_PARAM_FACES (f) [facecode], &face);
}
}
- noverlays = j;
-
- /* Sort the overlays into the proper order: increasing priority. */
+ else if (!NILP (prop))
+ {
+ facecode = face_name_id_number (f, prop);
+ if (facecode >= 0 && facecode < FRAME_N_PARAM_FACES (f)
+ && FRAME_PARAM_FACES (f) [facecode] != 0)
+ merge_faces (FRAME_PARAM_FACES (f) [facecode], &face);
+ }
- if (noverlays > 1)
- qsort (sortvec, noverlays, sizeof (struct sortvec), sort_overlays);
+ noverlays = sort_overlays (overlay_vec, noverlays, w);
/* Now merge the overlay data in that order. */
for (i = 0; i < noverlays; i++)
{
- prop = Foverlay_get (sortvec[i].overlay, Qface);
- if (!NILP (prop))
+ prop = Foverlay_get (overlay_vec[i], propname);
+ if (CONSP (prop))
+ {
+ /* We have a list of faces, merge them in reverse order */
+ Lisp_Object length;
+ int len;
+ Lisp_Object *faces;
+
+ length = Fsafe_length (prop);
+ len = XFASTINT (length);
+
+ /* Put them into an array */
+ faces = (Lisp_Object *) alloca (len * sizeof (Lisp_Object));
+ for (j = 0; j < len; j++)
+ {
+ faces[j] = Fcar (prop);
+ prop = Fcdr (prop);
+ }
+ /* So that we can merge them in the reverse order */
+ for (j = len - 1; j >= 0; j--)
+ {
+ facecode = face_name_id_number (f, faces[j]);
+ if (facecode >= 0 && facecode < FRAME_N_PARAM_FACES (f)
+ && FRAME_PARAM_FACES (f) [facecode] != 0)
+ merge_faces (FRAME_PARAM_FACES (f) [facecode], &face);
+ }
+ }
+ else if (!NILP (prop))
{
Lisp_Object oend;
int oendpos;
facecode = face_name_id_number (f, prop);
- if (facecode >= 0 && facecode < FRAME_N_FACES (f)
- && FRAME_FACES (f) [facecode] != 0)
- merge_faces (FRAME_FACES (f) [facecode], &face);
+ if (facecode >= 0 && facecode < FRAME_N_PARAM_FACES (f)
+ && FRAME_PARAM_FACES (f) [facecode] != 0)
+ merge_faces (FRAME_PARAM_FACES (f)[facecode], &face);
- oend = OVERLAY_END (sortvec[i].overlay);
+ oend = OVERLAY_END (overlay_vec[i]);
oendpos = OVERLAY_POSITION (oend);
if (oendpos < endpos)
endpos = oendpos;
if (region_end < endpos)
endpos = region_end;
if (region_face >= 0 && region_face < next_face_id)
- merge_faces (FRAME_FACES (f) [region_face], &face);
+ merge_faces (FRAME_PARAM_FACES (f)[region_face], &face);
}
*endptr = endpos;
- return intern_frame_face (f, &face);
-}
-
-/* Return the face ID to use to display a special glyph which selects
- FACE_CODE as the face ID, assuming that ordinarily the face would
- be BASIC_FACE. F is the frame. */
-int
-compute_glyph_face (f, face_code)
- struct frame *f;
- int face_code;
-{
- struct face face;
-
- compute_base_face (f, &face);
-
- if (face_code >= 0 && face_code < FRAME_N_FACES (f)
- && FRAME_FACES (f) [face_code] != 0)
- merge_faces (FRAME_FACES (f) [face_code], &face);
-
- return intern_frame_face (f, &face);
+ return intern_computed_face (f, &face);
}
-
-
+\f
/* Recompute the GC's for the default and modeline faces.
We call this after changing frame parameters on which those GC's
depend. */
+
void
recompute_basic_faces (f)
FRAME_PTR f;
{
/* If the frame's faces haven't been initialized yet, don't worry about
this stuff. */
- if (FRAME_N_FACES (f) < 2)
+ if (FRAME_N_PARAM_FACES (f) < 2)
return;
BLOCK_INPUT;
if (FRAME_DEFAULT_FACE (f)->gc)
- XFreeGC (x_current_display, FRAME_DEFAULT_FACE (f)->gc);
- build_face (f, FRAME_DEFAULT_FACE (f));
-
+ XFreeGC (FRAME_X_DISPLAY (f), FRAME_DEFAULT_FACE (f)->gc);
if (FRAME_MODE_LINE_FACE (f)->gc)
- XFreeGC (x_current_display, FRAME_MODE_LINE_FACE (f)->gc);
- build_face (f, FRAME_MODE_LINE_FACE (f));
+ XFreeGC (FRAME_X_DISPLAY (f), FRAME_MODE_LINE_FACE (f)->gc);
+
+ compute_base_face (f, FRAME_DEFAULT_FACE (f));
+ compute_base_face (f, FRAME_MODE_LINE_FACE (f));
+
+ merge_faces (FRAME_DEFAULT_PARAM_FACE (f), FRAME_DEFAULT_FACE (f));
+ merge_faces (FRAME_MODE_LINE_PARAM_FACE (f), FRAME_MODE_LINE_FACE (f));
+
+ intern_face (f, FRAME_DEFAULT_FACE (f));
+ intern_face (f, FRAME_MODE_LINE_FACE (f));
UNBLOCK_INPUT;
}
(face_id)
Lisp_Object face_id;
{
- Lisp_Object rest;
+ Lisp_Object rest, frame;
int id = XINT (face_id);
CHECK_NUMBER (face_id, 0);
if (id < 0 || id >= next_face_id)
error ("Face id out of range");
- for (rest = Vframe_list; !NILP (rest); rest = XCONS (rest)->cdr)
+ FOR_EACH_FRAME (rest, frame)
{
- struct frame *f = XFRAME (XCONS (rest)->car);
- if (FRAME_X_P (f))
- ensure_face_ready (f, id);
+ if (FRAME_X_P (XFRAME (frame)))
+ ensure_face_ready (XFRAME (frame), id);
}
return Qnil;
}
struct frame *f;
int magic_p;
int id;
+ int garbaged = 0;
CHECK_FRAME (frame, 0);
CHECK_NUMBER (face_id, 0);
error ("Face id out of range");
if (! FRAME_X_P (f))
- return;
+ return Qnil;
ensure_face_ready (f, id);
- face = FRAME_FACES (f) [XFASTINT (face_id)];
+ face = FRAME_PARAM_FACES (f) [XFASTINT (face_id)];
if (EQ (attr_name, intern ("font")))
{
+#if defined (MSDOS) && !defined (HAVE_X_WINDOWS)
+ /* The one and only font. Must *not* be zero (which
+ is taken to mean an unused face nowadays). */
+ face->font = (XFontStruct *)1 ;
+#else
XFontStruct *font = load_font (f, attr_value);
- if (face->font != f->display.x->font)
+ if (face->font != f->output_data.x->font)
unload_font (f, face->font);
face->font = font;
+ if (frame_update_line_height (f))
+ x_set_window_size (f, 0, f->width, f->height);
+ /* Must clear cache, since it might contain the font
+ we just got rid of. */
+ garbaged = 1;
+#endif
}
else if (EQ (attr_name, intern ("foreground")))
{
unsigned long new_color = load_color (f, attr_value);
unload_color (f, face->foreground);
face->foreground = new_color;
+ garbaged = 1;
}
else if (EQ (attr_name, intern ("background")))
{
unsigned long new_color = load_color (f, attr_value);
unload_color (f, face->background);
+#if defined (MSDOS) && !defined (HAVE_X_WINDOWS)
+ new_color &= ~8; /* Bright would give blinking characters. */
+#endif
face->background = new_color;
+ garbaged = 1;
}
-#if 0
else if (EQ (attr_name, intern ("background-pixmap")))
{
- unsigned int w, h, d;
- unsigned long new_pixmap = load_pixmap (f, attr_value, &w, &h, &d, 0);
- unload_pixmap (f, face->stipple);
- if (NILP (attr_value))
- new_pixmap = 0;
+ unsigned int w, h;
+ unsigned long new_pixmap = load_pixmap (f, attr_value, &w, &h);
+ x_destroy_bitmap (f, face->stipple);
face->stipple = new_pixmap;
face->pixmap_w = w;
face->pixmap_h = h;
-/* face->pixmap_depth = d; */
+ garbaged = 1;
}
-#endif /* 0 */
else if (EQ (attr_name, intern ("underline")))
{
int new = !NILP (attr_value);
else
error ("unknown face attribute");
- if (id == 0)
- {
- BLOCK_INPUT;
- if (FRAME_DEFAULT_FACE (f)->gc != 0)
- XFreeGC (x_current_display, FRAME_DEFAULT_FACE (f)->gc);
- build_face (f, FRAME_DEFAULT_FACE (f));
- UNBLOCK_INPUT;
- }
-
- if (id == 1)
- {
- BLOCK_INPUT;
- if (FRAME_MODE_LINE_FACE (f)->gc != 0)
- XFreeGC (x_current_display, FRAME_MODE_LINE_FACE (f)->gc);
- build_face (f, FRAME_MODE_LINE_FACE (f));
- UNBLOCK_INPUT;
- }
-
- /* If we're modifying either of the frame's display faces, that
- means that we're changing the parameters of a fixed face code;
- since the color/font/whatever is changed but the face ID hasn't,
- redisplay won't know to redraw the affected sections. Give it a
- kick. */
if (id == 0 || id == 1)
+ recompute_basic_faces (f);
+
+ /* We must redraw the frame whenever any face font or color changes,
+ because it's possible that a merged (display) face
+ contains the font or color we just replaced.
+ And we must inhibit any Expose events until the redraw is done,
+ since they would try to use the invalid display faces. */
+ if (garbaged)
SET_FRAME_GARBAGED (f);
- else
- /* Otherwise, it's enough to tell it to redisplay the text. */
- windows_or_buffers_changed = 1;
return Qnil;
}
{
Lisp_Object tem;
- tem = Fcdr (Fassq (name, f->face_alist));
+ tem = Fcdr (assq_no_quit (name, f->face_alist));
if (NILP (tem))
return 0;
CHECK_VECTOR (tem, 0);
void
syms_of_xfaces ()
{
- Qwindow = intern ("window");
- staticpro (&Qwindow);
Qface = intern ("face");
staticpro (&Qface);
- Qpriority = intern ("priority");
- staticpro (&Qpriority);
+ Qmouse_face = intern ("mouse-face");
+ staticpro (&Qmouse_face);
+ Qpixmap_spec_p = intern ("pixmap-spec-p");
+ staticpro (&Qpixmap_spec_p);
DEFVAR_INT ("region-face", ®ion_face,
"Face number to use to highlight the region\n\
The region is highlighted with this face\n\
when Transient Mark mode is enabled and the mark is active.");
+#ifdef HAVE_X_WINDOWS
+ defsubr (&Spixmap_spec_p);
+#endif
defsubr (&Sframe_face_alist);
defsubr (&Sset_frame_face_alist);
defsubr (&Smake_face_internal);
defsubr (&Sinternal_next_face_id);
}
-#endif /* HAVE_X_WINDOWS */
-
+#endif /* HAVE_FACES */
HCoop / bpt / emacs.git / blobdiff