comparison lisp/dialog.el @ 844:047d37eb70d7

[xemacs-hg @ 2002-05-16 13:30:23 by ben] ui fixes for things that were bothering me bytecode.c, editfns.c, lisp.h, lread.c: Fix save-restriction to use markers rather than pseudo-markers (integers representing the amount of text on either side of the region). That way, all inserts are handled correctly, not just those inside old restriction. Add buffer argument to save_restriction_save(). process.c: Clean up very dirty and kludgy code that outputs into a buffer -- use proper unwind protects, etc. font-lock.c: Do save-restriction/widen around the function -- otherwise, incorrect results will ensue when a buffer has been narrowed before a call to e.g. `buffer-syntactic-context' -- something that happens quite often. fileio.c: Look for a handler for make-temp-name. window.c, winslots.h: Try to solve this annoying problem: have two frames displaying the buffer, in different places; in one, temporarily switch away to another buffer and then back -- and you've lost your position; it's reset to the other one in the other frame. My current solution involves window-level caches of buffers and points (also a cache for window-start); when set-window-buffer is called, it looks to see if the buffer was previously visited in the window, and if so, uses the most recent point at that time. (It's a marker, so it handles changes.) #### Note: It could be argued that doing it on the frame level would be better -- e.g. if you visit a buffer temporarily through a grep, and then go back to that buffer, you presumably want the grep's position rather than some previous position provided everything was in the same frame, even though the grep was in another window in the frame. However, doing it on the frame level fails when you have two windows on the same frame. Perhaps we keep both a window and a frame cache, and use the frame cache if there are no other windows on the frame showing the buffer, else the window's cache? This is probably something to be configurable using a specifier. Suggestions please please please? window.c: Clean up a bit code that deals with the annoyance of window-point vs. point. dialog.el: Function to ask a multiple-choice question, automatically choosing a dialog box or minibuffer representation as necessary. Generalized version of yes-or-no-p, y-or-n-p. files.el: Use get-user-response to ask "yes/no/diff" question when recovering. "diff" means that a diff is displayed between the current file and the autosave. (Converts/deconverts escape-quoted as necessary. No more complaints from you, Mr. Turnbull!) One known problem: when a dialog is used, it's modal, so you can't scroll the diff. Will fix soon. lisp-mode.el: If we're filling a string, don't treat semicolon as a comment, which would give very unfriendly results. Uses `buffer-syntactic-context'. simple.el: all changes back to the beginning. (Useful if you've saved the file in the middle of the changes.) simple.el: Add option kill-word-into-kill-ring, which controls whether words deleted with kill-word, backward-kill-word, etc. are "cut" into the kill ring, or "cleared" into nothingness. (My preference is the latter, by far. I'd almost go so far as suggesting we make it the default, as you can always select a word and then cut it if you want it cut.) menubar-items.el: Add option corresponding to kill-word-into-kill-ring.
author ben
date Thu, 16 May 2002 13:30:58 +0000
parents 685b588e92d8
children 42375619fa45
comparison
equal deleted inserted replaced
843:f46864126a0d 844:047d37eb70d7
1 ;;; dialog.el --- Dialog-box support for XEmacs 1 ;;; dialog.el --- Dialog-box support for XEmacs
2 2
3 ;; Copyright (C) 1991-4, 1997 Free Software Foundation, Inc. 3 ;; Copyright (C) 1991-4, 1997 Free Software Foundation, Inc.
4 ;; Copyright (C) 2000 Ben Wing. 4 ;; Copyright (C) 2000, 2002 Ben Wing.
5 5
6 ;; Maintainer: XEmacs Development Team 6 ;; Maintainer: XEmacs Development Team
7 ;; Keywords: extensions, internal, dumped 7 ;; Keywords: extensions, internal, dumped
8 8
9 ;; This file is part of XEmacs. 9 ;; This file is part of XEmacs.
22 ;; along with XEmacs; see the file COPYING. If not, write to the 22 ;; along with XEmacs; see the file COPYING. If not, write to the
23 ;; Free Software Foundation, 59 Temple Place - Suite 330, 23 ;; Free Software Foundation, 59 Temple Place - Suite 330,
24 ;; Boston, MA 02111-1307, USA. 24 ;; Boston, MA 02111-1307, USA.
25 25
26 ;;; Synched up with: Not in FSF. 26 ;;; Synched up with: Not in FSF.
27
28 ;;; Authorship: Mostly written or rewritten by Ben Wing; some old old stuff
29 ;;; that underlies some current code was written by JWZ.
27 30
28 ;;; Commentary: 31 ;;; Commentary:
29 32
30 ;; This file is dumped with XEmacs (when dialog boxes are compiled in). 33 ;; This file is dumped with XEmacs (when dialog boxes are compiled in).
31 34
86 ;;this will never get selected 89 ;;this will never get selected
87 `[,x 'ignore nil]) 90 `[,x 'ignore nil])
88 (t 91 (t
89 `[,(car x) (dialog-box-finish ',(cdr x)) t]))) 92 `[,(car x) (dialog-box-finish ',(cdr x)) t])))
90 (cdr contents)))) 93 (cdr contents))))
94
95 (defun get-user-response (position question answers)
96 "Ask a question and get a response from the user, in minibuffer or dialog box.
97 POSITION specifies which frame to use.
98 This is normally an event or a window or frame.
99 If POSITION is t or nil, it means to use the frame the mouse is on.
100 The dialog box appears in the middle of the specified frame.
101
102 QUESTION is the question to ask (it should end with a question mark followed
103 by a space).
104
105 ANSWERS are the possible answers. It is a list; each item looks like
106
107 (KEY BUTTON-TEXT RESPONSE)
108
109 where KEY is the key to be pressed in the minibuffer, BUTTON-TEXT is the
110 text to be displayed in a dialog box button (you should put %_ in it to
111 indicate the accelerator), and RESPONSE is a value (typically a symbol)
112 to be returned if the user selects this response. KEY should be either a
113 single character or a string; which one you use needs to be consistent for
114 all responses and determines whether the user responds by hitting a single
115 key or typing in a string and hitting ENTER.
116
117 An item may also be just a string--that makes a nonselectable item in the
118 dialog box and is ignored in the minibuffer.
119
120 An item may also be nil -- that means to put all preceding items
121 on the left of the dialog box and all following items on the right; ignored
122 in the minibuffer."
123 (if (should-use-dialog-box-p)
124 (get-dialog-box-response
125 position
126 (cons question
127 (mapcar #'(lambda (x)
128 (cond
129 ((null x) nil)
130 ((stringp x) x)
131 (t (cons (second x) (third x)))))
132 answers)))
133 (save-excursion
134 (let* ((answers (remove-if-not #'consp answers))
135 (possible
136 (gettext
137 (flet ((car-to-string-if (x)
138 (setq x (car x))
139 (if (stringp x) x (char-to-string x))))
140 (concat (mapconcat #'car-to-string-if
141 (butlast answers) ", ") " or "
142 (car-to-string-if (car (last answers)))))))
143 (question (gettext question))
144 (p (format "%s(%s) " question possible)))
145 (block nil
146 (if (stringp (caar answers))
147 ;; based on yes-or-no-p.
148 (while t
149 (let* ((ans (downcase (read-string p nil t))) ;no history
150 (res (member* ans answers :test #'equal :key #'car)))
151 (if res (return (third (car res)))
152 (ding nil 'yes-or-no-p)
153 (discard-input)
154 (message "Please answer %s." possible)
155 (sleep-for 2))))
156 ;; based on y-or-n-p.
157 (save-excursion
158 (let* ((pre "") event)
159 (while t
160 (if (let ((cursor-in-echo-area t)
161 (inhibit-quit t))
162 (message "%s%s(%s) " pre question possible)
163 (setq event (next-command-event event))
164 (condition-case nil
165 (prog1
166 (or quit-flag (eq 'keyboard-quit
167 (key-binding event)))
168 (setq quit-flag nil))
169 (wrong-type-argument t)))
170 (progn
171 (message "%s%s(%s) %s" pre question possible
172 (single-key-description event))
173 (setq quit-flag nil)
174 (signal 'quit '())))
175 (let* ((keys (events-to-keys (vector event)))
176 (def (lookup-key query-replace-map keys)))
177 (cond
178 ; ((eq def 'skip)
179 ; (message "%s%sNo" question possible)
180 ; (return nil))
181 ; ((eq def 'act)
182 ; (message "%s%sYes" question possible)
183 ; (return t))
184 ((eq def 'recenter)
185 (recenter))
186 ((or (eq def 'quit) (eq def 'exit-prefix))
187 (signal 'quit '()))
188 ((button-release-event-p event) ; ignore them
189 nil)
190 (t
191 (let ((res (member* (event-to-character event) answers
192 :key #'car)))
193 (if res (return (third (car res)))
194 (message "%s%s(%s) %s" pre question possible
195 (single-key-description event))
196 (ding nil 'y-or-n-p)
197 (discard-input)
198 (if (= (length pre) 0)
199 (setq pre (format "Please answer %s. "
200 ;; 17 parens! a record in
201 ;; our lisp code.
202 possible)))))))))))))))))
203
91 204
92 (defun message-box (fmt &rest args) 205 (defun message-box (fmt &rest args)
93 "Display a message, in a dialog box if possible. 206 "Display a message, in a dialog box if possible.
94 If the selected device has no dialog-box support, use the echo area. 207 If the selected device has no dialog-box support, use the echo area.
95 The arguments are the same as to `format'. 208 The arguments are the same as to `format'.