Mercurial > hg > xemacs-beta

comparison src/window.c @ 5120:d1247f3cc363 ben-lisp-object

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
latest work on lisp-object workspace; more changes eliminating LCRECORD in place of LISP_OBJECT; now compiles and runs.
author Ben Wing <ben@xemacs.org>
date Mon, 28 Dec 2009 01:15:52 -0600
parents e0db3c197671
children 623d57b7fbe8
comparison
equal deleted inserted replaced
5119:d877c14318b3 5120:d1247f3cc363
3855 { 3855 {
3856 struct window *o = XWINDOW (window); 3856 struct window *o = XWINDOW (window);
3857 Lisp_Object obj = ALLOC_LISP_OBJECT (window); 3857 Lisp_Object obj = ALLOC_LISP_OBJECT (window);
3858 struct window *p = XWINDOW (obj); 3858 struct window *p = XWINDOW (obj);
3859 3859
3860 COPY_LCRECORD (p, o); 3860 COPY_LISP_OBJECT (p, o);
3861 3861
3862 /* Don't copy the pointers to the line start cache or the face 3862 /* Don't copy the pointers to the line start cache or the face
3863 instances. */ 3863 instances. */
3864 p->line_start_cache = Dynarr_new (line_start_cache); 3864 p->line_start_cache = Dynarr_new (line_start_cache);
3865 #ifdef NEW_GC 3865 #ifdef NEW_GC
5163 struct window_stats *stats, 5163 struct window_stats *stats,
5164 struct overhead_stats *ovstats) 5164 struct overhead_stats *ovstats)
5165 { 5165 {
5166 if (!mir) 5166 if (!mir)
5167 return; 5167 return;
5168 stats->other += LISPOBJ_STORAGE_SIZE (mir, sizeof (*mir), ovstats); 5168 stats->other += LISP_OBJECT_STORAGE_SIZE (mir, sizeof (*mir), ovstats);
5169 #ifdef HAVE_SCROLLBARS 5169 #ifdef HAVE_SCROLLBARS
5170 { 5170 {
5171 struct device *d = XDEVICE (FRAME_DEVICE (mir->frame)); 5171 struct device *d = XDEVICE (FRAME_DEVICE (mir->frame));
5172 5172
5173 stats->scrollbar += 5173 stats->scrollbar +=
5187 static void 5187 static void
5188 compute_window_usage (struct window *w, struct window_stats *stats, 5188 compute_window_usage (struct window *w, struct window_stats *stats,
5189 struct overhead_stats *ovstats) 5189 struct overhead_stats *ovstats)
5190 { 5190 {
5191 xzero (*stats); 5191 xzero (*stats);
5192 stats->other += LISPOBJ_STORAGE_SIZE (w, sizeof (*w), ovstats); 5192 stats->other += LISP_OBJECT_STORAGE_SIZE (w, sizeof (*w), ovstats);
5193 stats->face += compute_face_cachel_usage (w->face_cachels, ovstats); 5193 stats->face += compute_face_cachel_usage (w->face_cachels, ovstats);
5194 stats->glyph += compute_glyph_cachel_usage (w->glyph_cachels, ovstats); 5194 stats->glyph += compute_glyph_cachel_usage (w->glyph_cachels, ovstats);
5195 stats->line_start += 5195 stats->line_start +=
5196 compute_line_start_cache_dynarr_usage (w->line_start_cache, ovstats); 5196 compute_line_start_cache_dynarr_usage (w->line_start_cache, ovstats);
5197 compute_window_mirror_usage (find_window_mirror (w), stats, ovstats); 5197 compute_window_mirror_usage (find_window_mirror (w), stats, ovstats);