Mercurial > hg > xemacs-beta
view src/ExternalClient-Xlib.c @ 5560:58b38d5b32d0
Implement print-circle, allowing recursive and circular structures to be read.
src/ChangeLog addition:
2011-09-04 Aidan Kehoe <kehoea@parhasard.net>
* alloc.c:
* alloc.c (ALLOC_FROB_BLOCK_LISP_OBJECT_1):
* alloc.c (ALLOC_FROB_BLOCK_LISP_OBJECT):
* alloc.c (cons_print_preprocess):
* alloc.c (vector_print_preprocess):
* alloc.c (vector_nsubst_structures_descend):
* alloc.c (Fmake_symbol):
* alloc.c (UNMARK_symbol):
* alloc.c (sweep_symbols):
* alloc.c (reinit_alloc_objects_early):
* alloc.c (reinit_alloc_early):
* bytecode.c:
* bytecode.c (compiled_function_print_preprocess):
* bytecode.c (compiled_function_nsubst_structures_descend):
* bytecode.c (set_compiled_function_arglist):
* bytecode.c (set_compiled_function_interactive):
* bytecode.c (bytecode_objects_create):
* chartab.c:
* chartab.c (print_preprocess_mapper):
* chartab.c (nsubst_structures_mapper):
* chartab.c (char_table_nsubst_structures_descend):
* chartab.c (chartab_objects_create):
* elhash.c:
* elhash.c (nsubst_structures_map_hash_table):
* elhash.c (hash_table_nsubst_structures_descend):
* elhash.c (print_preprocess_mapper):
* elhash.c (hash_table_print_preprocess):
* elhash.c (inchash_eq):
* elhash.c (hash_table_objects_create):
* elhash.c (syms_of_elhash):
* elhash.h:
* emacs.c (main_1):
* fns.c:
* fns.c (check_eq_nokey):
* fns.c (Fnsubst):
* fns.c (syms_of_fns):
* lisp.h:
* lisp.h (struct Lisp_Symbol):
* lisp.h (IN_OBARRAY):
* lisp.h (struct):
* lisp.h (PRINT_PREPROCESS):
* lread.c (read1):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
* lrecord.h (DEFINE_DUMPABLE_MODULE_LISP_OBJECT):
* print.c:
* print.c (PRINT_CIRCLE_LIMIT):
* print.c (print_continuous_numbering_changed):
* print.c (print_prepare):
* print.c (print_finish):
* print.c (Fprin1_to_string):
* print.c (print_cons):
* print.c (print_preprocess_inchash_eq):
* print.c (print_preprocess):
* print.c (print_sort_get_numbers):
* print.c (print_sort_compare_ordinals):
* print.c (print_gensym_or_circle):
* print.c (nsubst_structures_descend):
* print.c (nsubst_structures):
* print.c (print_internal):
* print.c (print_symbol):
* print.c (vars_of_print):
* rangetab.c:
* rangetab.c (range_table_print_preprocess):
* rangetab.c (range_table_nsubst_structures_descend):
* rangetab.c (rangetab_objects_create):
* rangetab.c (syms_of_rangetab):
* symbols.c:
* symbols.c (symbol_print_preprocess):
* symbols.c (Fintern):
* symbols.c (Funintern):
* symbols.c (reinit_symbol_objects_early):
* symbols.c (init_symbols_once_early):
* symsinit.h:
Implement print-circle, printing circular structures in a readable
fashion, and treating them appropriately on read. This is by means
of two new object methods, print_preprocess (detecting
circularities), and nsubst_structures_descend (replacing
placeholders with the read objects).
Expose the substitution to Lisp via #'nsubst and its new
:descend-structures keyword.
Store information as to whether symbols are interned in obarray or
not in their header, making checking for keywords and uninterned
symbols (and thus printing) cheaper.
Default print_gensym to t, as Common Lisp does, and as a
more-than-decade old comment suggests.
lisp/ChangeLog addition:
2011-09-04 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-output-file-form):
* bytecomp.el (byte-compile-output-docform):
Bind print-circle, print-continuous-numbering in these functions,
now those variables are available.
* lisp.el (forward-sexp):
* lisp.el (backward-sexp):
Recognise leading #N= as being part of an expression.
tests/ChangeLog addition:
2011-09-04 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-reader-tests.el:
* automated/lisp-tests.el (literal-with-uninterned):
* automated/symbol-tests.el (foo):
Test print-circle, for printing (mutually-)recursive and circular
structures.
Bind print-continuous-numbering where appropriate.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 04 Sep 2011 19:51:35 +0100 |
| parents | 2aa9cd456ae7 |
| children | 5d5aeb79edb4 |
line wrap: on
line source
/* External client, raw Xlib version. Copyright (C) 1993, 1994 Sun Microsystems, Inc. This library is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this library. If not, see <http://www.gnu.org/licenses/>. */ /* Synched up with: Not in FSF. */ /* Written by Ben Wing, February 1994. */ #include <X11/Xlib.h> #include <X11/Xresource.h> #include <X11/Xutil.h> #include "extw-Xlib.h" /* this is not a perfect solution, but otherwise we have to include all of the Xt junk */ #define XtGeometryNo 1 #if (XlibSpecificationRelease < 5) # define XPointer char * #endif static int context_inited; static XContext focus_context; /* does the specified window have the focus, given that the pointer just entered (or left) the window (according to enter_p)? This question does not have an obvious answer in X. (Basically, X sucks.) */ static int window_has_focus_p (Display *display, Window win, int enter_p) { Window focuswin; int dummy; XGetInputFocus(display, &focuswin, &dummy); if (focuswin == PointerRoot) return enter_p; if (focuswin == win) return True; if (!enter_p) return False; do { Status st; Window root_win, parent_win; Window *child_win; unsigned int nchild; st = XQueryTree (display, win, &root_win, &parent_win, &child_win, &nchild); if (!st) return False; XFree((XPointer)child_win); if (parent_win == focuswin) return True; if (parent_win == root_win) return False; win = parent_win; } while (1); } /* External entry points when using XLib directly */ void ExternalClientInitialize (Display *display, Window win); void ExternalClientInitialize (Display *display, Window win) { extw_initialize_atoms(display); extw_which_side = extw_client_send; if (!context_inited) { focus_context = XUniqueContext(); context_inited = 1; } XSaveContext(display, win, focus_context, 0); XSelectInput(display, win, EnterWindowMask | LeaveWindowMask | FocusChangeMask); } void ExternalClientEventHandler (Display *display, Window win, XEvent *event); void ExternalClientEventHandler (Display *display, Window win, XEvent *event) { if (win != event->xany.window) return; if (event->type == ClientMessage && event->xclient.message_type == a_EXTW_NOTIFY && event->xclient.data.l[0] == extw_shell_send) switch (event->xclient.data.l[1]) { case extw_notify_gm: /* for the moment, just refuse geometry requests. */ extw_send_notify_3(display, win, extw_notify_gm, XtGeometryNo, 0, 0); break; case extw_notify_init: extw_send_notify_3(display, win, extw_notify_init, EXTW_TYPE_XLIB, 0, 0); break; case extw_notify_end: XClearArea(display, win, 0, 0, 0, 0, True); break; } else { int focus_status; XPointer current_focus; if (event->type == FocusIn) focus_status = 1; else if (event->type == FocusOut) focus_status = 0; else if (event->type == EnterNotify && event->xcrossing.detail != NotifyInferior) focus_status = window_has_focus_p(display, win, 1); else if (event->type == LeaveNotify && event->xcrossing.detail != NotifyInferior) focus_status = window_has_focus_p(display, win, 0); else return; XFindContext(display, win, focus_context, ¤t_focus); if (focus_status != (int) current_focus) { XSaveContext(display, win, focus_context, (XPointer) focus_status); extw_send_notify_3(display, win, focus_status ? extw_notify_focus_in : extw_notify_focus_out, 0, 0, 0); } } }
