diff options
| author | Jim Blandy <jimb@redhat.com> | 1993-06-22 07:26:44 +0000 |
|---|---|---|
| committer | Jim Blandy <jimb@redhat.com> | 1993-06-22 07:26:44 +0000 |
| commit | 4ec0fc7161b3df4602dc14739cbc90a317516c05 (patch) | |
| tree | e791b4e34acb6f312ed7f323c7a52647f2069f10 /src/dispextern.h | |
| parent | 504b7968ed24ef720aa1fb99097e75293e74c1b9 (diff) | |
| download | emacs-4ec0fc7161b3df4602dc14739cbc90a317516c05.tar.gz | |
Separate parameter faces (those created and modified by the user)
from the computed faces (the combinations created by
compute_char_face), so that we don't waste global face id's.
* xterm.h (struct x_display): Replace the fields faces and n_faces
with fields param_faces, n_param_faces, computed_faces,
n_computed_faces, and size_computed_faces.
(FRAME_FACES, FRAME_N_FACES): Replaced by...
(FRAME_COMPUTED_FACES, FRAME_N_COMPUTED_FACES, FRAME_PARAM_FACES,
FRAME_N_PARAM_FACES): New macros.
* xfaces.c: Doc fixes.
(init_frame_faces): Call new_computed_face to create entries for
the default and mode line faces. Use the FRAME...PARAM_FACES
macros.
(free_frame_faces): Use the FRAME...PARAM_FACES and
FRAME...COMPUTED_FACES macros. Don't use the copy flag; all
parameter faces have real X resources, and all computed faces just
have copies. Free both the parameter and computed face arrays.
(new_computed_face): New function.
(intern_computed_face): Renamed from intern_frame_face; callers
changed. Call new_computed_face.
(ensure_face_ready, compute_char_face, compute_glyph_face): Use the
FRAME...PARAM_FACES macros.
(recompute_basic_faces): Use the FRAME...PARAM_FACES and
FRAME...COMPUTED_FACES macros. Produce the computed faces by
starting with the base faces and merging in the parameter faces.
(Fset_face_attribute_internal): Use the FRAME...PARAM_FACES
macros. Just call recompute_basic_faces if the default or mode
line faces have changed.
* xfns.c (Fx_list_fonts): Use the FRAME...PARAM_FACES macros.
* xterm.c (dumpglyphs): Use the FRAME...COMPUTED_FACES macros.
* dispextern.h (struct face): Remove the copy member. This is no
longer necessary; all computed faces are copies, and no parameter
faces are.
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index dfdae70b3d0..d793abe9cd4 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -54,15 +54,6 @@ struct face /* Whether or not to underline text in this face. */ char underline; - - /* Does this face own its resources? (color, font, etcetera) - If this is a face which we computed by combining other faces, - then this is true, and we shouldn't free any of the resources - it refers to; the faces from which it was constructed own it. - On the other hand, if this is a face the user created and - filled in directly, then this is false, and we should free the - resources when we free it. */ - char copy; }; /* Let's stop using this and get rid of it. */ |