/* "Face" primitives.
- Copyright (C) 1992, 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
#include "blockinput.h"
#include "window.h"
-/* Display Context for the icons */
-#include <X11/Intrinsic.h>
-#include <X11/StringDefs.h>
-/* #include <X11/Xmu/Drawing.h> */ /* Appears not to be used */
+/* 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__
+
+#else
+
#include <X11/Xos.h>
+#endif
+
\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.
- (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. (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->display.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->display.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 definiton 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->display.x->computed_faces for a matching face, add one if
+ none is found, and return the index into
+ FRAME->display.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.
+
+ Elements 0 and 1 of computed_faces have GC's; all the other faces
+ in computed_faces do not. The global array face_vector contains
+ faces with their GC's set. Given a computed_face, the function
+ intern_face finds (or adds) an element of face_vector with
+ equivalent parameters, and returns a pointer to that face, whose GC
+ can then be used for display.
+
+ 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:
+ 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.
+
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
refill it as needed. The function clear_face_vector performs this
purge.
- We're often applying intern_face to faces in frames' local arrays -
+ We're often applying intern_face to faces in computed_faces -
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.
/* Definitions and declarations. */
/* A table of display faces. */
-struct face **face_vector;
+static struct face **face_vector;
/* The length in use of the table. */
-int nfaces;
+static int nfaces;
/* The allocated length of the table. */
-int nfaces_allocated;
+static int nfaces_allocated;
/* The number of face-id's in use (same for all frames). */
int next_face_id;
+/* The number of the face to use to indicate the region. */
+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;
-static void build_face ();
-static Lisp_Object face_name_id_number ();
+static void build_face ( /* FRAME_PTR, struct face * */ );
+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. */
for (i = 0; i < nfaces; i++)
{
if (face_eql (face_vector[i], face))
- return face_vector[i];
+ {
+ face->cached_index = i;
+ return face_vector[i];
+ }
if (face_vector[i] == 0)
empty = i;
}
/* Make a graphics context for it. */
build_face (f, result);
+ face->cached_index = empty;
return result;
}
-/* Given a frame face, return an equivalent display face
+/* Given a computed face, return an equivalent display face
(one which has a graphics context). */
struct face *
struct frame *f;
struct face *face;
{
- struct face *result;
-
- /* Does the face have a GC already? */
- if (face->gc)
- return face;
-
/* If it's equivalent to the default face, use that. */
if (face_eql (face, FRAME_DEFAULT_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);
}
XGCValues xgcv;
unsigned long mask;
+ BLOCK_INPUT;
+
if (face->foreground != FACE_DEFAULT)
xgcv.foreground = face->foreground;
else
- xgcv. foreground = f->display.x->foreground_pixel;
+ xgcv.foreground = f->display.x->foreground_pixel;
+
if (face->background != FACE_DEFAULT)
xgcv.background = face->background;
else
- xgcv. background = f->display.x->background_pixel;
+ xgcv.background = f->display.x->background_pixel;
+
if (face->font && (int) face->font != FACE_DEFAULT)
xgcv.font = face->font->fid;
else
xgcv.font = f->display.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
+
face->gc = gc;
+
+ UNBLOCK_INPUT;
}
/* Allocating, freeing, and duplicating fonts, colors, and pixmaps. */
{
if (!font || font == ((XFontStruct *) FACE_DEFAULT))
return;
+
+ BLOCK_INPUT;
XFreeFont (x_current_display, font);
+ UNBLOCK_INPUT;
}
static unsigned long
static void
unload_color (f, pixel)
struct frame *f;
- Pixel pixel;
+ 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;
- if (pixel == FACE_DEFAULT)
+ if (pixel == FACE_DEFAULT
+ || pixel == BLACK_PIX_DEFAULT
+ || pixel == WHITE_PIX_DEFAULT)
return;
cmap = DefaultColormapOfScreen (DefaultScreenOfDisplay (x_current_display));
BLOCK_INPUT;
XFreeColors (dpy, cmap, &pixel, 1, 0);
UNBLOCK_INPUT;
+#endif
}
\f
-/* Initializing face arrays for frames. */
+/* Managing parameter face arrays for frames. */
-/* Set up faces 0 and 1 based on the normal text and modeline GC's. */
void
init_frame_faces (f)
- struct frame *f;
+ FRAME_PTR f;
{
ensure_face_ready (f, 0);
- {
- XGCValues gcv;
- struct face *face = FRAME_FACES (f) [0];
-
- XGetGCValues (x_current_display, f->display.x->normal_gc,
- GCForeground | GCBackground | GCFont, &gcv);
- face->gc = f->display.x->normal_gc;
- face->foreground = gcv.foreground;
- face->background = gcv.background;
- face->font = XQueryFont (x_current_display, gcv.font);
- face->stipple = 0;
- face->underline = 0;
- }
-
ensure_face_ready (f, 1);
- {
- XGCValues gcv;
- struct face *face = FRAME_FACES (f) [1];
-
- XGetGCValues (x_current_display, f->display.x->reverse_gc,
- GCForeground | GCBackground | GCFont, &gcv);
- face->gc = f->display.x->reverse_gc;
- face->foreground = gcv.foreground;
- face->background = gcv.background;
- face->font = XQueryFont (x_current_display, gcv.font);
- face->stipple = 0;
- face->underline = 0;
- }
-}
-#if 0
-void
-init_frame_faces (f)
- struct frame *f;
-{
- struct frame *other_frame = 0;
- Lisp_Object rest;
+ FRAME_N_COMPUTED_FACES (f) = 0;
+ FRAME_SIZE_COMPUTED_FACES (f) = 0;
- for (rest = Vframe_list; !NILP (rest); rest = Fcdr (rest))
- {
- struct frame *f2 = XFRAME (Fcar (rest));
- if (f2 != f && FRAME_X_P (f2))
+ new_computed_face (f, FRAME_PARAM_FACES (f)[0]);
+ new_computed_face (f, FRAME_PARAM_FACES (f)[1]);
+ recompute_basic_faces (f);
+
+ /* Find another X frame. */
+ {
+ Lisp_Object tail, frame, result;
+
+ result = Qnil;
+ FOR_EACH_FRAME (tail, frame)
+ if (FRAME_X_P (XFRAME (frame))
+ && XFRAME (frame) != f)
{
- other_frame = f2;
+ result = frame;
break;
}
- }
- if (other_frame)
- {
- /* Make sure this frame's face vector is as big as the others. */
- FRAME_N_FACES (f) = FRAME_N_FACES (other_frame);
- FRAME_FACES (f)
- = (struct face **) xmalloc (FRAME_N_FACES (f) * sizeof (struct face *));
-
- /* Make sure the frame has the two basic faces. */
- FRAME_DEFAULT_FACE (f)
- = copy_face (FRAME_DEFAULT_FACE (other_frame));
- FRAME_MODE_LINE_FACE (f)
- = copy_face (FRAME_MODE_LINE_FACE (other_frame));
- }
+ /* If we didn't find any X frames other than f, then we don't need
+ any faces other than 0 and 1, so we're okay. Otherwise, make
+ sure that all faces valid on the selected frame are also valid
+ on this new frame. */
+ if (FRAMEP (result))
+ {
+ int i;
+ 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
/* Called from Fdelete_frame. */
Display *dpy = x_current_display;
int i;
- for (i = 0; i < FRAME_N_FACES (f); i++)
+ BLOCK_INPUT;
+
+ for (i = 0; i < FRAME_N_PARAM_FACES (f); i++)
{
- struct face *face = FRAME_FACES (f) [i];
- if (! face)
- continue;
- if (face->gc)
- XFreeGC (dpy, face->gc);
- unload_font (f, face->font);
- unload_color (f, face->foreground);
- unload_color (f, face->background);
+ struct face *face = FRAME_PARAM_FACES (f) [i];
+ if (face)
+ {
+ if (face->gc)
+ XFreeGC (dpy, face->gc);
+ unload_font (f, face->font);
+ unload_color (f, face->foreground);
+ unload_color (f, face->background);
#if 0
- unload_pixmap (f, face->stipple);
+ unload_pixmap (f, face->stipple);
#endif
- xfree (face);
+ xfree (face);
+ }
}
- xfree (FRAME_FACES (f));
- FRAME_FACES (f) = 0;
- FRAME_N_FACES (f) = 0;
+ 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. */
+ 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. */
-int
-intern_frame_face (frame, new_face)
- struct frame *frame;
+static int
+new_computed_face (f, new_face)
+ struct frame *f;
+ struct face *new_face;
+{
+ int i = FRAME_N_COMPUTED_FACES (f);
+
+ 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;
+}
+
+
+/* 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_FACES (frame);
+ int len = FRAME_N_COMPUTED_FACES (f);
int i;
- /* Search for a face already on FRAME equivalent to FACE. */
+ /* Search for a computed face already on F equivalent to FACE. */
for (i = 0; i < len; i++)
{
- struct face *frame_face = FRAME_FACES (frame)[i];
-
- if (frame_face && face_eql (new_face, frame_face))
+ 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. */
- i = next_face_id++;
-
- ensure_face_ready (frame, i);
- bcopy (new_face, FRAME_FACES (frame)[i], sizeof (new_face));
-
- return i;
+ return new_computed_face (f, new_face);
}
-/* Make face id ID valid on frame F. */
+/* 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 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 *bounds1 = &font1->min_bounds;
+ XCharStruct *bounds2 = &font2->min_bounds;
+
+ return (bounds1->width == bounds2->width);
+}
+/* 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->display.x->font);
+
+ for (i = 0; i < f->display.x->n_param_faces; i++)
+ if (f->display.x->param_faces[i] != 0
+ && f->display.x->param_faces[i]->font != (XFontStruct *) FACE_DEFAULT)
+ {
+ int height = FONT_HEIGHT (f->display.x->param_faces[i]->font);
+ if (height > biggest)
+ biggest = height;
+ }
+
+ if (biggest == f->display.x->line_height)
+ return 0;
+
+ f->display.x->line_height = biggest;
+ return 1;
+}
+\f
/* Modify face TO by copying from FROM all properties which have
nondefault settings. */
+
static void
merge_faces (from, to)
struct face *from, *to;
{
- if (from->font != (XFontStruct *)FACE_DEFAULT)
- {
- to->font = from->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->foreground != FACE_DEFAULT)
to->foreground = from->foreground;
if (from->background != FACE_DEFAULT)
to->underline = from->underline;
}
-struct sortvec
+/* 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;
{
- Lisp_Object overlay;
- int beg, end;
- int priority;
-};
+ 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->stipple = 0;
+ face->underline = 0;
+
+ /* Avoid a face comparison by making this invalid. */
+ face->cached_index = -1;
+}
-static int
-sort_overlays (s1, s2)
- struct sortvec *s1, *s2;
+/* 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 (f, face_code, current_face)
+ struct frame *f;
+ int face_code, current_face;
{
- 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;
+ struct face face;
+
+ 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 the window. */
+ 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.
+
+ 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, 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;
- int endpos = BUF_ZV (XBUFFER (w->buffer));
Lisp_Object *overlay_vec;
- int len;
- 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);
+ endpos = ZV;
+ if (pos < region_beg && region_beg < endpos)
+ endpos = region_beg;
+
XFASTINT (position) = pos;
- prop = Fget_text_property (position, Qface, w->buffer);
+
+ 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);
+ XFASTINT (limit1) = (limit < endpos ? limit : endpos);
+ end = Fnext_single_property_change (position, propname, w->buffer, limit1);
if (INTEGERP (end))
endpos = XINT (end);
}
{
- int end;
-
- len = 10;
- overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object));
- noverlays = overlays_at (pos, &overlay_vec, &len, &end);
- if (end < endpos)
- endpos = end;
+ int next_overlay;
+ int len;
+
+ /* First try with room for 40 overlays. */
+ len = 40;
+ overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object));
+
+ noverlays = overlays_at (pos, 0, &overlay_vec, &len, &next_overlay);
+
+ /* If there are more than 40,
+ make enough space for all, and try again. */
+ if (noverlays > len)
+ {
+ len = noverlays;
+ overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object));
+ noverlays = overlays_at (pos, 0, &overlay_vec, &len, &next_overlay);
+ }
+
+ if (next_overlay < endpos)
+ endpos = next_overlay;
}
*endptr = endpos;
/* Optimize the default case. */
- if (noverlays == 0 && NILP (prop))
+ if (noverlays == 0 && NILP (prop)
+ && !(pos >= region_beg && pos < region_end))
return 0;
- bcopy (FRAME_DEFAULT_FACE (f), &face, sizeof (struct face));
+ compute_base_face (f, &face);
if (!NILP (prop))
{
- facecode = face_name_id_number (frame, prop);
- if (facecode >= 0 && facecode < FRAME_N_FACES (f)
- && FRAME_FACES (f) [facecode] != 0)
- merge_faces (FRAME_FACES (f) [facecode], &face);
- }
-
- /* Put the valid and relevant overlays into sortvec. */
- sortvec = (struct sortvec *) alloca (noverlays * sizeof (struct sortvec));
-
- 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)
- {
- 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 (NILP (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++;
- }
- }
+ 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);
}
- noverlays = j;
- /* Sort the overlays into the proper order: increasing priority. */
-
- 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 (overlay_vec[i], Qface);
+ prop = Foverlay_get (overlay_vec[i], propname);
if (!NILP (prop))
{
Lisp_Object oend;
int oendpos;
- facecode = face_name_id_number (frame, prop);
- if (facecode >= 0 && facecode < FRAME_N_FACES (f)
- && FRAME_FACES (f) [facecode] != 0)
- merge_faces (FRAME_FACES (f) [facecode], &face);
+ 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);
oend = OVERLAY_END (overlay_vec[i]);
oendpos = OVERLAY_POSITION (oend);
- if (oendpos > endpos)
+ if (oendpos < endpos)
endpos = oendpos;
}
}
- xfree (overlay_vec);
+ if (pos >= region_beg && pos < region_end)
+ {
+ if (region_end < endpos)
+ endpos = region_end;
+ if (region_face >= 0 && region_face < next_face_id)
+ merge_faces (FRAME_PARAM_FACES (f)[region_face], &face);
+ }
*endptr = endpos;
- 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. */
-/* 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;
+void
+recompute_basic_faces (f)
+ FRAME_PTR f;
{
- struct face face;
+ /* If the frame's faces haven't been initialized yet, don't worry about
+ this stuff. */
+ if (FRAME_N_PARAM_FACES (f) < 2)
+ return;
+
+ BLOCK_INPUT;
- bcopy (FRAME_DEFAULT_FACE (f), &face, sizeof (face));
+ if (FRAME_DEFAULT_FACE (f)->gc)
+ XFreeGC (x_current_display, FRAME_DEFAULT_FACE (f)->gc);
+ if (FRAME_MODE_LINE_FACE (f)->gc)
+ XFreeGC (x_current_display, FRAME_MODE_LINE_FACE (f)->gc);
- if (face_code >= 0 && face_code < FRAME_N_FACES (f)
- && FRAME_FACES (f) [face_code] != 0)
- merge_faces (FRAME_FACES (f) [face_code], &face);
+ compute_base_face (f, FRAME_DEFAULT_FACE (f));
+ compute_base_face (f, FRAME_MODE_LINE_FACE (f));
- return intern_frame_face (f, &face);
+ merge_faces (FRAME_DEFAULT_PARAM_FACE (f), FRAME_DEFAULT_FACE (f));
+ merge_faces (FRAME_MODE_LINE_PARAM_FACE (f), FRAME_MODE_LINE_FACE (f));
+
+ build_face (f, FRAME_DEFAULT_FACE (f));
+ build_face (f, FRAME_MODE_LINE_FACE (f));
+
+ UNBLOCK_INPUT;
}
+
+
\f
/* Lisp interface. */
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")))
{
XFontStruct *font = load_font (f, attr_value);
- unload_font (f, face->font);
+ if (face->font != f->display.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);
}
else if (EQ (attr_name, intern ("foreground")))
{
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 == 0 || id == 1)
+ recompute_basic_faces (f);
- 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)
+ SET_FRAME_GARBAGED (f);
+ else
+ /* Otherwise, it's enough to tell it to redisplay the text. */
+ windows_or_buffers_changed = 1;
return Qnil;
}
but it's as easy to use the "right" frame to look it up
as to use any other one.) */
-static Lisp_Object
-face_name_id_number (frame, name)
- Lisp_Object frame, name;
+int
+face_name_id_number (f, name)
+ FRAME_PTR f;
+ Lisp_Object name;
{
Lisp_Object tem;
- CHECK_FRAME (frame, 0);
- tem = Fcdr (Fassq (name, XFRAME (frame)->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);
+
+ 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.");
defsubr (&Sframe_face_alist);
defsubr (&Sset_frame_face_alist);
HCoop / bpt / emacs.git / blobdiff