Mercurial > hg > xemacs-beta
view lisp/dialog-gtk.el @ 617:af57a77cbc92
[xemacs-hg @ 2001-06-18 07:09:50 by ben]
---------------------------------------------------------------
DOCUMENTATION FIXES:
---------------------------------------------------------------
eval.c: Correct documentation.
elhash.c: Doc correction.
---------------------------------------------------------------
LISP OBJECT CLEANUP:
---------------------------------------------------------------
bytecode.h, buffer.h, casetab.h, chartab.h, console-msw.h, console.h, database.c, device.h, eldap.h, elhash.h, events.h, extents.h, faces.h, file-coding.h, frame.h, glyphs.h, gui-x.h, gui.h, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lrecord.h, lstream.h, mule-charset.h, objects.h, opaque.h, postgresql.h, process.h, rangetab.h, specifier.h, toolbar.h, tooltalk.h, ui-gtk.h: Add wrap_* to all objects (it was already there for a few of them)
-- an expression to encapsulate a pointer into a Lisp object,
rather than the inconvenient XSET*. "wrap" was chosen because
"make" as in make_int(), make_char() is not appropriate. (It
implies allocation. The issue does not exist for ints and chars
because they are not allocated.)
Full error checking has been added to these expressions. When
used without error checking, non-union build, use of these
expressions will incur no loss of efficiency. (In fact, XSET* is
now defined in terms of wrap_* in a non-union build.) In a union
build, you will also get no loss of efficiency provided that you
have a decent optimizing compiler, and a compiler that either
understands inlines or automatically inlines those particular
functions. (And since people don't normally do their production
builds on union, it doesn't matter.)
Update the sample Lisp object definition in lrecord.h accordingly.
dumper.c: Fix places in dumper that referenced wrap_object to reference
its new name, wrap_pointer_1.
buffer.c, bufslots.h, conslots.h, console.c, console.h, devslots.h, device.c, device.h, frame.c, frame.h, frameslots.h, window.c, window.h, winslots.h: -- Extract out the Lisp objects of `struct device' into devslots.h,
just like for the other structures.
-- Extract out the remaining (not copied into the window config)
Lisp objects in `struct window' into winslots.h; use different
macros (WINDOW_SLOT vs. WINDOW_SAVED_SLOT) to differentiate them.
-- Eliminate the `dead' flag of `struct frame', since it
duplicates information already available in `framemeths', and fix
FRAME_LIVE_P accordingly. (Devices and consoles already work this
way.)
-- In *slots.h, switch to system where MARKED_SLOT is automatically
undef'd at the end of the file. (Follows what winslots.h already
does.)
-- Update the comments at the beginning of *slots.h to be accurate.
-- When making any of the above objects dead, zero it out entirely
and reset all Lisp object slots to Qnil. (We were already doing
this somewhat, but not consistently.) This (1) Eliminates the
possibility of extra objects hanging around that ought to be
GC'd, (2) Causes an immediate crash if anyone tries to access a
structure in one of these objects, (3) Ensures consistent behavior
wrt dead objects.
dialog-msw.c: Use internal_object_printer, since this object should not escape.
---------------------------------------------------------------
FIXING A CRASH THAT I HIT ONCE (AND A RELATED BAD BEHAVIOR):
---------------------------------------------------------------
eval.c: Fix up some comments about the FSF implementation.
Fix two nasty bugs:
(1) condition_case_unwind frees the conses sitting in the
catch->tag slot too quickly, resulting in a crash that I hit.
(2) catches need to be unwound one at a time when calling
unwind-protect code, rather than all at once at the end; otherwise,
incorrect behavior can result. (A comment shows exactly how.)
backtrace.h: Improve comment about FSF differences in the handler stack.
---------------------------------------------------------------
FIXING A CRASH THAT I REPEATEDLY HIT WHEN USING THE MOUSE WHEEL
UNDER MSWINDOWS:
---------------------------------------------------------------
Basic idea: My crash is due either to a dead, non-marked,
GC-collected frame inside of a window mirror, or a prematurely
freed window mirror. We need to mark the Lisp objects inside of
window mirrors. Tracking the lifespan of window mirrors and
scrollbar instances is extremely hard, and there may well be
lurking bugs where such objects are freed too soon. The only safe
way to fix these problems (and it fixes both problems at once) is
to make both of these structures Lisp objects.
lrecord.h, emacs.c, inline.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, symsinit.h: Make scrollbar instances actual Lisp objects. Mark the window
mirrors in them. inline.c needs to know about scrollbar.h now.
Record the new type in lrecord.h. Fix up scrollbar-*.c
appropriately. Create a hash table in scrollbar-msw.c so that the
scrollbar instances stored in scrollbar HWND's are properly
GC-protected. Create complex_vars_of_scrollbar_mswindows() to
create the hash table at startup, and call it from emacs.c. Don't
store the scrollbar instance as a property of the GTK scrollbar,
as it's not used and if we did this, we'd have to separately
GC-protect it in a hash table, like in MS Windows.
lrecord.h, frame.h, frame.c, frameslots.h, redisplay.c, window.c, window.h: Move mark_window_mirror from redisplay.c to window.c. Make window
mirrors actual Lisp objects. Tell lrecord.h about them. Change
the window mirror member of struct frame from a pointer to a Lisp
object, and add XWINDOW_MIRROR in appropriate places. Mark the
scrollbar instances in the window mirror.
redisplay.c, redisplay.h, alloc.c: Delete mark_redisplay. Don't call mark_redisplay. We now mark
frame-specific structures in mark_frame.
NOTE: I also deleted an extremely questionable call to
update_frame_window_mirrors(). It was extremely questionable
before, and now totally impossible, since it will create
Lisp objects during redisplay.
frame.c: Mark the scrollbar instances, which are now Lisp objects.
Call mark_gutter() here, not in mark_redisplay().
gutter.c: Update comments about correct marking.
---------------------------------------------------------------
ISSUES BROUGHT UP BY MARTIN:
---------------------------------------------------------------
buffer.h: Put back these macros the way Steve T and I think they ought to be.
I already explained in a previous changelog entry why I think these
macros should be the way I'd defined them. Once again:
We fix these macros so they don't care about the type of their
lvalues. The non-C-string equivalents of these already function
in the same way, and it's correct because it should be OK to pass
in a CBufbyte *, a BufByte *, a Char_Binary *, an UChar_Binary *,
etc. The whole reason for these different types is to work around
errors caused by signed-vs-unsigned non-matching types. Any
possible error that might be caught in a DFC macro would also be
caught wherever the argument is used elsewhere. So creating
multiple macro versions would add no useful error-checking and
just further complicate an already complicated area.
As for Martin's "ANSI aliasing" bug, XEmacs is not ANSI-aliasing
clean and probably never will be. Unless the board agrees to
change XEmacs in this way (and we really don't want to go down
that road), this is not a bug.
sound.h: Undo Martin's type change.
signal.c: Fix problem identified by Martin with Linux and g++ due to
non-standard declaration of setitimer().
systime.h: Update the docs for "qxe_" to point out why making the
encapsulation explicit is always the right way to go. (setitimer()
itself serves as an example.)
For 21.4:
update-elc-2.el: Correct misplaced parentheses, making lisp/mule not get
recompiled.
| author | ben |
|---|---|
| date | Mon, 18 Jun 2001 07:10:32 +0000 |
| parents | 4d7fdf497470 |
| children | 11502791fc1c |
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)) (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)) (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) (flushrightp 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)) (if (< (length button) 3) (error "Button descriptor is too small: %S" button)) (push (gtk-button-new-with-label (aref button 0)) buttons) ;; Need to detect what flavor of descriptor it is. (if (not (keywordp (aref button 2))) ;; Simple style... just [ name callback activep ] ;; We ignore the 'suffix' entry, because that is what ;; the X code does. (setq activep (aref button 2)) (let ((ctr 2) (len (length button))) (if (logand len 1) (error "Button descriptor has an odd number of keywords and values: %S" button)) (while (< ctr len) (if (eq (aref button ctr) :active) (setq activep (aref button (1+ ctr)) ctr len)) (setq ctr (+ ctr 2))))) (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 (aref button 1) 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) (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)
