comparison src/frame.c @ 2551:9f70af3ac939

[xemacs-hg @ 2005-02-03 16:14:02 by james] Commit Olivier Galibert's dumper updates for bignums and use them. See xemacs-patches message with ID <ps8y685c6p.fsf@diannao.ittc.ku.edu>.
author james
date Thu, 03 Feb 2005 16:14:08 +0000
parents 3d8143fc88e1
children 166ed8151e62
comparison
equal deleted inserted replaced
2550:317f30471f4e 2551:9f70af3ac939
142 extern const struct sized_memory_description mswindows_frame_data_description; 142 extern const struct sized_memory_description mswindows_frame_data_description;
143 extern const struct sized_memory_description x_frame_data_description; 143 extern const struct sized_memory_description x_frame_data_description;
144 144
145 static const struct memory_description frame_data_description_1 []= { 145 static const struct memory_description frame_data_description_1 []= {
146 #ifdef HAVE_GTK 146 #ifdef HAVE_GTK
147 { XD_BLOCK_PTR, gtk_console, 1, &gtk_frame_data_description}, 147 { XD_BLOCK_PTR, gtk_console, 1, { &gtk_frame_data_description} },
148 #endif 148 #endif
149 #ifdef HAVE_MS_WINDOWS 149 #ifdef HAVE_MS_WINDOWS
150 { XD_BLOCK_PTR, mswindows_console, 1, &mswindows_frame_data_description}, 150 { XD_BLOCK_PTR, mswindows_console, 1, { &mswindows_frame_data_description} },
151 #endif 151 #endif
152 #ifdef HAVE_X_WINDOWS 152 #ifdef HAVE_X_WINDOWS
153 { XD_BLOCK_PTR, x_console, 1, &x_frame_data_description}, 153 { XD_BLOCK_PTR, x_console, 1, { &x_frame_data_description} },
154 #endif 154 #endif
155 { XD_END } 155 { XD_END }
156 }; 156 };
157 157
158 static const struct sized_memory_description frame_data_description = { 158 static const struct sized_memory_description frame_data_description = {
161 161
162 extern const struct sized_memory_description expose_ignore_description; 162 extern const struct sized_memory_description expose_ignore_description;
163 163
164 static const struct memory_description expose_ignore_description_1 [] = { 164 static const struct memory_description expose_ignore_description_1 [] = {
165 { XD_BLOCK_PTR, offsetof (struct expose_ignore, next), 165 { XD_BLOCK_PTR, offsetof (struct expose_ignore, next),
166 1, &expose_ignore_description }, 166 1, { &expose_ignore_description } },
167 { XD_END } 167 { XD_END }
168 }; 168 };
169 169
170 const struct sized_memory_description expose_ignore_description = { 170 const struct sized_memory_description expose_ignore_description = {
171 sizeof (struct expose_ignore), 171 sizeof (struct expose_ignore),
172 expose_ignore_description_1 172 expose_ignore_description_1
173 }; 173 };
174 174
175 static const struct memory_description display_line_dynarr_pointer_description_1 []= { 175 static const struct memory_description display_line_dynarr_pointer_description_1 []= {
176 { XD_BLOCK_PTR, 0, 1, &display_line_dynarr_description}, 176 { XD_BLOCK_PTR, 0, 1, { &display_line_dynarr_description} },
177 { XD_END } 177 { XD_END }
178 }; 178 };
179 179
180 static const struct sized_memory_description display_line_dynarr_pointer_description = { 180 static const struct sized_memory_description display_line_dynarr_pointer_description = {
181 sizeof (display_line_dynarr *), display_line_dynarr_pointer_description_1 181 sizeof (display_line_dynarr *), display_line_dynarr_pointer_description_1
187 #define MARKED_SLOT_ARRAY(slot, size) \ 187 #define MARKED_SLOT_ARRAY(slot, size) \
188 { XD_LISP_OBJECT_ARRAY, offsetof (struct frame, slot), size }, 188 { XD_LISP_OBJECT_ARRAY, offsetof (struct frame, slot), size },
189 #include "frameslots.h" 189 #include "frameslots.h"
190 190
191 { XD_BLOCK_PTR, offsetof (struct frame, subwindow_exposures), 191 { XD_BLOCK_PTR, offsetof (struct frame, subwindow_exposures),
192 1, &expose_ignore_description }, 192 1, { &expose_ignore_description } },
193 { XD_BLOCK_PTR, offsetof (struct frame, subwindow_exposures_tail), 193 { XD_BLOCK_PTR, offsetof (struct frame, subwindow_exposures_tail),
194 1, &expose_ignore_description }, 194 1, { &expose_ignore_description } },
195 195
196 #ifdef HAVE_SCROLLBARS 196 #ifdef HAVE_SCROLLBARS
197 { XD_LISP_OBJECT, offsetof (struct frame, sb_vcache) }, 197 { XD_LISP_OBJECT, offsetof (struct frame, sb_vcache) },
198 { XD_LISP_OBJECT, offsetof (struct frame, sb_hcache) }, 198 { XD_LISP_OBJECT, offsetof (struct frame, sb_hcache) },
199 #endif /* HAVE_SCROLLBARS */ 199 #endif /* HAVE_SCROLLBARS */
200 200
201 { XD_BLOCK_ARRAY, offsetof (struct frame, current_display_lines), 201 { XD_BLOCK_ARRAY, offsetof (struct frame, current_display_lines),
202 4, &display_line_dynarr_pointer_description }, 202 4, { &display_line_dynarr_pointer_description } },
203 { XD_BLOCK_ARRAY, offsetof (struct frame, desired_display_lines), 203 { XD_BLOCK_ARRAY, offsetof (struct frame, desired_display_lines),
204 4, &display_line_dynarr_pointer_description }, 204 4, { &display_line_dynarr_pointer_description } },
205 205
206 { XD_BLOCK_PTR, offsetof (struct frame, framemeths), 1, 206 { XD_BLOCK_PTR, offsetof (struct frame, framemeths), 1,
207 &console_methods_description }, 207 { &console_methods_description } },
208 { XD_UNION, offsetof (struct frame, frame_data), 208 { XD_UNION, offsetof (struct frame, frame_data),
209 XD_INDIRECT (0, 0), &frame_data_description }, 209 XD_INDIRECT (0, 0), { &frame_data_description } },
210 { XD_END } 210 { XD_END }
211 }; 211 };
212 212
213 static Lisp_Object 213 static Lisp_Object
214 mark_frame (Lisp_Object obj) 214 mark_frame (Lisp_Object obj)