comparison src/window.c @ 384:bbff43aa5eb7 r21-2-7

Import from CVS: tag r21-2-7
author cvs
date Mon, 13 Aug 2007 11:08:24 +0200
parents 8626e4521993
children 74fd4e045ea6
comparison
equal deleted inserted replaced
383:6a50c6a581a5 384:bbff43aa5eb7
34 #include "frame.h" 34 #include "frame.h"
35 #include "objects.h" 35 #include "objects.h"
36 #include "glyphs.h" 36 #include "glyphs.h"
37 #include "redisplay.h" 37 #include "redisplay.h"
38 #include "window.h" 38 #include "window.h"
39 #include "elhash.h"
40 #include "commands.h"
39 41
40 Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_configurationp; 42 Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_configurationp;
41 Lisp_Object Qscroll_up, Qscroll_down, Qdisplay_buffer; 43 Lisp_Object Qscroll_up, Qscroll_down, Qdisplay_buffer;
42 44
43 #ifdef MEMORY_USAGE_STATS 45 #ifdef MEMORY_USAGE_STATS
159 MARK_DISP_VARIABLE (last_point); 161 MARK_DISP_VARIABLE (last_point);
160 MARK_DISP_VARIABLE (last_start); 162 MARK_DISP_VARIABLE (last_start);
161 MARK_DISP_VARIABLE (last_facechange); 163 MARK_DISP_VARIABLE (last_facechange);
162 markobj (window->line_cache_last_updated); 164 markobj (window->line_cache_last_updated);
163 markobj (window->redisplay_end_trigger); 165 markobj (window->redisplay_end_trigger);
166 markobj (window->subwindow_instance_cache);
167
164 mark_face_cachels (window->face_cachels, markobj); 168 mark_face_cachels (window->face_cachels, markobj);
165 mark_glyph_cachels (window->glyph_cachels, markobj); 169 mark_glyph_cachels (window->glyph_cachels, markobj);
166 170
167 #define WINDOW_SLOT(slot, compare) ((void) (markobj (window->slot))) 171 #define WINDOW_SLOT(slot, compare) ((void) (markobj (window->slot)))
168 #include "winslots.h" 172 #include "winslots.h"
271 INIT_DISP_VARIABLE (last_start, Fmake_marker ()); 275 INIT_DISP_VARIABLE (last_start, Fmake_marker ());
272 INIT_DISP_VARIABLE (last_facechange, Qzero); 276 INIT_DISP_VARIABLE (last_facechange, Qzero);
273 p->face_cachels = Dynarr_new (face_cachel); 277 p->face_cachels = Dynarr_new (face_cachel);
274 p->glyph_cachels = Dynarr_new (glyph_cachel); 278 p->glyph_cachels = Dynarr_new (glyph_cachel);
275 p->line_start_cache = Dynarr_new (line_start_cache); 279 p->line_start_cache = Dynarr_new (line_start_cache);
280 p->subwindow_instance_cache = make_lisp_hash_table (10,
281 HASH_TABLE_KEY_WEAK,
282 HASH_TABLE_EQ);
276 p->line_cache_last_updated = Qzero; 283 p->line_cache_last_updated = Qzero;
277 INIT_DISP_VARIABLE (last_point_x, 0); 284 INIT_DISP_VARIABLE (last_point_x, 0);
278 INIT_DISP_VARIABLE (last_point_y, 0); 285 INIT_DISP_VARIABLE (last_point_y, 0);
279 INIT_DISP_VARIABLE (window_end_pos, 0); 286 INIT_DISP_VARIABLE (window_end_pos, 0);
280 p->redisplay_end_trigger = Qnil; 287 p->redisplay_end_trigger = Qnil;