diff options
| author | Richard M. Stallman <rms@gnu.org> | 1994-02-06 08:05:58 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1994-02-06 08:05:58 +0000 |
| commit | fffc2367a5c1e2d9a1a170c3f99b65734584fbf6 (patch) | |
| tree | 949958484799c3b1e84e7e6591be864e83e582af | |
| parent | 278feba9ce82a494b7ff14e695fc80fc0ed9cc16 (diff) | |
| download | emacs-fffc2367a5c1e2d9a1a170c3f99b65734584fbf6.tar.gz | |
(init_frame_faces): Clear FRAME_N_COMPUTED_FACES
and FRAME_SIZE_COMPUTED_FACES.
(compute_glyph_face): New arg CURRENT_FACE specifies face to merge with.
| -rw-r--r-- | src/xfaces.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 6cba032b7e6..a3c2eecebbd 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -481,6 +481,9 @@ 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); @@ -569,11 +572,10 @@ new_computed_face (f, new_face) 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 *))); + = (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; } @@ -887,15 +889,16 @@ compute_char_face (f, w, pos, region_beg, region_end, endptr, limit) /* 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. */ + be CURRENT_FACE. F is the frame. */ + int -compute_glyph_face (f, face_code) +compute_glyph_face (f, face_code, current_face) struct frame *f; - int face_code; + int face_code, current_face; { struct face face; - compute_base_face (f, &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) @@ -908,6 +911,7 @@ compute_glyph_face (f, face_code) /* 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; |