comparison src/frame.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 0784d089fdc9
children b39c14581166
comparison
equal deleted inserted replaced
616:4f1c7a4ac1e6 617:af57a77cbc92
85 just inside the window's border. It is normally only non-zero on 85 just inside the window's border. It is normally only non-zero on
86 X frames, but we put it here to avoid introducing window system 86 X frames, but we put it here to avoid introducing window system
87 dependencies. */ 87 dependencies. */
88 int internal_border_width; 88 int internal_border_width;
89 89
90 /* This frame's root window mirror. This structure exactly mirrors
91 the frame's window structure but contains only pointers to the
92 display structures. */
93 struct window_mirror *root_mirror;
94
95 int modiff; 90 int modiff;
96 91
97 struct expose_ignore* subwindow_exposures; 92 struct expose_ignore *subwindow_exposures;
98 struct expose_ignore* subwindow_exposures_tail; 93 struct expose_ignore *subwindow_exposures_tail;
99 94
100 #ifdef HAVE_SCROLLBARS 95 #ifdef HAVE_SCROLLBARS
101 /* frame-local scrollbar information. See scrollbar.c. */ 96 /* frame-local scrollbar information. See scrollbar.c. */
102 int scrollbar_y_offset; 97 int scrollbar_y_offset;
103 98
148 /* Are we finished initializing? */ 143 /* Are we finished initializing? */
149 unsigned int init_finished :1; 144 unsigned int init_finished :1;
150 145
151 /* Is frame marked for deletion? This is used in XSetErrorHandler(). */ 146 /* Is frame marked for deletion? This is used in XSetErrorHandler(). */
152 unsigned int being_deleted :1; 147 unsigned int being_deleted :1;
153
154 /* Nonzero if this frame has been destroyed. */
155 unsigned int dead :1;
156 148
157 /* Nonzero if last attempt at redisplay on this frame was preempted. */ 149 /* Nonzero if last attempt at redisplay on this frame was preempted. */
158 unsigned int display_preempted :1; 150 unsigned int display_preempted :1;
159 151
160 /* Nonzero if window is currently iconified. 152 /* Nonzero if window is currently iconified.
243 235
244 236
245 DECLARE_LRECORD (frame, struct frame); 237 DECLARE_LRECORD (frame, struct frame);
246 #define XFRAME(x) XRECORD (x, frame, struct frame) 238 #define XFRAME(x) XRECORD (x, frame, struct frame)
247 #define XSETFRAME(x, p) XSETRECORD (x, p, frame) 239 #define XSETFRAME(x, p) XSETRECORD (x, p, frame)
248 #define wrap_frame(p) wrap_object (p) 240 #define wrap_frame(p) wrap_record (p, frame)
249 #define FRAMEP(x) RECORDP (x, frame) 241 #define FRAMEP(x) RECORDP (x, frame)
250 #define CHECK_FRAME(x) CHECK_RECORD (x, frame) 242 #define CHECK_FRAME(x) CHECK_RECORD (x, frame)
251 #define CONCHECK_FRAME(x) CONCHECK_RECORD (x, frame) 243 #define CONCHECK_FRAME(x) CONCHECK_RECORD (x, frame)
252 244
253 #define CHECK_LIVE_FRAME(x) do { \ 245 #define CHECK_LIVE_FRAME(x) do { \
503 } while (0) 495 } while (0)
504 496
505 #define SET_FRAME_CLEAR(f) MARK_FRAME_CHANGED (f); (f)->clear = 1 497 #define SET_FRAME_CLEAR(f) MARK_FRAME_CHANGED (f); (f)->clear = 1
506 #define FRAME_DEVICE(f) ((f)->device) 498 #define FRAME_DEVICE(f) ((f)->device)
507 #define FRAME_CONSOLE(f) DEVICE_CONSOLE (XDEVICE (FRAME_DEVICE (f))) 499 #define FRAME_CONSOLE(f) DEVICE_CONSOLE (XDEVICE (FRAME_DEVICE (f)))
508 #define FRAME_LIVE_P(f) (!(f)->dead) 500 #define FRAME_LIVE_P(f) (!EQ (FRAME_TYPE (f), Qdead))
509 501
510 #define FRAME_MINIBUF_ONLY_P(f) \ 502 #define FRAME_MINIBUF_ONLY_P(f) \
511 EQ (FRAME_ROOT_WINDOW (f), FRAME_MINIBUF_WINDOW (f)) 503 EQ (FRAME_ROOT_WINDOW (f), FRAME_MINIBUF_WINDOW (f))
512 #define FRAME_HAS_MINIBUF_P(f) ((f)->has_minibuffer) 504 #define FRAME_HAS_MINIBUF_P(f) ((f)->has_minibuffer)
513 #define FRAME_HEIGHT(f) ((f)->height) 505 #define FRAME_HEIGHT(f) ((f)->height)