/* "Face" primitives.
- Copyright (C) 1993 Free Software Foundation.
+ Copyright (C) 1993, 1994 Free Software Foundation.
This file is part of GNU Emacs.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
/* This is derived from work by Lucid (some parts very loosely so). */
#include <config.h>
#include "lisp.h"
-#ifdef HAVE_X_WINDOWS
+#include "charset.h"
+
+#include "frame.h"
+/* The number of face-id's in use (same for all frames). */
+static int next_face_id;
+
+#ifdef HAVE_FACES
+
+#ifdef HAVE_X_WINDOWS
#include "xterm.h"
+#include "fontset.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"
+#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
#include <X11/Xos.h>
#endif
-
+#endif /* HAVE_X_WINDOWS */
\f
/* An explanation of the face data structures. */
ID is the face ID, an integer used internally by the C code to identify
the face,
FONT, FOREGROUND, and BACKGROUND are strings naming the fonts and colors
- to use with the face,
+ to use with the face, FONT may name fontsets,
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.
(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)].
+ 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->display.x->param_faces are special - they describe the
+ 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 definiton of struct face.
+ GC's. (See src/dispextern.h for the definition of struct face.
lisp/faces.el maintains the isomorphism between face_alist and
param_faces.)
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
+ FRAME->output_data.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
+ 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.
- 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.
+ 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:
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
- 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 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.
- 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. */
-
+ on all frames. */
\f
/* Definitions and declarations. */
-/* A table of display faces. */
-static struct face **face_vector;
-/* The length in use of the table. */
-static int nfaces;
-/* The allocated length of the table. */
-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;
+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;
+Lisp_Object Qface, Qmouse_face;
+Lisp_Object Qpixmap_spec_p;
-static void build_face ( /* FRAME_PTR, struct face * */ );
int face_name_id_number ( /* FRAME_PTR, Lisp_Object name */ );
struct face *intern_face ( /* FRAME_PTR, struct face * */ );
struct face *result = (struct face *) xmalloc (sizeof (struct face));
bzero (result, sizeof (struct face));
result->font = (XFontStruct *) FACE_DEFAULT;
+ result->fontset = -1;
result->foreground = FACE_DEFAULT;
result->background = FACE_DEFAULT;
result->stipple = FACE_DEFAULT;
struct face *result = allocate_face ();
result->font = face->font;
+ result->fontset = face->fontset;
result->foreground = face->foreground;
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;
}
struct face *face1, *face2;
{
return ( face1->font == face2->font
+ && face1->fontset == face2->fontset
&& face1->foreground == face2->foreground
&& face1->background == face2->background
&& face1->stipple == face2->stipple
&& face1->underline == face2->underline);
}
\f
-/* Interning faces in the `face_vector' cache, and clearing that cache. */
+/* Managing graphics contexts of faces. */
-/* 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;
- }
-
- /* 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 computed 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;
+ /* We used the following GC for all non-ASCII characters by changing
+ only GCfont each time. */
+ face->non_ascii_gc = XCreateGC (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+ mask, &xgcv);
+
+ 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);
+ XFreeGC (dpy, face->non_ascii_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
/* Managing parameter face arrays for frames. */
result = Qnil;
FOR_EACH_FRAME (tail, frame)
- if (FRAME_X_P (XFRAME (frame))
+ if ((FRAME_MSDOS_P (XFRAME (frame)) || FRAME_X_P (XFRAME (frame)))
&& XFRAME (frame) != f)
{
result = 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;
struct face *face = FRAME_PARAM_FACES (f) [i];
if (face)
{
- if (face->gc)
- XFreeGC (dpy, face->gc);
- unload_font (f, face->font);
+ if (face->fontset < 0)
+ unload_font (f, face->font);
unload_color (f, face->foreground);
unload_color (f, face->background);
-#if 0
- unload_pixmap (f, face->stipple);
-#endif
+ x_destroy_bitmap (f, face->stipple);
xfree (face);
}
}
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. */
+ 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);
+ XFreeGC (dpy, face->non_ascii_gc);
+ }
+ xfree (face);
+ }
+ }
xfree (FRAME_COMPUTED_FACES (f));
FRAME_COMPUTED_FACES (f) = 0;
FRAME_N_COMPUTED_FACES (f) = 0;
struct frame *f;
struct face *new_face;
{
- int i = FRAME_N_COMPUTED_FACES (f);
+ int len = FRAME_N_COMPUTED_FACES (f);
+ int i;
+
+ /* Search for an unused computed face in the middle of the table. */
+ for (i = 0; i < len; i++)
+ {
+ struct face *face = FRAME_COMPUTED_FACES (f)[i];
+ if (face->font == 0)
+ {
+ FRAME_COMPUTED_FACES (f)[i] = copy_face (new_face);
+ return i;
+ }
+ }
if (i >= FRAME_SIZE_COMPUTED_FACES (f))
{
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 fontset = f->output_data.x->fontset;
+ int biggest = (fontset > 0
+ ? FRAME_FONTSET_DATA (f)->fontset_table[fontset]->height
+ : 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 = ((fontset = f->output_data.x->param_faces[i]->fontset) > 0
+ ? FRAME_FONTSET_DATA (f)->fontset_table[fontset]->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->fontset != -1)
+ to->fontset = from->fontset;
if (from->foreground != FACE_DEFAULT)
to->foreground = from->foreground;
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->fontset = -1;
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. */
+
+int
+compute_glyph_face (f, face_code, current_face)
+ struct frame *f;
+ int face_code, current_face;
+{
+ 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.
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. */
+ 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, limit)
+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;
Lisp_Object *overlay_vec;
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 limit1, end;
- XFASTINT (limit1) = (limit < endpos ? limit : endpos);
- end = Fnext_single_property_change (position, Qface, w->buffer, limit1);
+ 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))
+ {
+ /* 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))
{
facecode = face_name_id_number (f, prop);
if (facecode >= 0 && facecode < FRAME_N_PARAM_FACES (f)
/* Now merge the overlay data in that order. */
for (i = 0; i < noverlays; i++)
{
- prop = Foverlay_get (overlay_vec[i], 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_PARAM_FACES (f)
&& FRAME_PARAM_FACES (f) [facecode] != 0)
- merge_faces (FRAME_PARAM_FACES (f) [facecode], &face);
+ merge_faces (FRAME_PARAM_FACES (f)[facecode], &face);
oend = OVERLAY_END (overlay_vec[i]);
oendpos = OVERLAY_POSITION (oend);
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);
+ merge_faces (FRAME_PARAM_FACES (f)[region_face], &face);
}
*endptr = endpos;
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 (f, face_code, current_face)
- struct frame *f;
- int face_code, current_face;
-{
- 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);
-}
-
-
+\f
/* Recompute the GC's for the default and modeline faces.
We call this after changing frame parameters on which those GC's
depend. */
BLOCK_INPUT;
if (FRAME_DEFAULT_FACE (f)->gc)
- XFreeGC (x_current_display, FRAME_DEFAULT_FACE (f)->gc);
+ {
+ XFreeGC (FRAME_X_DISPLAY (f), FRAME_DEFAULT_FACE (f)->gc);
+ XFreeGC (FRAME_X_DISPLAY (f), FRAME_DEFAULT_FACE (f)->non_ascii_gc);
+ }
if (FRAME_MODE_LINE_FACE (f)->gc)
- XFreeGC (x_current_display, FRAME_MODE_LINE_FACE (f)->gc);
-
+ {
+ XFreeGC (FRAME_X_DISPLAY (f), FRAME_MODE_LINE_FACE (f)->gc);
+ XFreeGC (FRAME_X_DISPLAY (f), FRAME_MODE_LINE_FACE (f)->non_ascii_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));
- build_face (f, FRAME_DEFAULT_FACE (f));
- build_face (f, FRAME_MODE_LINE_FACE (f));
+ intern_face (f, FRAME_DEFAULT_FACE (f));
+ intern_face (f, FRAME_MODE_LINE_FACE (f));
UNBLOCK_INPUT;
}
\f
/* Lisp interface. */
-DEFUN ("frame-face-alist", Fframe_face_alist, Sframe_face_alist, 1, 1, 0,
- "")
- (frame)
- Lisp_Object frame;
-{
- CHECK_FRAME (frame, 0);
- return XFRAME (frame)->face_alist;
-}
-
-DEFUN ("set-frame-face-alist", Fset_frame_face_alist, Sset_frame_face_alist,
- 2, 2, 0, "")
- (frame, value)
- Lisp_Object frame, value;
-{
- CHECK_FRAME (frame, 0);
- XFRAME (frame)->face_alist = value;
- return value;
-}
-
-
DEFUN ("make-face-internal", Fmake_face_internal, Smake_face_internal, 1, 1, 0,
"Create face number FACE-ID on all frames.")
(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_MSDOS_P (XFRAME (frame)) || 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);
if (id < 0 || id >= next_face_id)
error ("Face id out of range");
- if (! FRAME_X_P (f))
- return;
+ if (! FRAME_X_P (f) && ! FRAME_MSDOS_P (f))
+ return Qnil;
ensure_face_ready (f, id);
face = FRAME_PARAM_FACES (f) [XFASTINT (face_id)];
if (EQ (attr_name, intern ("font")))
{
- XFontStruct *font = load_font (f, attr_value);
- if (face->font != f->display.x->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;
+ int fontset;
+
+ if (NILP (attr_value))
+ {
+ font = (XFontStruct *) FACE_DEFAULT;
+ fontset = -1;
+ }
+ else
+ {
+ CHECK_STRING (attr_value, 0);
+ fontset = fs_query_fontset (f, XSTRING (attr_value)->data);
+ if (fontset >= 0)
+ {
+ struct font_info *fontp;
+
+ if (!(fontp = fs_load_font (f, FRAME_X_FONT_TABLE (f),
+ CHARSET_ASCII, NULL, fontset)))
+ Fsignal (Qerror,
+ Fcons (build_string ("ASCII font can't be loaded"),
+ Fcons (attr_value, Qnil)));
+ font = (XFontStruct *) (fontp->font);
+ }
+ else
+ font = load_font (f, attr_value);
+ }
+
+ if (face->fontset == -1 && face->font != f->output_data.x->font)
unload_font (f, face->font);
+
face->font = font;
+ face->fontset = fontset;
+ 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);
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);
if (id == 0 || id == 1)
recompute_basic_faces (f);
- /* 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;
+ /* 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);
+ FRAME_X_DISPLAY_INFO (f)->mouse_face_defer = 1;
+ }
return Qnil;
}
-
-DEFUN ("internal-next-face-id", Finternal_next_face_id, Sinternal_next_face_id,
- 0, 0, 0, "")
- ()
-{
- return make_number (next_face_id++);
-}
-
/* Return the face id for name NAME on frame FRAME.
(It should be the same for all frames,
but it's as easy to use the "right" frame to look it up
CHECK_NUMBER (tem, 0);
return XINT (tem);
}
+
+#endif /* HAVE_FACES */
+
+\f
+DEFUN ("frame-face-alist", Fframe_face_alist, Sframe_face_alist, 1, 1, 0,
+ "")
+ (frame)
+ Lisp_Object frame;
+{
+ CHECK_FRAME (frame, 0);
+ return XFRAME (frame)->face_alist;
+}
+
+DEFUN ("set-frame-face-alist", Fset_frame_face_alist, Sset_frame_face_alist,
+ 2, 2, 0, "")
+ (frame, value)
+ Lisp_Object frame, value;
+{
+ CHECK_FRAME (frame, 0);
+ XFRAME (frame)->face_alist = value;
+ return value;
+}
+
+DEFUN ("internal-next-face-id", Finternal_next_face_id, Sinternal_next_face_id,
+ 0, 0, 0, "")
+ ()
+{
+ return make_number (next_face_id++);
+}
\f
/* Emacs initialization. */
void
syms_of_xfaces ()
{
+#ifdef HAVE_FACES
Qface = intern ("face");
staticpro (&Qface);
+ 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.");
- defsubr (&Sframe_face_alist);
- defsubr (&Sset_frame_face_alist);
defsubr (&Smake_face_internal);
defsubr (&Sset_face_attribute_internal);
- defsubr (&Sinternal_next_face_id);
-}
+#endif /* HAVE_FACES */
-#endif /* HAVE_X_WINDOWS */
+#ifdef HAVE_X_WINDOWS
+ defsubr (&Spixmap_spec_p);
+#endif
+ defsubr (&Sframe_face_alist);
+ defsubr (&Sset_frame_face_alist);
+ defsubr (&Sinternal_next_face_id);
+}
HCoop / bpt / emacs.git / blobdiff