Mercurial > hg > xemacs-beta
annotate src/gui.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 | 190b164ddcac |
children | b39c14581166 |
rev | line source |
---|---|
428 | 1 /* Generic GUI code. (menubars, scrollbars, toolbars, dialogs) |
2 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
3 Copyright (C) 1995, 1996 Ben Wing. | |
4 Copyright (C) 1995 Sun Microsystems, Inc. | |
5 | |
6 This file is part of XEmacs. | |
7 | |
8 XEmacs is free software; you can redistribute it and/or modify it | |
9 under the terms of the GNU General Public License as published by the | |
10 Free Software Foundation; either version 2, or (at your option) any | |
11 later version. | |
12 | |
13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
16 for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
19 along with XEmacs; see the file COPYING. If not, write to | |
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
21 Boston, MA 02111-1307, USA. */ | |
22 | |
23 /* Synched up with: Not in FSF. */ | |
24 | |
25 /* Written by kkm on 12/24/97 */ | |
26 | |
440 | 27 #ifndef INCLUDED_gui_h_ |
28 #define INCLUDED_gui_h_ | |
428 | 29 |
442 | 30 int separator_string_p (const Bufbyte *s); |
428 | 31 void get_gui_callback (Lisp_Object, Lisp_Object *, Lisp_Object *); |
442 | 32 int gui_item_equal_sans_selected (Lisp_Object obj1, Lisp_Object obj2, int depth); |
428 | 33 |
454 | 34 |
35 | |
36 | |
428 | 37 extern int popup_up_p; |
38 | |
39 /************************************************************************/ | |
40 /* Image Instance Object */ | |
41 /************************************************************************/ | |
42 | |
43 /* This structure describes gui button, | |
44 menu item or submenu properties */ | |
45 struct Lisp_Gui_Item | |
46 { | |
47 struct lcrecord_header header; | |
48 Lisp_Object name; /* String */ | |
49 Lisp_Object callback; /* Symbol or form */ | |
442 | 50 Lisp_Object callback_ex; /* Form taking context arguments */ |
428 | 51 Lisp_Object suffix; /* String */ |
52 Lisp_Object active; /* Form */ | |
53 Lisp_Object included; /* Form */ | |
54 Lisp_Object config; /* Anything EQable */ | |
55 Lisp_Object filter; /* Form */ | |
56 Lisp_Object style; /* Symbol */ | |
57 Lisp_Object selected; /* Form */ | |
58 Lisp_Object keys; /* String */ | |
59 Lisp_Object accelerator; /* Char or Symbol */ | |
442 | 60 Lisp_Object value; /* Anything you like */ |
428 | 61 }; |
62 | |
440 | 63 DECLARE_LRECORD (gui_item, Lisp_Gui_Item); |
64 #define XGUI_ITEM(x) XRECORD (x, gui_item, Lisp_Gui_Item) | |
65 #define XSETGUI_ITEM(x, p) XSETRECORD (x, p, gui_item) | |
617 | 66 #define wrap_gui_item(p) wrap_record (p, gui_item) |
440 | 67 #define GUI_ITEMP(x) RECORDP (x, gui_item) |
68 #define CHECK_GUI_ITEM(x) CHECK_RECORD (x, gui_item) | |
69 #define CONCHECK_GUI_ITEM(x) CONCHECK_RECORD (x, gui_item) | |
70 | |
454 | 71 int update_gui_item_keywords (Lisp_Object gui_item, Lisp_Object item); |
72 Lisp_Object copy_gui_item (Lisp_Object gui_item); | |
73 Lisp_Object widget_gui_parse_item_keywords (Lisp_Object item); | |
74 int gui_item_add_keyval_pair (Lisp_Object gui_item, | |
75 Lisp_Object key, Lisp_Object val, | |
578 | 76 Error_Behavior errb); |
428 | 77 Lisp_Object gui_parse_item_keywords (Lisp_Object item); |
78 Lisp_Object gui_parse_item_keywords_no_errors (Lisp_Object item); | |
430 | 79 void gui_add_item_keywords_to_plist (Lisp_Object plist, Lisp_Object gui_item); |
428 | 80 int gui_item_active_p (Lisp_Object); |
81 int gui_item_selected_p (Lisp_Object); | |
442 | 82 Lisp_Object gui_item_list_find_selected (Lisp_Object gui_item_list); |
428 | 83 int gui_item_included_p (Lisp_Object, Lisp_Object into); |
84 Lisp_Object gui_item_accelerator (Lisp_Object gui_item); | |
85 Lisp_Object gui_name_accelerator (Lisp_Object name); | |
86 int gui_item_id_hash (Lisp_Object, Lisp_Object gui_item, int); | |
87 unsigned int gui_item_display_flush_left (Lisp_Object pgui_item, | |
88 char* buf, Bytecount buf_len); | |
89 unsigned int gui_item_display_flush_right (Lisp_Object gui_item, | |
90 char* buf, Bytecount buf_len); | |
91 | |
92 Lisp_Object allocate_gui_item (void); | |
93 void gui_item_init (Lisp_Object gui_item); | |
94 Lisp_Object parse_gui_item_tree_children (Lisp_Object list); | |
442 | 95 Lisp_Object copy_gui_item_tree (Lisp_Object arg); |
96 | |
97 extern Lisp_Object Qmenu_no_selection_hook, Qdelete_dialog_box_hook; | |
428 | 98 |
99 /* this is mswindows biased but reasonably safe I think */ | |
100 #define GUI_ITEM_ID_SLOTS 8 | |
101 #define GUI_ITEM_ID_MIN(s) (s * 0x2000) | |
102 #define GUI_ITEM_ID_MAX(s) (0x1FFF + GUI_ITEM_ID_MIN (s)) | |
103 #define GUI_ITEM_ID_BITS(x,s) (((x) & 0x1FFF) + GUI_ITEM_ID_MIN (s)) | |
104 | |
105 #define MAX_MENUITEM_LENGTH 128 | |
106 | |
440 | 107 #endif /* INCLUDED_gui_h_ */ |