Mercurial > hg > xemacs-beta
annotate src/devslots.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 | |
children | 79c6ff3eef26 |
rev | line source |
---|---|
617 | 1 /* Definitions of marked slots in consoles |
2 Copyright (C) 1990, 1992, 1993 Free Software Foundation, Inc. | |
3 | |
4 This file is part of XEmacs. | |
5 | |
6 XEmacs is free software; you can redistribute it and/or modify it | |
7 under the terms of the GNU General Public License as published by the | |
8 Free Software Foundation; either version 2, or (at your option) any | |
9 later version. | |
10 | |
11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
14 for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with XEmacs; see the file COPYING. If not, write to | |
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
19 Boston, MA 02111-1307, USA. */ | |
20 | |
21 /* Synched up with: Not in FSF. */ | |
22 | |
23 /* We define the Lisp_Objects in the device structure in a separate file | |
24 because there are numerous places we want to iterate over them, such | |
25 as when defining them in the structure, initializing them, or marking | |
26 them. | |
27 | |
28 To use, define MARKED_SLOT before including this file. In the structure | |
29 definition, you also need to define FRAME_SLOT_DECLARATION. No need to | |
30 undefine either value; that happens automatically. */ | |
31 | |
32 /* Name of this device, for resourcing and printing purposes. | |
33 If not explicitly given, it's initialized in a device-specific | |
34 manner. */ | |
35 MARKED_SLOT (name); | |
36 | |
37 /* What this device is connected to */ | |
38 MARKED_SLOT (connection); | |
39 | |
40 /* A canonical name for the connection that is used to determine | |
41 whether `make-device' is being called on an existing device. */ | |
42 MARKED_SLOT (canon_connection); | |
43 | |
44 /* List of frames on this device. */ | |
45 MARKED_SLOT (frame_list); | |
46 | |
47 /* The console this device is on. */ | |
48 MARKED_SLOT (console); | |
49 | |
50 /* Frame which is "currently selected". This is what `selected-frame' | |
51 returns and is the default frame for many operations. This may | |
52 not be the same as frame_with_focus; `select-frame' changes the | |
53 selected_frame but not the frame_with_focus. However, eventually | |
54 either the two values will be the same, or frame_with_focus will | |
55 be nil: right before waiting for an event, the focus is changed | |
56 to point to the selected_frame if XEmacs currently has the focus | |
57 on this device. Note that frame_with_focus may be nil (none of the | |
58 frames on this device have the window-system focus), but | |
59 selected_frame will never be nil if there are any frames on | |
60 the device. */ | |
61 MARKED_SLOT (selected_frame); | |
62 /* Frame that currently contains the window-manager focus, or none. | |
63 Note that we've split frame_with_focus into two variables. | |
64 frame_with_focus_real is the value we use most of the time, | |
65 but frame_with_focus_for_hooks is used for running the select-frame-hook | |
66 and deselect-frame-hook. We do this because we split the focus handling | |
67 into two parts: one part (deals with drawing the solid/box cursor) | |
68 runs as soon as a focus event is received; the other (running the | |
69 hooks) runs after any pending sit-for/sleep-for/accept-process-output | |
70 calls are done. */ | |
71 MARKED_SLOT (frame_with_focus_real); | |
72 MARKED_SLOT (frame_with_focus_for_hooks); | |
73 /* If we have recently issued a request to change the focus as a | |
74 result of select-frame having been called, the following variable | |
75 records the frame we are trying to focus on. The reason for this | |
76 is that the window manager may not grant our request to change | |
77 the focus (so we can't just change frame_with_focus), and we don't | |
78 want to keep sending requests again and again to the window manager. | |
79 This variable is reset whenever a focus-change event is seen. */ | |
80 MARKED_SLOT (frame_that_ought_to_have_focus); | |
81 | |
82 /* Color class of this device. */ | |
83 MARKED_SLOT (device_class); | |
84 | |
85 /* Alist of values for user-defined tags in this device. */ | |
86 MARKED_SLOT (user_defined_tags); | |
87 | |
88 /* Hash tables for device-specific objects (fonts, colors, etc). | |
89 These are key-weak hash tables (or hash tables containing key-weak | |
90 hash tables) so that they disappear when the key goes away. */ | |
91 | |
92 /* This is a simple key-weak hash table hashing color names to | |
93 instances. */ | |
94 MARKED_SLOT (color_instance_cache); | |
95 | |
96 /* This is a simple key-weak hash table hashing font names to | |
97 instances. */ | |
98 MARKED_SLOT (font_instance_cache); | |
99 | |
100 #ifdef MULE | |
101 /* This is a bi-level cache, where the hash table in this slot here | |
102 indexes charset objects to key-weak hash tables, which in turn | |
103 index font names to more specific font names that match the | |
104 given charset's registry. This speeds up the horrendously | |
105 slow XListFonts() operation that needs to be done in order | |
106 to determine an appropriate font. */ | |
107 MARKED_SLOT (charset_font_cache); | |
108 #endif | |
109 | |
110 /* This is a bi-level cache, where the hash table in this slot here | |
111 indexes image-instance-type masks (there are currently 6 | |
112 image-instance types and thus 64 possible masks) to key-weak hash | |
113 tables like the one for colors. */ | |
114 MARKED_SLOT (image_instance_cache); | |
115 | |
116 #undef MARKED_SLOT |