comparison src/device.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 9a775fb11bb7
children fdefd0186b75
comparison
equal deleted inserted replaced
616:4f1c7a4ac1e6 617:af57a77cbc92
69 struct lcrecord_header header; 69 struct lcrecord_header header;
70 70
71 /* Methods for this device's console. This can also be retrieved 71 /* Methods for this device's console. This can also be retrieved
72 through device->console, but it's faster this way. */ 72 through device->console, but it's faster this way. */
73 struct console_methods *devmeths; 73 struct console_methods *devmeths;
74
75 /* Name of this device, for resourcing and printing purposes.
76 If not explicitly given, it's initialized in a device-specific
77 manner. */
78 Lisp_Object name;
79
80 /* What this device is connected to */
81 Lisp_Object connection;
82
83 /* A canonical name for the connection that is used to determine
84 whether `make-device' is being called on an existing device. */
85 Lisp_Object canon_connection;
86
87 /* List of frames on this device. */
88 Lisp_Object frame_list;
89
90 /* The console this device is on. */
91 Lisp_Object console;
92
93 /* Frame which is "currently selected". This is what `selected-frame'
94 returns and is the default frame for many operations. This may
95 not be the same as frame_with_focus; `select-frame' changes the
96 selected_frame but not the frame_with_focus. However, eventually
97 either the two values will be the same, or frame_with_focus will
98 be nil: right before waiting for an event, the focus is changed
99 to point to the selected_frame if XEmacs currently has the focus
100 on this device. Note that frame_with_focus may be nil (none of the
101 frames on this device have the window-system focus), but
102 selected_frame will never be nil if there are any frames on
103 the device. */
104 Lisp_Object selected_frame;
105 /* Frame that currently contains the window-manager focus, or none.
106 Note that we've split frame_with_focus into two variables.
107 frame_with_focus_real is the value we use most of the time,
108 but frame_with_focus_for_hooks is used for running the select-frame-hook
109 and deselect-frame-hook. We do this because we split the focus handling
110 into two parts: one part (deals with drawing the solid/box cursor)
111 runs as soon as a focus event is received; the other (running the
112 hooks) runs after any pending sit-for/sleep-for/accept-process-output
113 calls are done. */
114 Lisp_Object frame_with_focus_real;
115 Lisp_Object frame_with_focus_for_hooks;
116 /* If we have recently issued a request to change the focus as a
117 result of select-frame having been called, the following variable
118 records the frame we are trying to focus on. The reason for this
119 is that the window manager may not grant our request to change
120 the focus (so we can't just change frame_with_focus), and we don't
121 want to keep sending requests again and again to the window manager.
122 This variable is reset whenever a focus-change event is seen. */
123 Lisp_Object frame_that_ought_to_have_focus;
124
125 /* Color class of this device. */
126 Lisp_Object device_class;
127
128 /* Alist of values for user-defined tags in this device. */
129 Lisp_Object user_defined_tags;
130
131 /* Hash tables for device-specific objects (fonts, colors, etc).
132 These are key-weak hash tables (or hash tables containing key-weak
133 hash tables) so that they disappear when the key goes away. */
134
135 /* This is a simple key-weak hash table hashing color names to
136 instances. */
137 Lisp_Object color_instance_cache;
138
139 /* This is a simple key-weak hash table hashing font names to
140 instances. */
141 Lisp_Object font_instance_cache;
142
143 #ifdef MULE
144 /* This is a bi-level cache, where the hash table in this slot here
145 indexes charset objects to key-weak hash tables, which in turn
146 index font names to more specific font names that match the
147 given charset's registry. This speeds up the horrendously
148 slow XListFonts() operation that needs to be done in order
149 to determine an appropriate font. */
150 Lisp_Object charset_font_cache;
151 #endif
152
153 /* This is a bi-level cache, where the hash table in this slot here
154 indexes image-instance-type masks (there are currently 6
155 image-instance types and thus 64 possible masks) to key-weak hash
156 tables like the one for colors. */
157 Lisp_Object image_instance_cache;
158 74
159 /* A structure of auxiliary data specific to the device type. 75 /* A structure of auxiliary data specific to the device type.
160 struct x_device is used for X window frames; defined in console-x.h 76 struct x_device is used for X window frames; defined in console-x.h
161 struct tty_device is used to TTY's; defined in console-tty.h */ 77 struct tty_device is used to TTY's; defined in console-tty.h */
162 void *device_data; 78 void *device_data;
194 110
195 /* sound flags */ 111 /* sound flags */
196 unsigned int on_console_p :1; 112 unsigned int on_console_p :1;
197 unsigned int connected_to_nas_p :1; 113 unsigned int connected_to_nas_p :1;
198 114
115 #define MARKED_SLOT(x) Lisp_Object x
116 #include "devslots.h"
199 117
200 /* File descriptors for input and output. Much of the time 118 /* File descriptors for input and output. Much of the time
201 (but not always) these will be the same. For an X device, 119 (but not always) these will be the same. For an X device,
202 these both hold the file descriptor of the socket used 120 these both hold the file descriptor of the socket used
203 to communicate with the X server. For a TTY device, these 121 to communicate with the X server. For a TTY device, these
219 }; 137 };
220 138
221 DECLARE_LRECORD (device, struct device); 139 DECLARE_LRECORD (device, struct device);
222 #define XDEVICE(x) XRECORD (x, device, struct device) 140 #define XDEVICE(x) XRECORD (x, device, struct device)
223 #define XSETDEVICE(x, p) XSETRECORD (x, p, device) 141 #define XSETDEVICE(x, p) XSETRECORD (x, p, device)
224 #define wrap_device(p) wrap_object (p) 142 #define wrap_device(p) wrap_record (p, device)
225 #define DEVICEP(x) RECORDP (x, device) 143 #define DEVICEP(x) RECORDP (x, device)
226 #define CHECK_DEVICE(x) CHECK_RECORD (x, device) 144 #define CHECK_DEVICE(x) CHECK_RECORD (x, device)
227 #define CONCHECK_DEVICE(x) CONCHECK_RECORD (x, device) 145 #define CONCHECK_DEVICE(x) CONCHECK_RECORD (x, device)
228 146
229 #define CHECK_LIVE_DEVICE(x) do { \ 147 #define CHECK_LIVE_DEVICE(x) do { \