Mercurial > hg > xemacs-beta
view lisp/dialog-gtk.el @ 5124:623d57b7fbe8 ben-lisp-object
separate regular and disksave finalization, print method fixes.
Create separate disksave method and make the finalize method only be for
actual object finalization, not disksave finalization.
Fix places where 0 was given in place of a printer -- print methods are
mandatory, and internal objects formerly without a print method now must
explicitly specify internal_object_printer().
Change the defn of CONSOLE_LIVE_P to avoid problems in some weird situations.
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-01-20 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (very_old_free_lcrecord):
* alloc.c (disksave_object_finalization_1):
* alloc.c (make_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (sweep_lcrecords_1):
* buffer.c:
* bytecode.c:
* bytecode.c (Fcompiled_function_p):
* chartab.c:
* console-impl.h:
* console-impl.h (CONSOLE_TYPE_P):
* console.c:
* console.c (set_quit_events):
* data.c:
* data.c (Fmake_ephemeron):
* database.c:
* database.c (finalize_database):
* database.c (Fclose_database):
* device-msw.c:
* device-msw.c (finalize_devmode):
* device-msw.c (allocate_devmode):
* device.c:
* elhash.c:
* elhash.c (finalize_hash_table):
* eval.c:
* eval.c (bind_multiple_value_limits):
* event-stream.c:
* event-stream.c (finalize_command_builder):
* events.c:
* events.c (mark_event):
* extents.c:
* extents.c (finalize_extent_info):
* extents.c (uninit_buffer_extents):
* faces.c:
* file-coding.c:
* file-coding.c (finalize_coding_system):
* file-coding.h:
* file-coding.h (struct coding_system_methods):
* file-coding.h (struct detector):
* floatfns.c:
* floatfns.c (extract_float):
* fns.c:
* fns.c (Fidentity):
* font-mgr.c (finalize_fc_pattern):
* font-mgr.c (finalize_fc_config):
* frame.c:
* glyphs.c:
* glyphs.c (finalize_image_instance):
* glyphs.c (unmap_subwindow_instance_cache_mapper):
* gui.c:
* gui.c (gui_error):
* keymap.c:
* lisp.h (struct Lisp_Symbol):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
* lrecord.h (MC_ALLOC_CALL_FINALIZER):
* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE):
* lrecord.h (DEFINE_DUMPABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (MAKE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (MAKE_MODULE_LISP_OBJECT):
* lstream.c:
* lstream.c (finalize_lstream):
* lstream.c (disksave_lstream):
* marker.c:
* marker.c (finalize_marker):
* mule-charset.c (make_charset):
* number.c:
* objects.c:
* objects.c (finalize_color_instance):
* objects.c (finalize_font_instance):
* opaque.c:
* opaque.c (make_opaque_ptr):
* process-nt.c:
* process-nt.c (nt_finalize_process_data):
* process-nt.c (nt_deactivate_process):
* process.c:
* process.c (finalize_process):
* procimpl.h (struct process_methods):
* scrollbar.c:
* scrollbar.c (free_scrollbar_instance):
* specifier.c (finalize_specifier):
* symbols.c:
* toolbar.c:
* toolbar.c (Ftoolbar_button_p):
* tooltalk.c:
* ui-gtk.c:
* ui-gtk.c (emacs_gtk_object_finalizer):
* ui-gtk.c (allocate_emacs_gtk_boxed_data):
* window.c:
* window.c (finalize_window):
* window.c (mark_window_as_deleted):
Separate out regular and disksave finalization. Instead of a
FOR_DISKSAVE argument to the finalizer, create a separate object
method `disksaver'. Make `finalizer' have only one argument.
Go through and separate out all finalize methods into finalize
and disksave. Delete lots of thereby redundant disksave checking.
Delete places that signal an error if we attempt to disksave --
all of these objects are non-dumpable and we will get an error
from pdump anyway if we attempt to dump them. After this is done,
only one object remains that has a disksave method -- lstream.
Change DEFINE_*_LISP_OBJECT_WITH_PROPS to DEFINE_*_GENERAL_LISP_OBJECT,
which is used for specifying either property methods or disksave
methods (or in the future, any other less-used methods).
Remove the for_disksave argument to finalize_process_data. Don't
provide a disksaver for processes because no one currently needs
it.
Clean up various places where objects didn't provide a print method.
It was made mandatory in previous changes, and all methods now
either provide their own print method or use internal_object_printer
or external_object_printer.
Change the definition of CONSOLE_LIVE_P to use the contype enum
rather than looking into the conmeths structure -- in some weird
situations with dead objects, the conmeths structure is NULL,
and printing such objects from debug_print() will crash if we try
to look into the conmeths structure.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 20 Jan 2010 07:05:57 -0600 |
parents | ecf1ebac70d8 |
children | f00192e1cd49 308d34e9f07d |
line wrap: on
line source
;;; dialog-gtk.el --- Dialog-box support for XEmacs w/GTK primitives ;; Copyright (C) 2000 Free Software Foundation, Inc. ;; Maintainer: William M. Perry <wmperry@gnu.org> ;; Keywords: extensions, internal, 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 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, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: Not in FSF. ;;; Commentary: ;; This file is dumped with XEmacs (when dialog boxes are compiled in). (require 'cl) (require 'gtk-password-dialog) (require 'gtk-file-dialog) (globally-declare-fboundp '(gtk-signal-connect gtk-main-quit gtk-window-set-transient-for gtk-widget-show-all gtk-main gtk-color-selection-dialog-new gtk-color-selection-dialog-ok-button gtk-widget-hide-all gtk-color-selection-get-color gtk-color-selection-dialog-colorsel gtk-color-selection-dialog-cancel-button gtk-widget-show-now gtk-widget-grab-focus gtk-widget-destroy gtk-dialog-new gtk-window-set-title gtk-container-set-border-width gtk-box-set-spacing gtk-dialog-vbox gtk-container-add gtk-label-new gtk-button-new-with-label gtk-widget-set-sensitive gtk-widget-show gtk-dialog-action-area gtk-label-parse-uline gtk-widget-add-accelerator gtk-accel-group-new gtk-misc-set-alignment gtk-button-new gtk-window-add-accel-group)) (defun gtk-popup-convert-underscores (str) ;; Convert the XEmacs button accelerator representation to Gtk mnemonic ;; form. If no accelerator has been provided, put one at the start of the ;; string (this mirrors the behaviour under X). This algorithm is also found ;; in menubar-gtk.c:convert_underscores(). (let ((new-str (string)) (i 0) (found-accel nil)) (while (< i (length str)) (let ((c (aref str i))) (cond ((eq c ?%) (setq i (1+ i)) (if (and (not (eq (aref str i) ?_)) (not (eq (aref str i) ?%))) (setq i (1- i))) (setq found-accel 1) ) ((eq c ?_) (setq new-str (concat new-str "_"))) )) (setq new-str (concat new-str (string (aref str i)))) (setq i (1+ i)) ) (if found-accel new-str (concat "_" new-str)) )) (defun popup-builtin-open-dialog (keys) ;; Allowed keywords are: ;; ;; :initial-filename fname ;; :initial-directory dir ;; :filter-list (filter-desc filter ...) ;; :directory t/nil ;; :title string ;; :allow-multi-select t/nil ;; :create-prompt-on-nonexistent t/nil ;; :overwrite-prompt t/nil ;; :file-must-exist t/nil ;; :no-network-button t/nil ;; :no-read-only-return t/nil (let ((initial-filename (plist-get keys :initial-filename)) (clicked-ok nil) (widget nil) filename) (setq widget (gtk-file-dialog-new :directory (plist-get keys :directory) :callback `(lambda (f) (setq clicked-ok t filename f)) :initial-directory (or (plist-get keys :initial-directory nil) (if initial-filename (file-name-directory initial-filename) default-directory)) :filter-list (plist-to-alist (plist-get keys :filter-list nil)) :file-must-exist (plist-get keys :file-must-exist nil))) (gtk-signal-connect widget 'destroy (lambda (obj data) (gtk-main-quit))) (gtk-window-set-transient-for widget (frame-property nil 'shell-widget)) (gtk-widget-show-all widget) (gtk-main) (if (not clicked-ok) (signal 'quit nil) filename))) (defalias 'popup-builtin-save-as-dialog 'popup-builtin-open-dialog) (defun popup-builtin-color-dialog (keys) ;; Allowed keys: ;; :initial-color COLOR (let (;(initial-color (or (plist-get keys :initial-color) "white")) (title (or (plist-get keys :title "Select color..."))) (dialog nil) (clicked-ok nil) (color nil)) (setq dialog (gtk-color-selection-dialog-new title)) (gtk-signal-connect (gtk-color-selection-dialog-ok-button dialog) 'clicked (lambda (button colorsel) (gtk-widget-hide-all dialog) (setq color (gtk-color-selection-get-color colorsel) clicked-ok t) (gtk-main-quit)) (gtk-color-selection-dialog-colorsel dialog)) (gtk-signal-connect (gtk-color-selection-dialog-cancel-button dialog) 'clicked (lambda (&rest ignored) (gtk-main-quit))) (put dialog 'modal t) (put dialog 'type 'dialog) (gtk-window-set-transient-for dialog (frame-property nil 'shell-widget)) (unwind-protect (progn (gtk-widget-show-now dialog) (gtk-main)) '(gtk-widget-destroy dialog)) (if (not clicked-ok) (signal 'quit nil)) ;; Need to convert from (R G B A) to #rrggbb (format "#%02x%02x%02x" (* 256 (nth 0 color)) (* 256 (nth 1 color)) (* 256 (nth 2 color))))) (defun popup-builtin-password-dialog (keys) ;; Format is (default callback :keyword value) ;; Allowed keywords are: ;; ;; :title string :; :prompt string ;; :default string ;; :verify boolean ;; :verify-prompt string (let* ((default (plist-get keys :default)) (dialog nil) (clicked-ok nil) (passwd nil) (info nil) (generic-cb (lambda (x) (setq clicked-ok t passwd x)))) ;; Convert the descriptor to keywords and create the dialog (setq info (copy-list keys) info (plist-put info :callback generic-cb) info (plist-put info :default default) dialog (apply 'gtk-password-dialog-new info)) ;; Clicking any button or closing the box exits the main loop. (gtk-signal-connect (gtk-password-dialog-ok-button dialog) 'clicked (lambda (&rest ignored) (gtk-main-quit))) (gtk-signal-connect (gtk-password-dialog-cancel-button dialog) 'clicked (lambda (&rest ignored) (gtk-main-quit))) (gtk-signal-connect dialog 'delete-event (lambda (&rest ignored) (gtk-main-quit))) (gtk-widget-grab-focus (gtk-password-dialog-entry-widget dialog)) ;; Make us modal... (put dialog 'modal t) (gtk-window-set-transient-for dialog (frame-property nil 'shell-widget)) ;; Realize the damn thing & wait for some action... (gtk-widget-show-all dialog) (gtk-main) (if (not clicked-ok) (signal 'quit nil)) (gtk-widget-destroy dialog) passwd)) (defun popup-builtin-question-dialog (keys) ;; Allowed keywords: ;; :question STRING ;; :buttons BUTTONDESC (let ((title (or (plist-get keys :title) "Question")) (buttons-descr (plist-get keys :buttons)) (question (or (plist-get keys :question) "Question goes here...")) (dialog nil) ; GtkDialog (buttons nil) ; List of GtkButton objects (activep t) (callback nil) (flushrightp nil) (length nil) (label nil) (gui-button nil) (accel-group (gtk-accel-group-new)) (accel-key nil) (errp t)) (if (not buttons-descr) (error 'syntax-error "Dialog descriptor must supply at least one button")) ;; Do the basics - create the dialog, set the window title, and ;; add the label asking the question. (unwind-protect (progn (setq dialog (gtk-dialog-new)) (gtk-window-set-title dialog title) (gtk-container-set-border-width dialog 3) (gtk-box-set-spacing (gtk-dialog-vbox dialog) 5) (gtk-container-add (gtk-dialog-vbox dialog) (gtk-label-new question)) ;; Create the buttons. (mapc (lambda (button) ;; Handle flushright buttons (if (null button) (setq flushrightp t) ;; More sanity checking first of all. (if (not (vectorp button)) (error "Button descriptor is not a vector: %S" button)) (setq length (length button)) (cond ((= length 1) ; [ "name" ] (setq callback nil activep nil)) ((= length 2) ; [ "name" callback ] (setq callback (aref button 1) activep t)) ((and (or (= length 3) (= length 4)) (not (keywordp (aref button 2)))) ;; [ "name" callback active-p ] or ;; [ "name" callback active-p suffix ] ;; We ignore the 'suffix' entry, because that is ;; what the X code does. (setq callback (aref button 1) activep (aref button 2))) (t ; 100% keyword specification (let ((plist (cdr (mapcar 'identity button)))) (setq activep (plist-get plist :active) callback (plist-get plist :callback))))) ;; Create the label and determine what the mnemonic key is. (setq label (gtk-label-new "")) (setq accel-key (gtk-label-parse-uline label (gtk-popup-convert-underscores (aref button 0)))) ;; Place the label in the button. (gtk-misc-set-alignment label 0.5 0.5) (setq gui-button (gtk-button-new)) (gtk-container-add gui-button label) ;; Add ALT-mnemonic to the dialog's accelerator group. (gtk-widget-add-accelerator gui-button "clicked" accel-group accel-key 8 ; GDK_MOD1_MASK 4 ; GTK_ACCEL_LOCKED ) (push gui-button buttons) (gtk-widget-set-sensitive (car buttons) (eval activep)) ;; Apply the callback (gtk-signal-connect (car buttons) 'clicked (lambda (button data) (push (make-event 'misc-user (list 'object (car data) 'function (if (symbolp (car data)) 'call-interactively 'eval))) unread-command-events) (gtk-main-quit) t) (cons callback dialog)) (gtk-widget-show (car buttons)) (funcall (if flushrightp 'gtk-box-pack-end 'gtk-box-pack-start) (gtk-dialog-action-area dialog) (car buttons) nil t 2))) buttons-descr) ;; Make sure they can't close it with the window manager (gtk-signal-connect dialog 'delete-event (lambda (&rest ignored) t)) (gtk-window-set-transient-for dialog (frame-property nil 'shell-widget)) (put dialog 'type 'dialog) (put dialog 'modal t) ;; Make the dialog listen for global mnemonic keys/ (gtk-window-add-accel-group dialog accel-group) (gtk-widget-show-all dialog) (gtk-main) (gtk-widget-destroy dialog) (setq errp nil)) (if (not errp) ;; Nothing, we successfully showed the dialog nil ;; We need to destroy all the widgets, just in case. (mapc 'gtk-widget-destroy buttons) (gtk-widget-destroy dialog))))) (defun gtk-make-dialog-box-internal (type keys) (case type (file (popup-builtin-open-dialog keys)) (password (popup-builtin-password-dialog keys)) (question (popup-builtin-question-dialog keys)) (color (popup-builtin-color-dialog keys)) (find ) (font ) (replace ) (mswindows-message ;; This should really be renamed! ) (print ) (page-setup ) (print-setup ) (default (error "Unknown type of dialog: %S" type)))) (provide 'dialog-gtk)