Mercurial > hg > xemacs-beta
view lisp/generic-widgets.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 |
line wrap: on
line source
;;; generic-widgets.el --- Generic UI building ;; Copyright (C) 2000 Free Software Foundation ;; Maintainer: William Perry <wmperry@gnu.org> ;; Keywords: extensions, dumped ;; This file is part of XEmacs. ;; XEmacs 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. ;; XEmacs 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 XEmacs. If not, see <http://www.gnu.org/licenses/>. ;;; Synched up with: Not in FSF ;;; Commentary: ;; This file is dumped with XEmacs. (globally-declare-fboundp '(gtk-label-new gtk-widget-show-all gtk-signal-connect gtk-window-new gtk-container-add gtk-vbox-new gtk-hbox-new gtk-box-pack-start gtk-notebook-new gtk-notebook-set-homogeneous-tabs gtk-notebook-set-scrollable gtk-notebook-set-show-tabs gtk-notebook-set-tab-pos gtk-notebook-append-page gtk-text-new gtk-text-set-editable gtk-text-set-word-wrap gtk-text-set-line-wrap gtk-widget-set-style gtk-text-insert gtk-label-set-line-wrap gtk-label-set-justify gtk-radio-button-new gtk-radio-button-group gtk-check-button-new gtk-toggle-button-new gtk-button-new gtk-progress-bar-new gtk-progress-bar-set-orientation gtk-progress-bar-set-bar-style)) (defun build-ui (ui) (if (null ui) (gtk-label-new "[empty]") (let ((builder-func (intern-soft (format "build-ui::%s" (car ui)))) (widget nil)) (if (and builder-func (fboundp builder-func)) (progn (setq widget (funcall builder-func ui)) (setcdr ui (plist-put (cdr ui) :x-internal-widget widget)) widget) (error "Unknown ui element: %s" (car ui)))))) (defun show-ui (ui) (let ((widget (plist-get (cdr ui) :x-internal-widget))) (if (not widget) (error "Attempting to show unrealized UI")) (gtk-widget-show-all widget) (gtk-signal-connect widget 'destroy (lambda (widget ui) (setcdr ui (plist-put (cdr ui) :x-internal-widget nil))) ui))) (defun build-ui::window (spec) "Create a top-level window for containing other widgets. Properties: :items list A list of child UI specs. Only the first is used. :type toplevel/dialog/popup What type of window to create. Window managers can (and usually do) treat each type differently. " (let ((plist (cdr spec)) (window nil) (child nil)) (setq window (gtk-window-new (plist-get plist :type 'toplevel)) child (build-ui (car (plist-get plist :items)))) (gtk-container-add window child) window)) (defun build-ui::box (spec) "Create a box for containing other widgets. Properties: :items list A list of child UI specs. :homogeneous t/nil Whether all children are the same width/height. :spacing number Spacing between children. :orientation horizontal/vertical How the widgets are stacked. Additional properties on child widgets: :expand t/nil Whether the new child is to be given extra space allocated to box. The extra space will be divided evenly between all children of box that use this option. :fill t/nil Whether space given to child by the expand option is actually allocated to child, rather than just padding it. This parameter has no effect if :expand is set to nil. A child is always allocated the full height of a horizontal box and the full width of a vertical box. This option affects the other dimension. :padding number Extra padding around this widget. " (let* ((plist (cdr spec)) (orientation (plist-get plist :orientation 'horizontal)) (children (plist-get plist :items)) (box nil) (child-widget nil) (child-plist nil)) (case orientation (vertical (setq box (gtk-vbox-new (plist-get plist :homogeneous) (plist-get plist :spacing)))) (horizontal (setq box (gtk-hbox-new (plist-get plist :homogeneous) (plist-get plist :spacing)))) (otherwise (error "Unknown orientation for box: %s" orientation))) (mapc (lambda (child) (setq child-plist (cdr child) child-widget (build-ui child)) (if (listp child-widget) (mapc (lambda (w) (gtk-box-pack-start box w (plist-get child-plist :expand) (plist-get child-plist :fill) (plist-get child-plist :padding))) child-widget) (gtk-box-pack-start box child-widget (plist-get child-plist :expand) (plist-get child-plist :fill) (plist-get child-plist :padding)))) children) box)) (defun build-ui::tab-control (spec) "Create a notebook widget. Properties: :items list A list of UI specs to use as notebook pages. :homogeneous t/nil Whether all tabs are the same width. :orientation top/bottom/left/right Position of tabs :show-tabs t/nil Show the tabs on screen? :scrollable t/nil Allow scrolling to view all tab widgets? Additional properties on child widgets: :tab-label ui A UI spec to use for the tab label. " (let* ((plist (cdr spec)) (notebook (gtk-notebook-new)) (children (plist-get plist :items)) (page-counter 1) (label-widget nil) (child-widget nil) (child-plist nil)) ;; Set all the properties (gtk-notebook-set-homogeneous-tabs notebook (plist-get plist :homogeneous)) (gtk-notebook-set-scrollable notebook (plist-get plist :scrollable t)) (gtk-notebook-set-show-tabs notebook (plist-get plist :show-tabs t)) (gtk-notebook-set-tab-pos notebook (plist-get plist :orientation 'top)) ;; Now fill in the tabs (mapc (lambda (child) (setq child-plist (cdr child) child-widget (build-ui child) label-widget (build-ui (plist-get child-plist :tab-label (list 'label :text (format "tab %d" page-counter)))) page-counter (1+ page-counter)) (gtk-notebook-append-page notebook child-widget label-widget)) children) notebook)) (defun build-ui::text (spec) "Create a multi-line text widget. Properties: :editable t/nil Whether the user can change the contents :word-wrap t/nil Automatic word wrapping? :line-wrap t/nil Automatic line wrapping? :text string Initial contents of the widget :file filename File for initial contents (takes precedence over :text) :face facename XEmacs face to use in the widget. " (let* ((plist (cdr spec)) (text (gtk-text-new nil nil)) (face (plist-get plist :face 'default)) (info (plist-get plist :text)) (file (plist-get plist :file))) (gtk-text-set-editable text (plist-get plist :editable)) (gtk-text-set-word-wrap text (plist-get plist :word-wrap)) (gtk-text-set-line-wrap text (plist-get plist :line-wrap)) (gtk-widget-set-style text 'default) ;; Possible convert the file portion (if (and file (not (stringp file))) (setq file (eval file))) (if (and info (not (stringp info))) (setq info (eval info))) (if (and file (file-exists-p file) (file-readable-p file)) (save-excursion (set-buffer (get-buffer-create " *improbable buffer name*")) (insert-file-contents file) (setq info (buffer-string)))) (gtk-text-insert text (face-font face) (face-foreground face) (face-background face) info (length info)) text)) (defun build-ui::label (spec) "Create a label widget. Properties: :text string Text inside the label :face facename XEmacs face to use in the widget. :justification right/left/center How to justify the text. " (let* ((plist (cdr spec)) (label (gtk-label-new (plist-get plist :text)))) (gtk-label-set-line-wrap label t) (gtk-label-set-justify label (plist-get plist :justification)) (gtk-widget-set-style label (plist-get plist :face 'default)) label)) (defun build-ui::pixmap (spec) "Create a multi-line text widget. Properties: :text string Text inside the label :face facename XEmacs face to use in the widget. :justification right/left/center How to justify the text. " (let* ((plist (cdr spec)) (label (gtk-label-new (plist-get plist :text)))) (gtk-label-set-line-wrap label t) (gtk-label-set-justify label (plist-get plist :justification)) (gtk-widget-set-style label (plist-get plist :face 'default)) label)) (defun build-ui::radio-group (spec) "A convenience when specifying a group of radio buttons." (declare (special build-ui::radio-group)) (let ((build-ui::radio-group nil)) (mapcar 'build-ui (plist-get (cdr spec) :items)))) (defun build-ui::button (spec) "Create a button widget. Properties: :type radio/check/toggle/nil What type of button to create. :text string Text in the button. :glyph glyph Image in the button. :label ui A UI spec to use for the label. :relief normal/half/none How to draw button edges. NOTE: Radio buttons must be in a radio-group object for them to work. " (declare (special build-ui::radio-group)) (let* ((plist (cdr spec)) (button nil) (button-type (plist-get plist :type 'normal))) (case button-type (radio (if (not (boundp 'build-ui::radio-group)) (error "Attempt to use a radio button outside a radio-group")) (setq button (gtk-radio-button-new build-ui::radio-group) build-ui::radio-group (gtk-radio-button-group button))) (check (setq button (gtk-check-button-new))) (toggle (setq button (gtk-toggle-button-new))) (normal (setq button (gtk-button-new))) (otherwise (error "Unknown button type: %s" button-type))) (gtk-container-add button (build-ui (plist-get plist :label (list 'label :text (plist-get plist :text (format "%s button" button-type)))))) button)) (defun build-ui::progress-gauge (spec) "Create a progress meter. Properties: :orientation left-to-right/right-to-left/top-to-bottom/bottom-to-top :type discrete/continuous " (let ((plist (cdr spec)) (gauge (gtk-progress-bar-new))) (gtk-progress-bar-set-orientation gauge (plist-get plist :orientation 'left-to-right)) (gtk-progress-bar-set-bar-style gauge (plist-get plist :type 'continuous)) gauge)) (provide 'generic-widgets) (when (featurep 'gtk) ; just loading this file should be OK (gtk-widget-show-all (build-ui '(window :type dialog :items ((tab-control :homogeneous t :orientation bottom :items ((box :orientation vertical :tab-label (label :text "vertical") :items ((label :text "Vertical") (progress-gauge) (label :text "Box stacking"))) (box :orientation horizontal :spacing 10 :items ((label :text "Horizontal box") (label :text "stacking"))) (box :orientation vertical :items ((radio-group :items ((button :type radio :expand nil :fill nil :text "Item 1") (button :type radio :expand nil :fill nil :text "Item 2") (button :type radio :expand nil :fill nil :text "Item 3") (button :type radio :expand nil :fill nil))))) (box :orientation vertical :items ((button :type check :text "Item 1") (button :type check :text "Item 2") (button :type normal :text "Item 3") (button :type toggle))) (text :editable t :word-wrap t :file (locate-data-file "COPYING")) (text :editable t :face display-time-mail-balloon-enhance-face :word-wrap t :text "Text with a face on it"))))))) )
