Mercurial > hg > xemacs-beta
annotate lwlib/xlwtabsP.h @ 4677:8f1ee2d15784
Support full Common Lisp multiple values in C.
lisp/ChangeLog
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el :
Update this file to support full C-level multiple values. This
involves:
-- Four new bytecodes, and special compiler functions to compile
multiple-value-call, multiple-value-list-internal, values,
values-list, and, since it now needs to pass back multiple values
and is a special form, throw.
-- There's a new compiler variable, byte-compile-checks-on-load,
which is a list of forms that are evaluated at the very start of a
file, with an error thrown if any of them give nil.
-- The header is now inserted *after* compilation, giving a chance
for the compilation process to influence what those checks
are. There is still a check done before compilation for non-ASCII
characters, to try to turn off dynamic docstrings if appopriate,
in `byte-compile-maybe-reset-coding'.
Space is reserved for checks; comments describing the version of
the byte compiler generating the file are inserted if space
remains for them.
* bytecomp.el (byte-compile-version):
Update this, we're a newer version of the byte compiler.
* byte-optimize.el (byte-optimize-funcall):
Correct a comment.
* bytecomp.el (byte-compile-lapcode):
Discard the arg with byte-multiple-value-call.
* bytecomp.el (byte-compile-checks-and-comments-space):
New variable, describe how many octets to reserve for checks at
the start of byte-compiled files.
* cl-compat.el:
Remove the fake multiple-value implementation. Have the functions
that use it use the real multiple-value implementation instead.
* cl-macs.el (cl-block-wrapper, cl-block-throw):
Revise the byte-compile properties of these symbols to work now
we've made throw into a special form; keep the byte-compile
properties as anonymous lambdas, since we don't have docstrings
for them.
* cl-macs.el (multiple-value-bind, multiple-value-setq)
(multiple-value-list, nth-value):
Update these functions to work with the C support for multiple
values.
* cl-macs.el (values):
Modify the setf handler for this to call
#'multiple-value-list-internal appropriately.
* cl-macs.el (cl-setf-do-store):
If the store form is a cons, treat it specially as wrapping the
store value.
* cl.el (cl-block-wrapper):
Make this an alias of #'and, not #'identity, since it needs to
pass back multiple values.
* cl.el (multiple-value-apply):
We no longer support this, mark it obsolete.
* lisp-mode.el (eval-interactive-verbose):
Remove a useless space in the docstring.
* lisp-mode.el (eval-interactive):
Update this function and its docstring. It now passes back a list,
basically wrapping any eval calls with multiple-value-list. This
allows multiple values to be printed by default in *scratch*.
* lisp-mode.el (prin1-list-as-multiple-values):
New function, printing a list as multiple values in the manner of
Bruno Haible's clisp, separating each entry with " ;\n".
* lisp-mode.el (eval-last-sexp):
Call #'prin1-list-as-multiple-values on the return value of
#'eval-interactive.
* lisp-mode.el (eval-defun):
Call #'prin1-list-as-multiple-values on the return value of
#'eval-interactive.
* mouse.el (mouse-eval-sexp):
Deal with lists corresponding to multiple values from
#'eval-interactive. Call #'cl-prettyprint, which is always
available, instead of sometimes calling #'pprint and sometimes
falling back to prin1.
* obsolete.el (obsolete-throw):
New function, called from eval.c when #'funcall encounters an
attempt to call #'throw (now a special form) as a function. Only
needed for compatibility with 21.4 byte-code.
man/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* cl.texi (Organization):
Remove references to the obsolete multiple-value emulating code.
src/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* bytecode.c (enum Opcode /* Byte codes */):
Add four new bytecodes, to deal with multiple values.
(POP_WITH_MULTIPLE_VALUES): New macro.
(POP): Modify this macro to ignore multiple values.
(DISCARD_PRESERVING_MULTIPLE_VALUES): New macro.
(DISCARD): Modify this macro to ignore multiple values.
(TOP_WITH_MULTIPLE_VALUES): New macro.
(TOP_ADDRESS): New macro.
(TOP): Modify this macro to ignore multiple values.
(TOP_LVALUE): New macro.
(Bcall): Ignore multiple values where appropriate.
(Breturn): Pass back multiple values.
(Bdup): Preserve multiple values.
Use TOP_LVALUE with most bytecodes that assign anything to
anything.
(Bbind_multiple_value_limits, Bmultiple_value_call,
Bmultiple_value_list_internal, Bthrow): Implement the new
bytecodes.
(Bgotoifnilelsepop, Bgotoifnonnilelsepop, BRgotoifnilelsepop,
BRgotoifnonnilelsepop):
Discard any multiple values.
* callint.c (Fcall_interactively):
Ignore multiple values when calling #'eval, in two places.
* device-x.c (x_IO_error_handler):
* macros.c (pop_kbd_macro_event):
* eval.c (Fsignal):
* eval.c (flagged_a_squirmer):
Call throw_or_bomb_out, not Fthrow, now that the latter is a
special form.
* eval.c:
Make Qthrow, Qobsolete_throw available as symbols.
Provide multiple_value_current_limit, multiple-values-limit (the
latter as specified by Common Lisp.
* eval.c (For):
Ignore multiple values when comparing with Qnil, but pass any
multiple values back for the last arg.
* eval.c (Fand):
Ditto.
* eval.c (Fif):
Ignore multiple values when examining the result of the
condition.
* eval.c (Fcond):
Ignore multiple values when comparing what the clauses give, but
pass them back if a clause gave non-nil.
* eval.c (Fprog2):
Never pass back multiple values.
* eval.c (FletX, Flet):
Ignore multiple when evaluating what exactly symbols should be
bound to.
* eval.c (Fwhile):
Ignore multiple values when evaluating the test.
* eval.c (Fsetq, Fdefvar, Fdefconst):
Ignore multiple values.
* eval.c (Fthrow):
Declare this as a special form; ignore multiple values for TAG,
preserve them for VALUE.
* eval.c (throw_or_bomb_out):
Make this available to other files, now Fthrow is a special form.
* eval.c (Feval):
Ignore multiple values when calling a compiled function, a
non-special-form subr, or a lambda expression.
* eval.c (Ffuncall):
If we attempt to call #'throw (now a special form) as a function,
don't error, call #'obsolete-throw instead.
* eval.c (make_multiple_value, multiple_value_aset)
(multiple_value_aref, print_multiple_value, mark_multiple_value)
(size_multiple_value):
Implement the multiple_value type. Add a long comment describing
our implementation.
* eval.c (bind_multiple_value_limits):
New function, used by the bytecode and by #'multiple-value-call,
#'multiple-value-list-internal.
* eval.c (multiple_value_call):
New function, used by the bytecode and #'multiple-value-call.
* eval.c (Fmultiple_value_call):
New special form.
* eval.c (multiple_value_list_internal):
New function, used by the byte code and
#'multiple-value-list-internal.
* eval.c (Fmultiple_value_list_internal, Fmultiple_value_prog1):
New special forms.
* eval.c (Fvalues, Fvalues_list):
New Lisp functions.
* eval.c (values2):
New function, for C code returning multiple values.
* eval.c (syms_of_eval):
Make our new Lisp functions and symbols available.
* eval.c (multiple-values-limit):
Make this available to Lisp.
* event-msw.c (dde_eval_string):
* event-stream.c (execute_help_form):
* glade.c (connector):
* glyphs-widget.c (glyph_instantiator_to_glyph):
* glyphs.c (evaluate_xpm_color_symbols):
* gui-x.c (wv_set_evalable_slot, button_item_to_widget_value):
* gui.c (gui_item_value, gui_item_display_flush_left):
* lread.c (check_if_suppressed):
* menubar-gtk.c (menu_convert, menu_descriptor_to_widget_1):
* menubar-msw.c (populate_menu_add_item):
* print.c (Fwith_output_to_temp_buffer):
* symbols.c (Fsetq_default):
Ignore multiple values when calling Feval.
* symeval.h:
Add the header declarations necessary for the multiple-values
implementation.
* inline.c:
#include symeval.h, now that it has some inline functions.
* lisp.h:
Update Fthrow's declaration. Make throw_or_bomb_out available to
all files.
* lrecord.h (enum lrecord_type):
Add the multiple_value type here.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 16 Aug 2009 20:55:49 +0100 |
parents | 382b11fa8866 |
children | a6c778975d7d |
rev | line source |
---|---|
424 | 1 /* Tabs Widget for XEmacs. |
2 Copyright (C) 1999 Edward A. Falk | |
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 | |
434 | 21 /* Synched up with: TabsP.h 1.8 */ |
424 | 22 |
23 /* | |
24 * TabsP.h - Private definitions for Index Tabs widget | |
25 */ | |
26 | |
27 #ifndef _TabsP_h | |
28 #define _TabsP_h | |
29 | |
30 /*********************************************************************** | |
31 * | |
32 * Tabs Widget Private Data | |
33 * | |
34 ***********************************************************************/ | |
35 | |
36 #include <X11/IntrinsicP.h> | |
37 | |
38 #ifdef NEED_MOTIF | |
39 #include <Xm/XmP.h> | |
40 #include <Xm/ManagerP.h> | |
41 #endif | |
42 | |
43 #include "xlwtabs.h" | |
3094 | 44 #ifdef USE_XFT_TABS |
45 #include <X11/Xft/Xft.h> | |
46 #endif | |
424 | 47 |
48 /* New fields for the Tabs widget class record */ | |
49 typedef struct {XtPointer extension;} TabsClassPart; | |
50 | |
51 /* Full class record declaration */ | |
52 typedef struct _TabsClassRec { | |
53 CoreClassPart core_class; | |
54 CompositeClassPart composite_class; | |
55 ConstraintClassPart constraint_class; | |
56 #ifdef NEED_MOTIF | |
57 XmManagerClassPart manager_class; | |
58 #endif | |
59 TabsClassPart tabs_class; | |
60 } TabsClassRec; | |
61 | |
62 extern TabsClassRec tabsClassRec; | |
63 | |
64 | |
65 | |
66 /**************************************************************** | |
67 * | |
68 * instance record declaration | |
69 * | |
70 ****************************************************************/ | |
71 | |
72 /* New fields for the Tabs widget record */ | |
73 typedef struct { | |
74 /* resources */ | |
75 XFontStruct *font ; | |
3094 | 76 #ifdef USE_XFT_TABS |
3397 | 77 XftFont *renderFont; |
78 String fcFontName; | |
3685 | 79 String xftFontName; |
3094 | 80 #endif |
424 | 81 Dimension internalHeight, internalWidth ; |
82 Widget topWidget ; | |
83 XtCallbackList callbacks ; | |
84 XtCallbackList popdownCallbacks ; | |
85 Boolean selectInsensitive ; | |
86 Boolean be_nice_to_cmap ; | |
87 int top_shadow_contrast ; | |
88 int bot_shadow_contrast ; | |
89 int insensitive_contrast ; | |
90 | |
91 /* private state */ | |
92 Widget hilight ; | |
93 GC foregroundGC ; | |
94 GC backgroundGC ; | |
95 GC greyGC ; | |
96 GC topGC ; | |
97 GC botGC ; | |
98 Dimension tab_height ; /* height of tabs (all the same) */ | |
99 /* Note: includes top shadow only */ | |
100 Dimension tab_total ; /* total height of all tabs */ | |
101 Dimension child_width, child_height; /* child size, including borders */ | |
102 Dimension max_cw, max_ch ; /* max child preferred size */ | |
103 Cardinal numRows ; | |
446 | 104 Cardinal realRows; /* XEmacs addition */ |
424 | 105 XtGeometryMask last_query_mode; |
106 Boolean needs_layout ; | |
107 Pixmap grey50 ; /* TODO: cache this elsewhere */ | |
108 } TabsPart; | |
109 | |
110 | |
111 typedef struct _TabsRec { | |
112 CorePart core; | |
113 CompositePart composite; | |
114 ConstraintPart constraint; | |
115 #ifdef NEED_MOTIF | |
116 XmManagerPart manager; | |
117 #endif | |
118 TabsPart tabs; | |
119 } TabsRec; | |
120 | |
121 | |
122 | |
123 | |
124 /**************************************************************** | |
125 * | |
3397 | 126 * Constraint record declaration |
424 | 127 * |
128 ****************************************************************/ | |
129 | |
130 typedef struct _TabsConstraintsPart { | |
131 /* resources */ | |
132 String label ; | |
133 Pixmap left_bitmap ; | |
134 Pixel foreground ; | |
135 Boolean resizable ; | |
136 | |
137 /* private state */ | |
138 Pixel grey ; | |
139 Boolean greyAlloc ; | |
446 | 140 Boolean visible; /* XEmacs change */ |
424 | 141 Dimension width ; /* tab width */ |
142 Position x,y ; /* tab base position */ | |
143 short row ; /* tab row */ | |
144 Position l_x, l_y ; /* label position */ | |
145 Position lbm_x, lbm_y ; /* bitmap position */ | |
146 unsigned int lbm_width, lbm_height, lbm_depth ; | |
147 } TabsConstraintsPart ; | |
148 | |
149 typedef struct _TabsConstraintsRec { | |
150 #ifdef NEED_MOTIF | |
151 XmManagerConstraintPart manager; | |
152 #endif | |
153 TabsConstraintsPart tabs ; | |
154 } TabsConstraintsRec, *TabsConstraints ; | |
155 | |
156 | |
157 #endif /* _TabsP_h */ |