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