Mercurial > emacs
changeset 17032:814257735e7d
Include "charset.h"
[HAVE_WINDOW_SYSTEM]: Include fontset.h.
(make_frame): Allocate member `fontset_data' of the struct frame.
(Fdelete_frame): Free the area for the member.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Thu, 20 Feb 1997 06:49:05 +0000 |
| parents | c612a2cdd83b |
| children | ffd6878cae02 |
| files | src/frame.c |
| diffstat | 1 files changed, 13 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/frame.c Thu Feb 20 06:48:37 1997 +0000 +++ b/src/frame.c Thu Feb 20 06:49:05 1997 +0000 @@ -22,6 +22,10 @@ #include <stdio.h> #include "lisp.h" +#include "charset.h" +#ifdef HAVE_WINDOW_SYSTEM +#include "fontset.h" +#endif #include "frame.h" #include "termhooks.h" #include "window.h" @@ -360,6 +364,10 @@ a newly-created, never-selected window. */ XSETFASTINT (XWINDOW (f->selected_window)->use_time, ++window_select_count); +#ifdef HAVE_WINDOW_SYSTEM + f->fontset_data = alloc_fontset_data (); +#endif + return f; } @@ -1152,6 +1160,11 @@ if (FRAME_DELETE_COST (f)) free (FRAME_DELETE_COST (f)); +#ifdef HAVE_WINDOW_SYSTEM + /* Free all fontset data. */ + free_fontset_data (FRAME_FONTSET_DATA (f)); +#endif + /* Since some events are handled at the interrupt level, we may get an event for f at any time; if we zero out the frame's display now, then we may trip up the event-handling code. Instead, we'll