Mercurial > hg > xemacs-beta
annotate src/ExternalClient-Xlib.c @ 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 | 8de911beca70 |
children | 2aa9cd456ae7 |
rev | line source |
---|---|
0 | 1 /* External client, raw Xlib version. |
2 Copyright (C) 1993, 1994 Sun Microsystems, Inc. | |
3 | |
4 This library is free software; you can redistribute it and/or | |
5 modify it under the terms of the GNU Library General Public | |
6 License as published by the Free Software Foundation; either | |
7 version 2 of the License, or (at your option) any later version. | |
8 | |
9 This library is distributed in the hope that it will be useful, | |
10 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
12 Library General Public License for more details. | |
13 | |
14 You should have received a copy of the GNU Library General Public | |
15 License along with this library; if not, write to | |
16 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
17 Boston, MA 02111-1307, USA. */ | |
18 | |
19 /* Synched up with: Not in FSF. */ | |
20 | |
21 /* Written by Ben Wing, February 1994. */ | |
22 | |
23 #include <X11/Xlib.h> | |
24 #include <X11/Xresource.h> | |
25 #include <X11/Xutil.h> | |
26 #include "extw-Xlib.h" | |
27 | |
28 /* this is not a perfect solution, but otherwise we have to include all | |
29 of the Xt junk */ | |
30 | |
31 #define XtGeometryNo 1 | |
32 | |
33 #if (XlibSpecificationRelease < 5) | |
34 # define XPointer char * | |
35 #endif | |
36 | |
37 static int context_inited; | |
38 static XContext focus_context; | |
39 | |
40 /* does the specified window have the focus, given that the pointer just | |
41 entered (or left) the window (according to enter_p)? This question | |
42 does not have an obvious answer in X. (Basically, X sucks.) */ | |
43 | |
44 static int | |
45 window_has_focus_p (Display *display, Window win, int enter_p) | |
46 { | |
47 Window focuswin; | |
48 int dummy; | |
49 | |
50 XGetInputFocus(display, &focuswin, &dummy); | |
51 if (focuswin == PointerRoot) | |
52 return enter_p; | |
53 if (focuswin == win) | |
54 return True; | |
55 if (!enter_p) | |
56 return False; | |
57 do | |
58 { | |
59 Status st; | |
60 Window root_win, parent_win; | |
61 Window *child_win; | |
2108 | 62 unsigned int nchild; |
0 | 63 |
2108 | 64 st = XQueryTree (display, win, &root_win, &parent_win, &child_win, |
65 &nchild); | |
0 | 66 if (!st) |
67 return False; | |
68 XFree((XPointer)child_win); | |
69 if (parent_win == focuswin) | |
70 return True; | |
71 if (parent_win == root_win) | |
72 return False; | |
73 win = parent_win; | |
74 } | |
75 while (1); | |
76 } | |
77 | |
2108 | 78 |
0 | 79 /* External entry points when using XLib directly */ |
80 | |
81 void ExternalClientInitialize (Display *display, Window win); | |
82 void | |
83 ExternalClientInitialize (Display *display, Window win) | |
84 { | |
85 extw_initialize_atoms(display); | |
86 extw_which_side = extw_client_send; | |
87 if (!context_inited) | |
88 { | |
89 focus_context = XUniqueContext(); | |
90 context_inited = 1; | |
91 } | |
92 XSaveContext(display, win, focus_context, 0); | |
93 XSelectInput(display, win, EnterWindowMask | LeaveWindowMask | | |
94 FocusChangeMask); | |
95 } | |
96 | |
97 void ExternalClientEventHandler (Display *display, Window win, XEvent *event); | |
98 void | |
99 ExternalClientEventHandler (Display *display, Window win, XEvent *event) | |
100 { | |
101 if (win != event->xany.window) | |
102 return; | |
2108 | 103 |
0 | 104 if (event->type == ClientMessage && |
105 event->xclient.message_type == a_EXTW_NOTIFY && | |
106 event->xclient.data.l[0] == extw_shell_send) | |
107 switch (event->xclient.data.l[1]) { | |
108 case extw_notify_gm: | |
109 /* for the moment, just refuse geometry requests. */ | |
110 extw_send_notify_3(display, win, extw_notify_gm, XtGeometryNo, 0, 0); | |
111 break; | |
2108 | 112 |
0 | 113 case extw_notify_init: |
114 extw_send_notify_3(display, win, extw_notify_init, EXTW_TYPE_XLIB, 0, 0); | |
115 break; | |
2108 | 116 |
0 | 117 case extw_notify_end: |
118 XClearArea(display, win, 0, 0, 0, 0, True); | |
119 break; | |
120 } | |
121 else | |
122 { | |
123 int focus_status; | |
124 XPointer current_focus; | |
125 | |
126 if (event->type == FocusIn) | |
127 focus_status = 1; | |
128 else if (event->type == FocusOut) | |
129 focus_status = 0; | |
130 else if (event->type == EnterNotify && | |
131 event->xcrossing.detail != NotifyInferior) | |
132 focus_status = window_has_focus_p(display, win, 1); | |
133 else if (event->type == LeaveNotify && | |
134 event->xcrossing.detail != NotifyInferior) | |
135 focus_status = window_has_focus_p(display, win, 0); | |
136 else | |
137 return; | |
138 XFindContext(display, win, focus_context, ¤t_focus); | |
139 if (focus_status != (int) current_focus) | |
140 { | |
141 XSaveContext(display, win, focus_context, (XPointer) focus_status); | |
142 extw_send_notify_3(display, win, focus_status ? | |
143 extw_notify_focus_in : extw_notify_focus_out, | |
144 0, 0, 0); | |
145 } | |
146 } | |
147 } |