Mercurial > hg > xemacs-beta
view lisp/wid-browse.el @ 5013:ae48681c47fa
changes to VOID_TO_LISP et al.
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* casetab.c (compute_canon_mapper):
* casetab.c (initialize_identity_mapper):
* casetab.c (compute_up_or_eqv_mapper):
* casetab.c (recompute_case_table):
* casetab.c (set_case_table):
* chartab.c (copy_mapper):
* chartab.c (copy_char_table_range):
* chartab.c (get_range_char_table_1):
* console.c (find_nonminibuffer_frame_not_on_console_predicate):
* console.c (find_nonminibuffer_frame_not_on_console):
* console.c (nuke_all_console_slots):
* device.c:
* device.c (find_nonminibuffer_frame_not_on_device_predicate):
* device.c (find_nonminibuffer_frame_not_on_device):
* dialog-msw.c (dialog_proc):
* dialog-msw.c (handle_question_dialog_box):
* dialog-x.c (maybe_run_dbox_text_callback):
* eval.c:
* eval.c (safe_run_hook_trapping_problems_1):
* eval.c (safe_run_hook_trapping_problems):
* event-msw.c:
* event-msw.c (mswindows_wnd_proc):
* event-msw.c (mswindows_find_frame):
* faces.c (update_face_inheritance_mapper):
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_get_mouse_position):
* frame-msw.c (mswindows_get_frame_parent):
* glade.c (connector):
* glade.c (Fglade_xml_signal_connect):
* glade.c (Fglade_xml_signal_autoconnect):
* glade.c (Fglade_xml_textdomain):
* glyphs-msw.c (mswindows_subwindow_instantiate):
* glyphs-msw.c (mswindows_widget_instantiate):
* glyphs.c (check_instance_cache_mapper):
* glyphs.c (check_window_subwindow_cache):
* glyphs.c (check_image_instance_structure):
* gui-x.c (snarf_widget_value_mapper):
* gui-x.c (popup_selection_callback):
* gui-x.c (button_item_to_widget_value):
* keymap.c (map_keymap_mapper):
* keymap.c (Fmap_keymap):
* menubar-gtk.c (__torn_off_sir):
* menubar-gtk.c (__activate_menu):
* menubar-gtk.c (menu_convert):
* menubar-gtk.c (__generic_button_callback):
* menubar-gtk.c (menu_descriptor_to_widget_1):
* menubar-msw.c:
* menubar-msw.c (EMPTY_ITEM_ID):
* menubar-x.c (menu_item_descriptor_to_widget_value_1):
* menubar-x.c (pre_activate_callback):
* menubar-x.c (command_builder_operate_menu_accelerator):
* menubar-x.c (command_builder_find_menu_accelerator):
* print.c (print_internal):
* process-unix.c (close_process_descs_mapfun):
* process.c (get_process_from_usid):
* process.c (init_process_io_handles):
* profile.c (sigprof_handler):
* profile.c (get_profiling_info_timing_maphash):
* profile.c (Fget_profiling_info):
* profile.c (set_profiling_info_timing_maphash):
* profile.c (mark_profiling_info_maphash):
* scrollbar-msw.c (mswindows_create_scrollbar_instance):
* scrollbar-msw.c (mswindows_free_scrollbar_instance):
* scrollbar-msw.c (mswindows_handle_scrollbar_event):
* specifier.c (recompute_cached_specifier_everywhere_mapfun):
* specifier.c (recompute_cached_specifier_everywhere):
* syntax.c (copy_to_mirrortab):
* syntax.c (copy_if_not_already_present):
* syntax.c (update_just_this_syntax_table):
* text.c (new_dfc_convert_now_damn_it):
* text.h (LISP_STRING_TO_EXTERNAL):
* tooltalk.c:
* tooltalk.c (tooltalk_message_callback):
* tooltalk.c (tooltalk_pattern_callback):
* tooltalk.c (Fcreate_tooltalk_message):
* tooltalk.c (Fcreate_tooltalk_pattern):
* ui-byhand.c (__generic_toolbar_callback):
* ui-byhand.c (generic_toolbar_insert_item):
* ui-byhand.c (__emacs_gtk_ctree_recurse_internal):
* ui-byhand.c (Fgtk_ctree_recurse):
* ui-gtk.c (__internal_callback_destroy):
* ui-gtk.c (__internal_callback_marshal):
* ui-gtk.c (Fgtk_signal_connect):
* ui-gtk.c (gtk_type_to_lisp):
* ui-gtk.c (lisp_to_gtk_type):
* ui-gtk.c (lisp_to_gtk_ret_type):
* lisp-disunion.h:
* lisp-disunion.h (NON_LVALUE):
* lisp-union.h:
* lisp.h (LISP_HASH):
Rename:
LISP_TO_VOID -> STORE_LISP_IN_VOID
VOID_TO_LISP -> GET_LISP_FROM_VOID
These new names are meant to clearly identify that the Lisp object
is the source and void the sink, and that they can't be used the
other way around -- they aren't exact opposites despite the old
names. The names are also important given the new functions
created just below. Also, clarify comments in lisp-union.h and
lisp-disunion.h about the use of the functions.
* lisp.h:
New functions STORE_VOID_IN_LISP and GET_VOID_FROM_LISP. These
are different from the above in that the source is a void *
(previously, you had to use make_opaque_ptr()).
* eval.c (restore_lisp_object):
* eval.c (record_unwind_protect_restoring_lisp_object):
* eval.c (struct restore_int):
* eval.c (restore_int):
* eval.c (record_unwind_protect_restoring_int):
* eval.c (free_pointer):
* eval.c (record_unwind_protect_freeing):
* eval.c (free_dynarr):
* eval.c (record_unwind_protect_freeing_dynarr):
* eval.c (unbind_to_1):
Use STORE_VOID_IN_LISP and GET_VOID_FROM_LISP to eliminate the
use of make_opaque_ptr() and mostly eliminate Lisp consing
entirely in the use of these various record_unwind_protect_*
functions as well as internal_bind_* (e.g. internal_bind_int).
* tests.c:
* tests.c (Ftest_store_void_in_lisp):
* tests.c (syms_of_tests):
* tests.c (vars_of_tests):
Add an C-assert-style test to test STORE_VOID_IN_LISP and
GET_VOID_FROM_LISP to make sure the same value comes back that
was put in.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 08 Feb 2010 06:42:16 -0600 |
| parents | 023b83f4e54b |
| children | 308d34e9f07d |
line wrap: on
line source
;;; wid-browse.el --- Functions for browsing widgets. ;; ;; Copyright (C) 1997 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Keywords: extensions ;; Version: 1.9960 ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/ ;; 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 2, 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; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;; ;; Widget browser. See `widget.el'. ;;; Code: (require 'easymenu) (require 'custom) (require 'wid-edit) (eval-when-compile (require 'cl)) (defgroup widget-browse nil "Customization support for browsing widgets." :group 'widgets) ;;; The Mode. (defvar widget-browse-mode-map nil "Keymap for `widget-browse-mode'.") (unless widget-browse-mode-map (setq widget-browse-mode-map (make-sparse-keymap)) (set-keymap-parent widget-browse-mode-map widget-keymap) (define-key widget-browse-mode-map "q" 'bury-buffer)) (easy-menu-define widget-browse-mode-customize-menu widget-browse-mode-map "Menu used in widget browser buffers." (customize-menu-create 'widgets)) (easy-menu-define widget-browse-mode-menu widget-browse-mode-map "Menu used in widget browser buffers." '("Widget" ["Browse" widget-browse t] ["Browse At" widget-browse-at t])) (defcustom widget-browse-mode-hook nil "Hook called when entering widget-browse-mode." :type 'hook :group 'widget-browse) (defun widget-browse-mode () "Major mode for widget browser buffers. The following commands are available: \\[widget-forward] Move to next button or editable field. \\[widget-backward] Move to previous button or editable field. \\[widget-button-click] Activate button under the mouse pointer. \\[widget-button-press] Activate button under point. Entry to this mode calls the value of `widget-browse-mode-hook' if that value is non-nil." (kill-all-local-variables) (setq major-mode 'widget-browse-mode mode-name "Widget") (use-local-map widget-browse-mode-map) (easy-menu-add widget-browse-mode-customize-menu) (easy-menu-add widget-browse-mode-menu) (run-hooks 'widget-browse-mode-hook)) ;;; Commands. ;;;###autoload (defun widget-browse-at (pos) "Browse the widget under point." (interactive "d") (let* ((field (get-char-property pos 'field)) (button (get-char-property pos 'button)) (doc (get-char-property pos 'widget-doc)) (text (cond (field "This is an editable text area.") (button "This is an active area.") (doc "This is documentation text.") (t "This is unidentified text."))) (widget (or field button doc))) (when widget (widget-browse widget)) (message text))) (defvar widget-browse-history nil) ;;;###autoload (defun widget-browse (widget) "Create a widget browser for WIDGET." (interactive (list (completing-read "Widget: " obarray (lambda (symbol) (get symbol 'widget-type)) t nil 'widget-browse-history))) (if (stringp widget) (setq widget (intern widget))) (unless (if (symbolp widget) (get widget 'widget-type) (and (consp widget) (get (widget-type widget) 'widget-type))) (error "Not a widget.")) ;; Create the buffer. (if (symbolp widget) (let ((buffer (format "*Browse %s Widget*" widget))) (kill-buffer (get-buffer-create buffer)) (switch-to-buffer (get-buffer-create buffer))) (kill-buffer (get-buffer-create "*Browse Widget*")) (switch-to-buffer (get-buffer-create "*Browse Widget*"))) (widget-browse-mode) ;; Quick way to get out. ;; (widget-create 'push-button ;; :action (lambda (widget &optional event) ;; (bury-buffer)) ;; "Quit") ;; (widget-insert "\n") ;; Top text indicating whether it is a class or object browser. (if (listp widget) (widget-insert "Widget object browser.\n\nClass: ") (widget-insert "Widget class browser.\n\n") (widget-create 'widget-browse :format "%[%v%]\n%d" :doc (get widget 'widget-documentation) widget) (unless (eq (preceding-char) ?\n) (widget-insert "\n")) (widget-insert "\nSuper: ") (setq widget (get widget 'widget-type))) ;; Now show the attributes. (let ((name (car widget)) (items (cdr widget)) key value printer) (widget-create 'widget-browse :format "%[%v%]" name) (widget-insert "\n") (while items (setq key (nth 0 items) value (nth 1 items) printer (or (get key 'widget-keyword-printer) 'widget-browse-sexp) items (cdr (cdr items))) (widget-insert "\n" (symbol-name key) "\n\t") (funcall printer widget key value) (widget-insert "\n"))) (widget-setup) (goto-char (point-min))) ;;;###autoload (defun widget-browse-other-window (&optional widget) "Show widget browser for WIDGET in other window." (interactive) (let ((window (selected-window))) (switch-to-buffer-other-window "*Browse Widget*") (if widget (widget-browse widget) (call-interactively 'widget-browse)) (select-window window))) ;;; The `widget-browse' Widget. (define-widget 'widget-browse 'push-button "Button for creating a widget browser. The :value of the widget shuld be the widget to be browsed." :format "%[[%v]%]" :value-create 'widget-browse-value-create :action 'widget-browse-action) (defun widget-browse-action (widget &optional event) ;; Create widget browser for WIDGET's :value. (widget-browse (widget-get widget :value))) (defun widget-browse-value-create (widget) ;; Insert type name. (let ((value (widget-get widget :value))) (cond ((symbolp value) (insert (symbol-name value))) ((consp value) (insert (symbol-name (widget-type value)))) (t (insert "strange"))))) ;;; Keyword Printer Functions. (defun widget-browse-widget (widget key value) "Insert description of WIDGET's KEY VALUE. VALUE is assumed to be a widget." (widget-create 'widget-browse value)) (defun widget-browse-widgets (widget key value) "Insert description of WIDGET's KEY VALUE. VALUE is assumed to be a list of widgets." (while value (widget-create 'widget-browse (car value)) (setq value (cdr value)) (when value (widget-insert " ")))) (defun widget-browse-sexp (widget key value) "Insert description of WIDGET's KEY VALUE. Nothing is assumed about value." (let ((pp (condition-case signal (declare-fboundp (pp-to-string value)) (error (prin1-to-string signal))))) (when (string-match "\n\\'" pp) (setq pp (substring pp 0 (1- (length pp))))) (if (cond ((string-match "\n" pp) nil) ((> (length pp) (- (window-width) (current-column))) nil) (t t)) (widget-insert pp) (widget-create 'push-button :tag "show" :action (lambda (widget &optional event) (with-output-to-temp-buffer "*Pp Eval Output*" (princ (widget-get widget :value)))) pp)))) (defun widget-browse-sexps (widget key value) "Insert description of WIDGET's KEY VALUE. VALUE is assumed to be a list of widgets." (let ((target (current-column))) (while value (widget-browse-sexp widget key (car value)) (setq value (cdr value)) (when value (widget-insert "\n" (make-string target ?\ )))))) ;;; Keyword Printers. (put :parent 'widget-keyword-printer 'widget-browse-widget) (put :children 'widget-keyword-printer 'widget-browse-widgets) (put :buttons 'widget-keyword-printer 'widget-browse-widgets) (put :button 'widget-keyword-printer 'widget-browse-widget) (put :args 'widget-keyword-printer 'widget-browse-sexps) ;;; Widget Minor Mode. (defvar widget-minor-mode nil "I non-nil, we are in Widget Minor Mode.") (make-variable-buffer-local 'widget-minor-mode) (defvar widget-minor-mode-map nil "Keymap used in Widget Minor Mode.") (unless widget-minor-mode-map (setq widget-minor-mode-map (make-sparse-keymap)) (set-keymap-parent widget-minor-mode-map widget-keymap)) ;;;###autoload (defun widget-minor-mode (&optional arg) "Togle minor mode for traversing widgets. With arg, turn widget mode on if and only if arg is positive." (interactive "P") (cond ((null arg) (setq widget-minor-mode (not widget-minor-mode))) ((<= arg 0) (setq widget-minor-mode nil)) (t (setq widget-minor-mode t))) (force-mode-line-update)) (add-to-list 'minor-mode-alist '(widget-minor-mode " Widget")) (add-to-list 'minor-mode-map-alist (cons 'widget-minor-mode widget-minor-mode-map)) ;;; The End: (provide 'wid-browse) ;; wid-browse.el ends here
