Mercurial > hg > xemacs-beta
annotate lisp/gui.el @ 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 | 308d34e9f07d |
| children | b7ae5f44b950 |
| rev | line source |
|---|---|
| 428 | 1 ;;; gui.el --- Basic GUI functions for XEmacs. |
| 2 | |
| 3 ;; Copyright (C) 1997 Free Software Foundation, Inc. | |
| 4 ;; Copyright (C) 1996 Ben Wing | |
| 5 | |
| 6 ;; Maintainer: XEmacs Development Team | |
| 7 ;; Keywords: internal, dumped | |
| 8 | |
| 9 ;; This file is part of XEmacs. | |
| 10 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
776
diff
changeset
|
11 ;; XEmacs is free software: you can redistribute it and/or modify it |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
776
diff
changeset
|
12 ;; under the terms of the GNU General Public License as published by the |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
776
diff
changeset
|
13 ;; Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
776
diff
changeset
|
14 ;; option) any later version. |
| 428 | 15 |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
776
diff
changeset
|
16 ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
776
diff
changeset
|
17 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
776
diff
changeset
|
18 ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
776
diff
changeset
|
19 ;; for more details. |
| 428 | 20 |
| 21 ;; You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
776
diff
changeset
|
22 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
| 428 | 23 |
| 24 ;;; Synched up with: Not in FSF | |
| 25 | |
| 26 ;;; Commentary: | |
| 27 | |
| 28 ;; This file is dumped with XEmacs (when window system support is compiled in). | |
| 29 | |
| 30 ;;; Code: | |
| 31 | |
| 32 (defcustom dialog-frame-plist '(width 60 height 20) | |
| 33 "Plist of frame properties for initially creating a dialog frame. | |
| 34 Properties specified here supersede the values given in | |
| 35 `default-frame-plist'." | |
| 36 :type 'plist | |
| 37 :group 'frames) | |
| 38 | |
| 39 (defun make-dialog-frame (&optional props parent) | |
| 40 "Create a frame suitable for use as a dialog box. | |
| 41 The frame is made a child of PARENT (defaults to the selected frame), | |
| 42 and has additional properties PROPS, as well as `dialog-frame-plist'. | |
| 43 Normally it also has no modelines, menubars, or toolbars." | |
| 44 (or parent (setq parent (selected-frame))) | |
| 45 (let* ((ftop (frame-property parent 'top)) | |
| 46 (fleft (frame-property parent 'left)) | |
| 47 (fwidth (frame-pixel-width parent)) | |
| 48 (fheight (frame-pixel-height parent)) | |
| 49 (fonth (font-height (face-font 'default))) | |
| 50 (fontw (font-width (face-font 'default))) | |
| 51 (props (append props dialog-frame-plist)) | |
| 52 (dfheight (plist-get props 'height)) | |
| 53 (dfwidth (plist-get props 'width)) | |
| 54 ;; under FVWM at least, if I don't specify the initial position, | |
| 55 ;; it ends up always at (0, 0). xwininfo doesn't tell me | |
| 56 ;; that there are any program-specified position hints, so | |
| 57 ;; it must be an FVWM bug. So just be smashing and position | |
| 58 ;; in the center of the selected frame. | |
| 59 (frame (make-frame | |
| 60 (append props | |
| 61 `(popup ,parent initially-unmapped t | |
| 62 menubar-visible-p nil | |
| 63 has-modeline-p nil | |
| 64 default-toolbar-visible-p nil | |
| 65 default-gutter-visible-p nil | |
| 66 modeline-shadow-thickness 0 | |
| 67 left ,(+ fleft (- (/ fwidth 2) | |
| 68 (/ (* dfwidth fontw) | |
| 69 2))) | |
| 70 top ,(+ ftop (- (/ fheight 2) | |
| 71 (/ (* dfheight fonth) | |
| 72 2)))))))) | |
| 73 (set-face-foreground 'modeline [default foreground] frame) | |
| 74 (set-face-background 'modeline [default background] frame) | |
| 75 (make-frame-visible frame) | |
| 76 frame)) | |
| 77 | |
| 78 (defvar gui-button-shadow-thickness 2) | |
| 79 | |
| 80 (defun gui-button-p (object) | |
| 81 "True if OBJECT is a GUI button." | |
| 82 (and (vectorp object) | |
| 83 (> (length object) 0) | |
| 84 (eq 'button (aref object 0)))) | |
| 85 | |
| 86 (make-face 'gui-button-face "Face used for gui buttons") | |
| 87 (if (not (face-differs-from-default-p 'gui-button-face)) | |
| 88 (progn | |
| 89 (set-face-reverse-p 'gui-button-face t) | |
| 711 | 90 (set-face-background 'gui-button-face '(((win color) . "grey75"))) |
| 91 (set-face-foreground 'gui-button-face '(((win color) . "black"))))) | |
| 428 | 92 |
| 454 | 93 |
| 94 (defun gui-button-action (instance action user-data) | |
| 95 (let ((domain (image-instance-domain instance))) | |
| 96 (with-current-buffer (if (windowp domain) | |
| 97 (window-buffer domain) nil) | |
| 98 (funcall action user-data)))) | |
| 99 | |
| 428 | 100 (defun make-gui-button (string &optional action user-data) |
| 101 "Make a GUI button whose label is STRING and whose action is ACTION. | |
| 102 If the button is inserted in a buffer and then clicked on, and ACTION | |
| 454 | 103 is non-nil, ACTION will be called with one argument, USER-DATA. |
| 104 When ACTION is called, the buffer containing the button is made current." | |
| 428 | 105 (vector 'button |
| 106 :descriptor string | |
| 107 :face 'gui-button-face | |
| 454 | 108 :callback-ex `(lambda (image-instance event) |
| 109 (gui-button-action image-instance | |
| 110 (quote ,action) | |
| 111 (quote ,user-data))))) | |
| 428 | 112 |
| 113 (defun insert-gui-button (button &optional pos buffer) | |
| 114 "Insert GUI button BUTTON at POS in BUFFER." | |
| 115 (check-argument-type 'gui-button-p button) | |
| 776 | 116 (if-fboundp 'make-annotation |
| 117 (make-annotation (make-glyph button) | |
| 118 pos 'text buffer nil) | |
| 119 (error 'unimplemented "insert-gui-button requires `annotations' package"))) | |
| 120 | |
| 428 | 121 |
| 122 ;;; gui.el ends here |
