comparison src/winslots.h @ 617:af57a77cbc92

[xemacs-hg @ 2001-06-18 07:09:50 by ben] --------------------------------------------------------------- DOCUMENTATION FIXES: --------------------------------------------------------------- eval.c: Correct documentation. elhash.c: Doc correction. --------------------------------------------------------------- LISP OBJECT CLEANUP: --------------------------------------------------------------- bytecode.h, buffer.h, casetab.h, chartab.h, console-msw.h, console.h, database.c, device.h, eldap.h, elhash.h, events.h, extents.h, faces.h, file-coding.h, frame.h, glyphs.h, gui-x.h, gui.h, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lrecord.h, lstream.h, mule-charset.h, objects.h, opaque.h, postgresql.h, process.h, rangetab.h, specifier.h, toolbar.h, tooltalk.h, ui-gtk.h: Add wrap_* to all objects (it was already there for a few of them) -- an expression to encapsulate a pointer into a Lisp object, rather than the inconvenient XSET*. "wrap" was chosen because "make" as in make_int(), make_char() is not appropriate. (It implies allocation. The issue does not exist for ints and chars because they are not allocated.) Full error checking has been added to these expressions. When used without error checking, non-union build, use of these expressions will incur no loss of efficiency. (In fact, XSET* is now defined in terms of wrap_* in a non-union build.) In a union build, you will also get no loss of efficiency provided that you have a decent optimizing compiler, and a compiler that either understands inlines or automatically inlines those particular functions. (And since people don't normally do their production builds on union, it doesn't matter.) Update the sample Lisp object definition in lrecord.h accordingly. dumper.c: Fix places in dumper that referenced wrap_object to reference its new name, wrap_pointer_1. buffer.c, bufslots.h, conslots.h, console.c, console.h, devslots.h, device.c, device.h, frame.c, frame.h, frameslots.h, window.c, window.h, winslots.h: -- Extract out the Lisp objects of `struct device' into devslots.h, just like for the other structures. -- Extract out the remaining (not copied into the window config) Lisp objects in `struct window' into winslots.h; use different macros (WINDOW_SLOT vs. WINDOW_SAVED_SLOT) to differentiate them. -- Eliminate the `dead' flag of `struct frame', since it duplicates information already available in `framemeths', and fix FRAME_LIVE_P accordingly. (Devices and consoles already work this way.) -- In *slots.h, switch to system where MARKED_SLOT is automatically undef'd at the end of the file. (Follows what winslots.h already does.) -- Update the comments at the beginning of *slots.h to be accurate. -- When making any of the above objects dead, zero it out entirely and reset all Lisp object slots to Qnil. (We were already doing this somewhat, but not consistently.) This (1) Eliminates the possibility of extra objects hanging around that ought to be GC'd, (2) Causes an immediate crash if anyone tries to access a structure in one of these objects, (3) Ensures consistent behavior wrt dead objects. dialog-msw.c: Use internal_object_printer, since this object should not escape. --------------------------------------------------------------- FIXING A CRASH THAT I HIT ONCE (AND A RELATED BAD BEHAVIOR): --------------------------------------------------------------- eval.c: Fix up some comments about the FSF implementation. Fix two nasty bugs: (1) condition_case_unwind frees the conses sitting in the catch->tag slot too quickly, resulting in a crash that I hit. (2) catches need to be unwound one at a time when calling unwind-protect code, rather than all at once at the end; otherwise, incorrect behavior can result. (A comment shows exactly how.) backtrace.h: Improve comment about FSF differences in the handler stack. --------------------------------------------------------------- FIXING A CRASH THAT I REPEATEDLY HIT WHEN USING THE MOUSE WHEEL UNDER MSWINDOWS: --------------------------------------------------------------- Basic idea: My crash is due either to a dead, non-marked, GC-collected frame inside of a window mirror, or a prematurely freed window mirror. We need to mark the Lisp objects inside of window mirrors. Tracking the lifespan of window mirrors and scrollbar instances is extremely hard, and there may well be lurking bugs where such objects are freed too soon. The only safe way to fix these problems (and it fixes both problems at once) is to make both of these structures Lisp objects. lrecord.h, emacs.c, inline.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, symsinit.h: Make scrollbar instances actual Lisp objects. Mark the window mirrors in them. inline.c needs to know about scrollbar.h now. Record the new type in lrecord.h. Fix up scrollbar-*.c appropriately. Create a hash table in scrollbar-msw.c so that the scrollbar instances stored in scrollbar HWND's are properly GC-protected. Create complex_vars_of_scrollbar_mswindows() to create the hash table at startup, and call it from emacs.c. Don't store the scrollbar instance as a property of the GTK scrollbar, as it's not used and if we did this, we'd have to separately GC-protect it in a hash table, like in MS Windows. lrecord.h, frame.h, frame.c, frameslots.h, redisplay.c, window.c, window.h: Move mark_window_mirror from redisplay.c to window.c. Make window mirrors actual Lisp objects. Tell lrecord.h about them. Change the window mirror member of struct frame from a pointer to a Lisp object, and add XWINDOW_MIRROR in appropriate places. Mark the scrollbar instances in the window mirror. redisplay.c, redisplay.h, alloc.c: Delete mark_redisplay. Don't call mark_redisplay. We now mark frame-specific structures in mark_frame. NOTE: I also deleted an extremely questionable call to update_frame_window_mirrors(). It was extremely questionable before, and now totally impossible, since it will create Lisp objects during redisplay. frame.c: Mark the scrollbar instances, which are now Lisp objects. Call mark_gutter() here, not in mark_redisplay(). gutter.c: Update comments about correct marking. --------------------------------------------------------------- ISSUES BROUGHT UP BY MARTIN: --------------------------------------------------------------- buffer.h: Put back these macros the way Steve T and I think they ought to be. I already explained in a previous changelog entry why I think these macros should be the way I'd defined them. Once again: We fix these macros so they don't care about the type of their lvalues. The non-C-string equivalents of these already function in the same way, and it's correct because it should be OK to pass in a CBufbyte *, a BufByte *, a Char_Binary *, an UChar_Binary *, etc. The whole reason for these different types is to work around errors caused by signed-vs-unsigned non-matching types. Any possible error that might be caught in a DFC macro would also be caught wherever the argument is used elsewhere. So creating multiple macro versions would add no useful error-checking and just further complicate an already complicated area. As for Martin's "ANSI aliasing" bug, XEmacs is not ANSI-aliasing clean and probably never will be. Unless the board agrees to change XEmacs in this way (and we really don't want to go down that road), this is not a bug. sound.h: Undo Martin's type change. signal.c: Fix problem identified by Martin with Linux and g++ due to non-standard declaration of setitimer(). systime.h: Update the docs for "qxe_" to point out why making the encapsulation explicit is always the right way to go. (setitimer() itself serves as an example.) For 21.4: update-elc-2.el: Correct misplaced parentheses, making lisp/mule not get recompiled.
author ben
date Mon, 18 Jun 2001 07:10:32 +0000
parents abe6d1db359e
children 8ae895c67ce7
comparison
equal deleted inserted replaced
616:4f1c7a4ac1e6 617:af57a77cbc92
1 /* Definitions of marked slots in windows and window configs 1 /* Definitions of marked slots in windows and window configs
2 Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. 2 Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
3 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. 3 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois.
4 Copyright (C) 1995, 1996 Ben Wing. 4 Copyright (C) 1995, 1996, 2001 Ben Wing.
5 Copyright (C) 1996 Chuck Thompson. 5 Copyright (C) 1996 Chuck Thompson.
6 6
7 This file is part of XEmacs. 7 This file is part of XEmacs.
8 8
9 XEmacs is free software; you can redistribute it and/or modify it 9 XEmacs is free software; you can redistribute it and/or modify it
22 Boston, MA 02111-1307, USA. */ 22 Boston, MA 02111-1307, USA. */
23 23
24 /* Split out of window.h and window.c 24 /* Split out of window.h and window.c
25 by Kirill Katsnelson <kkm@kis.ru>, May 1998 */ 25 by Kirill Katsnelson <kkm@kis.ru>, May 1998 */
26 26
27 /* Separation into WINDOW_SLOT / WINDOW_SAVED_SLOT by Ben Wing, June 2001.
28
29 NOTE: No semicolons after slot declarations in this file! The
30 definitions of WINDOW_SLOT (and possibly WINDOW_SAVED_SLOT) need
31 to include a semicolon.
32
33 WINDOW_SLOT declares a Lisp_Object that is not copied into the
34 saved_window struct of a window configuration, or is handled in
35 a special way in window configurations.
36 WINDOW_SLOT_ARRAY is the same for an array of Lisp_Objects.
37 WINDOW_SAVED_SLOT declares a Lisp_Object that is copied with no
38 special handling into the saved_window struct of a window
39 configuration. You must also declare the comparison function,
40 either EQ or EQUAL_WRAPPED (i.e. Feq() or Fequal()).
41 WINDOW_SAVED_SLOT_ARRAY is the same for an array of Lisp_Objects.
42
43 Callers should define WINDOW_SLOT (with a terminating semicolon if
44 not blank), and WINDOW_SAVED_SLOT if different; otherwise the
45 latter will be defined using WINDOW_SLOT. Callers do not define
46 the _ARRAY versions. Instead, they either do or do not define
47 WINDOW_SLOT_DECLARATION. It should be defined in the definition of
48 a struct and not elsewhere.
49
50 Callers do not need to undefine these definitions; it is done
51 automatically.
52 */
53
54 #ifndef WINDOW_SAVED_SLOT
55 #define WINDOW_SAVED_SLOT(slot, compare) WINDOW_SLOT (slot)
56 #endif
57
27 #ifdef WINDOW_SLOT_DECLARATION 58 #ifdef WINDOW_SLOT_DECLARATION
28 #define WINDOW_SLOT_ARRAY(slot, size, compare) WINDOW_SLOT (slot[size], compare) 59 #define WINDOW_SLOT_ARRAY(slot, size) WINDOW_SLOT (slot[size])
60 #define WINDOW_SAVED_SLOT_ARRAY(slot, size, compare) \
61 WINDOW_SAVED_SLOT (slot[size], compare)
29 #else 62 #else
30 #define WINDOW_SLOT_ARRAY(slot, size, compare) do { \ 63 #define WINDOW_SLOT_ARRAY(slot, size) do { \
31 int wsaidx; \ 64 int wsaidx; \
32 for (wsaidx = 0; wsaidx < size; wsaidx++) \ 65 for (wsaidx = 0; wsaidx < size; wsaidx++) \
33 { \ 66 { \
34 WINDOW_SLOT (slot[wsaidx], compare); \ 67 WINDOW_SLOT (slot[wsaidx]); \
35 } \ 68 } \
36 } while (0); 69 } while (0);
37 #endif 70 #define WINDOW_SAVED_SLOT_ARRAY(slot, size, compare) do { \
71 int wsaidx; \
72 for (wsaidx = 0; wsaidx < size; wsaidx++) \
73 { \
74 WINDOW_SAVED_SLOT (slot[wsaidx], compare); \
75 } \
76 } while (0);
77 #endif /* WINDOW_SLOT_DECLARATION */
38 78
39 #define EQUAL_WRAPPED(x,y) internal_equal ((x), (y), 0) 79 #define EQUAL_WRAPPED(x,y) internal_equal ((x), (y), 0)
40 80
81
82 /* The frame this window is on. */
83 WINDOW_SLOT (frame)
84 /* t if this window is a minibuffer window. */
85 WINDOW_SLOT (mini_p)
86 /* Following child (to right or down) at same level of tree */
87 WINDOW_SLOT (next)
88 /* Preceding child (to left or up) at same level of tree */
89 WINDOW_SLOT (prev)
90 /* First child of this window. */
91 /* vchild is used if this is a vertical combination,
92 hchild if this is a horizontal combination. */
93 WINDOW_SLOT (hchild)
94 WINDOW_SLOT (vchild)
95 /* The window this one is a child of. */
96 WINDOW_SLOT (parent)
97
98 /* The buffer displayed in this window */
99 /* Of the fields vchild, hchild and buffer, only one is non-nil. */
100 WINDOW_SLOT (buffer)
101 /* A marker pointing to where in the text to start displaying */
102 /* need one for each set of display structures */
103 WINDOW_SLOT_ARRAY (start, 3)
104 /* A marker pointing to where in the text point is in this window,
105 used only when the window is not selected.
106 This exists so that when multiple windows show one buffer
107 each one can have its own value of point. */
108 /* need one for each set of display structures */
109 WINDOW_SLOT_ARRAY (pointm, 3)
110 /* A marker pointing to where in the text the scrollbar is pointing;
111 #### moved to scrollbar.c? */
112 WINDOW_SLOT (sb_point)
113
114 /* Number saying how recently window was selected */
115 WINDOW_SLOT (use_time)
116 /* text.modified of displayed buffer as of last time display completed */
117 WINDOW_SLOT_ARRAY (last_modified, 3)
118 /* Value of point at that time */
119 WINDOW_SLOT_ARRAY (last_point, 3)
120 /* Value of start at that time */
121 WINDOW_SLOT_ARRAY (last_start, 3)
122 /* buf.face_change as of last time display completed */
123 WINDOW_SLOT_ARRAY (last_facechange, 3)
124
125 /* we cannot have a per-device cache of widgets / subwindows because
126 each visible instance needs to be a separate instance. The lowest
127 level of granularity we can get easily is the window that the
128 subwindow is in. This will fail if we attach the same subwindow
129 twice to a buffer. However, we are quite unlikely to do this,
130 especially with buttons which will need individual callbacks. The
131 proper solution is probably not worth the effort. */
132 WINDOW_SLOT (subwindow_instance_cache)
133
134 WINDOW_SLOT (line_cache_last_updated)
135
136 /* If redisplay in this window goes beyond this buffer position,
137 must run the redisplay-end-trigger-functions. */
138 WINDOW_SLOT (redisplay_end_trigger)
139
41 /*** Non-specifier vars of window and window config ***/ 140 /*** Non-specifier vars of window and window config ***/
42 141
43 /* Non-nil means window is marked as dedicated. */ 142 /* Non-nil means window is marked as dedicated. */
44 WINDOW_SLOT (dedicated, EQ); 143 WINDOW_SAVED_SLOT (dedicated, EQ)
45 144
46 /*** specifier values cached in the struct window ***/ 145 /*** specifier values cached in the struct window ***/
47 146
48 /* Display-table to use for displaying chars in this window. */ 147 /* Display-table to use for displaying chars in this window. */
49 WINDOW_SLOT (display_table, EQUAL_WRAPPED); 148 WINDOW_SAVED_SLOT (display_table, EQUAL_WRAPPED)
50 /* Thickness of modeline shadow, in pixels. If negative, draw 149 /* Thickness of modeline shadow, in pixels. If negative, draw
51 as recessed. */ 150 as recessed. */
52 WINDOW_SLOT (modeline_shadow_thickness, EQ); 151 WINDOW_SAVED_SLOT (modeline_shadow_thickness, EQ)
53 /* Non-nil means to display a modeline for the buffer. */ 152 /* Non-nil means to display a modeline for the buffer. */
54 WINDOW_SLOT (has_modeline_p, EQ); 153 WINDOW_SAVED_SLOT (has_modeline_p, EQ)
55 /* Thickness of vertical divider shadow, in pixels. If negative, draw as 154 /* Thickness of vertical divider shadow, in pixels. If negative, draw as
56 recessed. */ 155 recessed. */
57 WINDOW_SLOT (vertical_divider_shadow_thickness, EQ); 156 WINDOW_SAVED_SLOT (vertical_divider_shadow_thickness, EQ)
58 /* Divider surface width (not counting 3-d borders) */ 157 /* Divider surface width (not counting 3-d borders) */
59 WINDOW_SLOT (vertical_divider_line_width, EQ); 158 WINDOW_SAVED_SLOT (vertical_divider_line_width, EQ)
60 /* Spacing between outer edge of divider border and window edge */ 159 /* Spacing between outer edge of divider border and window edge */
61 WINDOW_SLOT (vertical_divider_spacing, EQ); 160 WINDOW_SAVED_SLOT (vertical_divider_spacing, EQ)
62 /* Whether vertical dividers are always displayed */ 161 /* Whether vertical dividers are always displayed */
63 WINDOW_SLOT (vertical_divider_always_visible_p, EQ); 162 WINDOW_SAVED_SLOT (vertical_divider_always_visible_p, EQ)
64 163
65 #ifdef HAVE_SCROLLBARS 164 #ifdef HAVE_SCROLLBARS
66 /* Width of vertical scrollbars. */ 165 /* Width of vertical scrollbars. */
67 WINDOW_SLOT (scrollbar_width, EQ); 166 WINDOW_SAVED_SLOT (scrollbar_width, EQ)
68 /* Height of horizontal scrollbars. */ 167 /* Height of horizontal scrollbars. */
69 WINDOW_SLOT (scrollbar_height, EQ); 168 WINDOW_SAVED_SLOT (scrollbar_height, EQ)
70 /* Whether the scrollbars are visible */ 169 /* Whether the scrollbars are visible */
71 WINDOW_SLOT (horizontal_scrollbar_visible_p, EQ); 170 WINDOW_SAVED_SLOT (horizontal_scrollbar_visible_p, EQ)
72 WINDOW_SLOT (vertical_scrollbar_visible_p, EQ); 171 WINDOW_SAVED_SLOT (vertical_scrollbar_visible_p, EQ)
73 /* Scrollbar positions */ 172 /* Scrollbar positions */
74 WINDOW_SLOT (scrollbar_on_left_p, EQ); 173 WINDOW_SAVED_SLOT (scrollbar_on_left_p, EQ)
75 WINDOW_SLOT (scrollbar_on_top_p, EQ); 174 WINDOW_SAVED_SLOT (scrollbar_on_top_p, EQ)
76 /* Pointer to use for vertical and horizontal scrollbars. */ 175 /* Pointer to use for vertical and horizontal scrollbars. */
77 WINDOW_SLOT (scrollbar_pointer, EQ); 176 WINDOW_SAVED_SLOT (scrollbar_pointer, EQ)
78 #endif /* HAVE_SCROLLBARS */ 177 #endif /* HAVE_SCROLLBARS */
79 #ifdef HAVE_TOOLBARS 178 #ifdef HAVE_TOOLBARS
80 /* Toolbar specification for each of the four positions. 179 /* Toolbar specification for each of the four positions.
81 This is not a size hog because the value here is not copied, 180 This is not a size hog because the value here is not copied,
82 and will be shared with the specs in the specifier. */ 181 and will be shared with the specs in the specifier. */
83 WINDOW_SLOT_ARRAY (toolbar, 4, EQUAL_WRAPPED); 182 WINDOW_SAVED_SLOT_ARRAY (toolbar, 4, EQUAL_WRAPPED)
84 /* Toolbar size for each of the four positions. */ 183 /* Toolbar size for each of the four positions. */
85 WINDOW_SLOT_ARRAY (toolbar_size, 4, EQUAL_WRAPPED); 184 WINDOW_SAVED_SLOT_ARRAY (toolbar_size, 4, EQUAL_WRAPPED)
86 /* Toolbar border width for each of the four positions. */ 185 /* Toolbar border width for each of the four positions. */
87 WINDOW_SLOT_ARRAY (toolbar_border_width, 4, EQUAL_WRAPPED); 186 WINDOW_SAVED_SLOT_ARRAY (toolbar_border_width, 4, EQUAL_WRAPPED)
88 /* Toolbar visibility status for each of the four positions. */ 187 /* Toolbar visibility status for each of the four positions. */
89 WINDOW_SLOT_ARRAY (toolbar_visible_p, 4, EQUAL_WRAPPED); 188 WINDOW_SAVED_SLOT_ARRAY (toolbar_visible_p, 4, EQUAL_WRAPPED)
90 /* Caption status of toolbar. */ 189 /* Caption status of toolbar. */
91 WINDOW_SLOT (toolbar_buttons_captioned_p, EQ); 190 WINDOW_SAVED_SLOT (toolbar_buttons_captioned_p, EQ)
92 /* The following five don't really need to be cached except 191 /* The following five don't really need to be cached except
93 that we need to know when they've changed. */ 192 that we need to know when they've changed. */
94 WINDOW_SLOT (default_toolbar, EQUAL_WRAPPED); 193 WINDOW_SAVED_SLOT (default_toolbar, EQUAL_WRAPPED)
95 WINDOW_SLOT (default_toolbar_width, EQ); 194 WINDOW_SAVED_SLOT (default_toolbar_width, EQ)
96 WINDOW_SLOT (default_toolbar_height, EQ); 195 WINDOW_SAVED_SLOT (default_toolbar_height, EQ)
97 WINDOW_SLOT (default_toolbar_visible_p, EQ); 196 WINDOW_SAVED_SLOT (default_toolbar_visible_p, EQ)
98 WINDOW_SLOT (default_toolbar_border_width, EQ); 197 WINDOW_SAVED_SLOT (default_toolbar_border_width, EQ)
99 #endif /* HAVE_TOOLBARS */ 198 #endif /* HAVE_TOOLBARS */
100 199
101 /* Gutter specification for each of the four positions. 200 /* Gutter specification for each of the four positions.
102 This is not a size hog because the value here is not copied, 201 This is not a size hog because the value here is not copied,
103 and will be shared with the specs in the specifier. */ 202 and will be shared with the specs in the specifier. */
104 WINDOW_SLOT_ARRAY (gutter, 4, EQUAL_WRAPPED); 203 WINDOW_SAVED_SLOT_ARRAY (gutter, 4, EQUAL_WRAPPED)
105 /* Real (pre-calculated) gutter specification for each of the four positions. 204 /* Real (pre-calculated) gutter specification for each of the four positions.
106 This is not a specifier, it is calculated by the specifier change 205 This is not a specifier, it is calculated by the specifier change
107 functions. */ 206 functions. */
108 WINDOW_SLOT_ARRAY (real_gutter, 4, EQUAL_WRAPPED); 207 WINDOW_SAVED_SLOT_ARRAY (real_gutter, 4, EQUAL_WRAPPED)
109 /* Gutter size for each of the four positions. */ 208 /* Gutter size for each of the four positions. */
110 WINDOW_SLOT_ARRAY (gutter_size, 4, EQUAL_WRAPPED); 209 WINDOW_SAVED_SLOT_ARRAY (gutter_size, 4, EQUAL_WRAPPED)
111 /* Real (pre-calculated) gutter size for each of the four positions. 210 /* Real (pre-calculated) gutter size for each of the four positions.
112 This is not a specifier, it is calculated by the specifier change 211 This is not a specifier, it is calculated by the specifier change
113 functions. */ 212 functions. */
114 WINDOW_SLOT_ARRAY (real_gutter_size, 4, EQUAL_WRAPPED); 213 WINDOW_SAVED_SLOT_ARRAY (real_gutter_size, 4, EQUAL_WRAPPED)
115 /* Gutter border width for each of the four positions. */ 214 /* Gutter border width for each of the four positions. */
116 WINDOW_SLOT_ARRAY (gutter_border_width, 4, EQUAL_WRAPPED); 215 WINDOW_SAVED_SLOT_ARRAY (gutter_border_width, 4, EQUAL_WRAPPED)
117 /* Gutter visibility status for each of the four positions. */ 216 /* Gutter visibility status for each of the four positions. */
118 WINDOW_SLOT_ARRAY (gutter_visible_p, 4, EQUAL_WRAPPED); 217 WINDOW_SAVED_SLOT_ARRAY (gutter_visible_p, 4, EQUAL_WRAPPED)
119 /* The following five don't really need to be cached except 218 /* The following five don't really need to be cached except
120 that we need to know when they've changed. */ 219 that we need to know when they've changed. */
121 WINDOW_SLOT (default_gutter, EQUAL_WRAPPED); 220 WINDOW_SAVED_SLOT (default_gutter, EQUAL_WRAPPED)
122 WINDOW_SLOT (default_gutter_width, EQ); 221 WINDOW_SAVED_SLOT (default_gutter_width, EQ)
123 WINDOW_SLOT (default_gutter_height, EQ); 222 WINDOW_SAVED_SLOT (default_gutter_height, EQ)
124 WINDOW_SLOT (default_gutter_visible_p, EQ); 223 WINDOW_SAVED_SLOT (default_gutter_visible_p, EQ)
125 WINDOW_SLOT (default_gutter_border_width, EQ); 224 WINDOW_SAVED_SLOT (default_gutter_border_width, EQ)
126 /* margins */ 225 /* margins */
127 WINDOW_SLOT (left_margin_width, EQ); 226 WINDOW_SAVED_SLOT (left_margin_width, EQ)
128 WINDOW_SLOT (right_margin_width, EQ); 227 WINDOW_SAVED_SLOT (right_margin_width, EQ)
129 WINDOW_SLOT (minimum_line_ascent, EQ); 228 WINDOW_SAVED_SLOT (minimum_line_ascent, EQ)
130 WINDOW_SLOT (minimum_line_descent, EQ); 229 WINDOW_SAVED_SLOT (minimum_line_descent, EQ)
131 WINDOW_SLOT (use_left_overflow, EQ); 230 WINDOW_SAVED_SLOT (use_left_overflow, EQ)
132 WINDOW_SLOT (use_right_overflow, EQ); 231 WINDOW_SAVED_SLOT (use_right_overflow, EQ)
133 #ifdef HAVE_MENUBARS 232 #ifdef HAVE_MENUBARS
134 /* Visibility of menubar. */ 233 /* Visibility of menubar. */
135 WINDOW_SLOT (menubar_visible_p, EQ); 234 WINDOW_SAVED_SLOT (menubar_visible_p, EQ)
136 #endif /* HAVE_MENUBARS */ 235 #endif /* HAVE_MENUBARS */
137 WINDOW_SLOT (text_cursor_visible_p, EQ); 236 WINDOW_SAVED_SLOT (text_cursor_visible_p, EQ)
138 237
139 /* Hara-kiri */ 238 /* Hara-kiri */
140 #undef EQUAL_WRAPPED 239 #undef EQUAL_WRAPPED
141 #undef WINDOW_SLOT_DECLARATION 240 #undef WINDOW_SLOT_DECLARATION
142 #undef WINDOW_SLOT 241 #undef WINDOW_SLOT
143 #undef WINDOW_SLOT_ARRAY 242 #undef WINDOW_SLOT_ARRAY
243 #undef WINDOW_SAVED_SLOT
244 #undef WINDOW_SAVED_SLOT_ARRAY