Mercurial > hg > xemacs-beta
annotate lisp/resize-minibuffer.el @ 872:79c6ff3eef26
[xemacs-hg @ 2002-06-20 21:18:01 by ben]
font changes etc.; some 21.4 changes
mule/mule-msw-init-late.el: Specify charset->windows-registry conversion.
mule/mule-x-init.el: Delete extra mule font additions here. Put them in faces.c.
cl-macs.el: Document better.
font-lock.el: Move Lisp function regexp to lisp-mode.el.
lisp-mode.el: Various indentation fixes:
Handle flet functions better.
Handle argument lists in defuns and flets.
Handle quoted lists, e.g. property lists -- don't indent like
function calls. Distinguish between lambdas and other lists.
lisp-mode.el: Handle this form.
faces.el, font-menu.el, font.el, gtk-faces.el, msw-faces.el, msw-font-menu.el, x-faces.el, x-init.el: Major overhaul of face-handling code:
-- Fix lots of bogus code in msw-faces.el, msw-font-menu.el,
font-menu.el that was "truenaming" font specs -- i.e. in the
process of frobbing a particular field in a general user-specified
font spec with wildcarded fields, sticking in particular values
for all the remaining wildcarded fields. This bug was rampant
everywhere except in x-faces.el (the oldest and only correctly
written code). This also means that we need to work with font
names at all times and not font instances, because a font instance
is essentially a truenamed font.
-- Total rewrite of extremely junky code in msw-faces.el. Work
with names as well as font instances, and return names; stop
truenaming when canonicalizing and frobbing; fix handling of the
combined style field, i.e. weight/slant (also fixed in font.el).
-- Totally rewrite the frobbing functions in faces.el. This time,
we frob all the instantiators rather than just computing a single
instance value and working backwards. That way, e.g., `bold' will
work for all charsets that have bold available, rather than only
for whatever charset was part of the computed font instance
(another example of the truename virus). Also fix up code to look
at the fallbacks (all of them) when no global value present, so we
don't need to put something in the global value. Intelligently
handle a request to frob a buffer locale, rather than signalling
an error. When frobbing instantiators, try hard to figure out
what device type is associated with them, and frob each according
to its own proper device type. Correctly handle inheritance
vectors given as instantiators. Preserve existing tags when
putting back frobbed instantiators. Extract out general
specifier-frobbing code into specifier.el. Document everything
cleanly. Do lots of other things better, etc.
-- Don't duplicatively set a global specification for the default
font -- it's already in the fallback and we no longer need a
default global specification present. Delete various code in
x-faces.el and msw-faces.el that duplicated the lists of fonts in
faces.c.
-- init-global-faces was not being called at all under MS Windows!
Major bogosity. That caused device-specific values to get stuck
into all the fonts, making it very hard to change them -- setting
global specs caused nothing to happen.
-- Correct weight names in font.el.
-- Lots more font fixups in objects*.c.
Printer.el: Warning fix.
specifier.el: Add more args to map-specifier.
Add various "heuristic" specifier functions to aid in creation of
specifier-munging code such as in faces.el.
subr.el: New functions.
lwlib.c: Fix warning.
config.inc.samp: Clean up, add args to control fastcall (not yet supported! the
changes needed are in another ws of mine), profile support, vc6
support, union-type.
xemacs.dsp, xemacs.mak: Semi-major overhaul.
Fix bug where dump-id was always getting recomputed, forcing a
redump even when nothing changed.
Add support for fastcall. Support edit-and-continue (on by
default) with vc6. Use incremental linking when doing a debug
compilation. Add support for profiling.
Consolidate the various debug flags.
Partial support for "batch-compiling" -- compiling many files on a
single invocation of the compiler. Doesn't seem to help that much
for me, so it's not finished or enabled by default.
Remove HAVE_MSW_C_DIRED, we always do.
Correct some sloppy use of directories.
s/cygwin32.h: Allow pdump to work under Cygwin (mmap is broken, so need to undefine
HAVE_MMAP).
s/win32-common.h, s/windowsnt.h: Support for fastcall. Add WIN32_ANY for identifying all Win32
variants (Cygwin, native, MinGW). Both of these are properly used
in another ws.
alloc.c, balloon-x.c, buffer.c, bytecode.c, callint.c, cm.c, cmdloop.c, cmds.c, console-gtk.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console-x.h, console.c, console.h, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, device.h, devslots.h, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, editfns.c, emacs.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, extents.c, extents.h, faces.c, fileio.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gui-gtk.c, gui-msw.c, gui-x.c, gui.c, gutter.c, input-method-xlib.c, intl-encap-win32.c, intl-win32.c, keymap.c, lisp.h, macros.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h, minibuf.c, mule-charset.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-msw.h, objects-tty.c, objects-tty.h, objects-x.c, objects-x.h, objects.c, objects.h, postgresql.c, print.c, process.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, select-gtk.c, select-msw.c, select-x.c, select.c, signal.c, sound.c, specifier.c, symbols.c, syntax.c, sysdep.c, syssignal.h, syswindows.h, toolbar-common.c, toolbar-gtk.c, toolbar-msw.c, toolbar-x.c, toolbar.c, unicode.c, window.c, window.h: The following are the major changes made:
(1) Separation of various header files into an external and an
internal version, similar to the existing separation of process.h
and procimpl.h. Eventually this should be done for all Lisp
objects. The external version has the same name as currently; the
internal adds -impl. The external file has XFOO() macros for
objects, but the structure is opaque and defined only in the
internal file. It's now reasonable to move all prototypes in
lisp.h into the appropriate external file, and this should be
done. Currently, separation has been done on extents.h,
objects*.h, console.h, device.h, frame.h, and window.h.
For c/d/f/w, the most basic properties are available in the
external header file, with the macros resolving to functions. In
the internal header file, the macros are redefined to directly
access the structure. Also, the global MARK_FOO_CHANGED macros
have been made into functions so that they can be accessed without
needing to include lots of -impl headers -- they are used in
almost exclusively in non-time-critical functions, and take up
enough time that the function overhead will be negligible.
Similarly, the function overhead from making the basic properties
mentioned above into functions is negligible, and code that does
heavy accessing of c/d/f/w structures inevitably ends up needing
the internal header files, anyway.
(2) More face changes.
-- Major rewrite of objects-msw.c. Now handles wildcard specs
properly, rather than "truenaming" (or even worse, signalling an
error, which previously happened with some of the fallbacks if you
tried to use them in make-font-instance!).
-- Split charset matching of fonts into two stages -- one to find
a font specifically designed for a particular charset (by
examining its registry), the second to find a Unicode font that
can support the charset. This needs to proceed as two complete,
separate instantiations in order to work properly (otherwise many
of the fonts in the HELLO page look wrong). This should also make
it easy to support iso10646 (Unicode) fonts under X.
-- All default values for fonts are now completely specified in
the fallbacks. Stuff from mule-x-init.el has all been moved here,
merged with the existing specs, and totally rethought so you get
sensible results. (HELLO now looks much better!).
-- Generalize the "default X/GTK device" stuff into a
per-device-type "default device".
-- Add mswindows-{set-}charset-registry. In time,
charset<->code-page conversion functions will be removed.
-- Wrap protective code around calls to compute device specifier tags,
and do this computation before calling the face initialization code
because the latter may need these tags to be correctly updated.
(3) Other changes.
EmacsFrame.c, glyphs-msw.c, eval.c, gui-x.c, intl-encap-win32.c, search.c, signal.c, toolbar-msw.c, unicode.c: Warning fixes.
config.h.in: #undefs meant to be frobbed by configure *MUST* go inside of
#ifndef WIN32_NO_CONFIGURE, and everything else *MUST* go outside!
eval.c: Let detailed backtraces be detailed.
specifier.c: Don't override user's print-string-length/print-length settings.
glyphs.c: New function image-instance-instantiator.
config.h.in, sysdep.c: Changes for fastcall.
sysdep.c, nt.c: Fix up a previous botched patch that tried to add support for both
EEXIST and EACCES. IF THE BOTCHED PATCH WENT INTO 21.4, THIS FIXUP
NEEDS TO GO IN, TOO.
search.c: Fix *evil* crash due to incorrect synching of syntax-cache code
with 21.1. THIS SHOULD GO INTO 21.4.
author | ben |
---|---|
date | Thu, 20 Jun 2002 21:19:10 +0000 |
parents | 79940b592197 |
children | 94ecba3ecd77 |
rev | line source |
---|---|
771 | 1 ;;; resize-minibuffer.el --- dynamically resize minibuffer to display entire contents |
2 | |
3 ;; Copyright (C) 1990 Roland McGrath | |
4 ;; Copyright (C) 1993, 1994 Noah S. Friedman | |
5 | |
6 ;; Author: Noah Friedman <friedman@prep.ai.mit.edu> | |
7 ;; Author: Roland McGrath <roland@prep.ai.mit.edu> | |
8 ;; Modified for Lucid Emacs By: Peter Stout <pds@cs.cmu.edu> | |
9 ;; Maintainer: friedman@prep.ai.mit.edu | |
10 ;; Keywords: minibuffer, window, frames, display | |
11 | |
12 ;; This file is part of XEmacs. | |
13 | |
14 ;; XEmacs is free software; you can redistribute it and/or modify it | |
15 ;; under the terms of the GNU General Public License as published by | |
16 ;; the Free Software Foundation; either version 2, or (at your option) | |
17 ;; any later version. | |
18 | |
19 ;; XEmacs is distributed in the hope that it will be useful, but | |
20 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
22 ;; General Public License for more details. | |
23 | |
24 ;; You should have received a copy of the GNU General Public License | |
25 ;; along with XEmacs; see the file COPYING. If not, you can either | |
26 ;; send email to this program's maintainer or write to: The Free | |
27 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
28 ;; 02111-1307, USA. | |
29 | |
30 ;;; Synched up with: Not synched. Copied from rsz-minibuf.el to | |
31 ;;; resize-minibuffer.el to avoid current problems where, when there's a | |
32 ;;; file in dump and a file with the same name in packages, a dumping | |
33 ;;; XEmacs will find the wrong one! | |
34 | |
35 ;;; Commentary: | |
36 | |
37 ;; This file has received maintenance by the XEmacs development team. | |
38 | |
776 | 39 ;; $Id: resize-minibuffer.el,v 1.4 2002/03/15 07:43:21 ben Exp $ |
771 | 40 |
41 ;; This package allows the entire contents (or as much as possible) of the | |
42 ;; minibuffer to be visible at once when typing. As the end of a line is | |
43 ;; reached, the minibuffer will resize itself. When the user is done | |
44 ;; typing, the minibuffer will return to its original size. | |
45 | |
46 ;; In window systems where it is possible to have a frame in which the | |
47 ;; minibuffer is the only window, the frame itself can be resized. In FSF | |
48 ;; GNU Emacs 19.22 and earlier, the frame may not be properly returned to | |
49 ;; its original size after it ceases to be active because | |
50 ;; `minibuffer-exit-hook' didn't exist until version 19.23. | |
51 | |
52 ;; NOTE: The code to resize frames has not been tested under Lucid Emacs, | |
53 ;; because detached minibuffers are broken. | |
54 | |
55 ;; Note that the minibuffer and echo area are not the same! They simply | |
56 ;; happen to occupy roughly the same place on the frame. Messages put in | |
57 ;; the echo area will not cause any resizing by this package. | |
58 | |
59 ;; This package is considered a minor mode but it doesn't put anything in | |
60 ;; minor-mode-alist because this mode is specific to the minibuffer, which | |
61 ;; has no modeline. | |
62 | |
63 ;; To use this package, put the following in your .emacs: | |
64 ;; | |
65 ;; (autoload 'resize-minibuffer-mode "rsz-minibuf" nil t) | |
66 ;; | |
67 ;; Invoking the command `resize-minibuffer-mode' will then enable this mode. | |
68 | |
69 ;;; Code: | |
70 | |
71 | |
72 | |
73 (defgroup resize-minibuffer nil | |
74 "Dynamically resize minibuffer to display entire contents" | |
75 :group 'frames) | |
76 | |
77 | |
78 (defcustom resize-minibuffer-mode nil | |
79 "*If non-`nil', resize the minibuffer so its entire contents are visible." | |
80 :type 'boolean | |
81 :require 'rsz-minibuf | |
82 :group 'resize-minibuffer) | |
83 | |
84 (defcustom resize-minibuffer-window-max-height nil | |
85 "*Maximum size the minibuffer window is allowed to become. | |
86 If less than 1 or not a number, the limit is the height of the frame in | |
87 which the active minibuffer window resides." | |
88 :type '(choice (const nil) integer) | |
89 :group 'resize-minibuffer) | |
90 | |
91 (defcustom resize-minibuffer-window-exactly t | |
92 "*If non-`nil', make minibuffer exactly the size needed to display all its contents. | |
93 Otherwise, the minibuffer window can temporarily increase in size but | |
94 never get smaller while it is active." | |
95 :type 'boolean | |
96 :group 'resize-minibuffer) | |
97 | |
98 | |
99 (defcustom resize-minibuffer-frame nil | |
100 "*If non-`nil' and the active minibuffer is the sole window in its frame, allow changing the frame height." | |
101 :type 'boolean | |
102 :group 'resize-minibuffer) | |
103 | |
104 (defcustom resize-minibuffer-frame-max-height nil | |
105 "*Maximum size the minibuffer frame is allowed to become. | |
106 If less than 1 or not a number, there is no limit.") | |
107 | |
108 (defcustom resize-minibuffer-frame-exactly nil | |
109 "*If non-`nil', make minibuffer frame exactly the size needed to display all its contents. | |
110 Otherwise, the minibuffer frame can temporarily increase in size but | |
111 never get smaller while it is active." | |
112 :type 'boolean | |
113 :group 'resize-minibuffer) | |
114 | |
115 | |
116 ;;;###autoload | |
117 (defun resize-minibuffer-mode (&optional prefix) | |
118 "Enable or disable resize-minibuffer mode. | |
119 A negative prefix argument disables this mode. A positive argument or | |
120 argument of 0 enables it. | |
121 | |
122 When this minor mode is enabled, the minibuffer is dynamically resized to | |
123 contain the entire region of text put in it as you type. | |
124 | |
125 The variable `resize-minibuffer-mode' is set to t or nil depending on | |
126 whether this mode is active or not. | |
127 | |
128 The maximum height to which the minibuffer can grow is controlled by the | |
129 variable `resize-minibuffer-window-max-height'. | |
130 | |
131 The variable `resize-minibuffer-window-exactly' determines whether the | |
132 minibuffer window should ever be shrunk to make it no larger than needed to | |
133 display its contents. | |
134 | |
135 When using a window system, it is possible for a minibuffer to be the sole | |
136 window in a frame. Since that window is already its maximum size, the only | |
137 way to make more text visible at once is to increase the size of the frame. | |
138 The variable `resize-minibuffer-frame' controls whether this should be | |
139 done. The variables `resize-minibuffer-frame-max-height' and | |
140 `resize-minibuffer-frame-exactly' are analogous to their window | |
141 counterparts." | |
142 (interactive "p") | |
143 (or prefix (setq prefix 0)) | |
144 (cond | |
145 ((>= prefix 0) | |
146 (setq resize-minibuffer-mode t)) | |
147 (t | |
148 (setq resize-minibuffer-mode nil)))) | |
149 | |
150 (defun resize-minibuffer-setup () | |
151 (cond | |
152 (resize-minibuffer-mode | |
153 (cond | |
154 ((and (not (eq 'tty (console-type))) | |
155 (eq 'only (plist-get (frame-properties) 'minibuffer))) | |
156 (and resize-minibuffer-frame | |
157 (progn | |
158 (make-local-hook 'minibuffer-exit-hook) | |
159 (add-hook 'minibuffer-exit-hook 'resize-minibuffer-frame-restore | |
160 nil t) | |
161 (make-local-hook 'post-command-hook) | |
162 (add-hook 'post-command-hook 'resize-minibuffer-frame nil t) | |
776 | 163 (unless (and-boundp 'icomplete-mode icomplete-mode) |
771 | 164 (resize-minibuffer-frame))))) |
165 (t | |
166 (make-local-hook 'post-command-hook) | |
167 (add-hook 'post-command-hook 'resize-minibuffer-window nil t) | |
776 | 168 (unless (and-boundp 'icomplete-mode icomplete-mode) |
771 | 169 (resize-minibuffer-window))))))) |
170 | |
171 (defun resize-minibuffer-count-window-lines (&optional start end) | |
172 "Return number of window lines occupied by text in region. | |
173 The number of window lines may be greater than the number of actual lines | |
174 in the buffer if any wrap on the display due to their length. | |
175 | |
176 Optional arguments START and END default to point-min and point-max, | |
177 respectively." | |
178 (or start (setq start (point-min))) | |
179 (or end (setq end (point-max))) | |
180 (if (= start end) | |
181 0 | |
182 (save-excursion | |
183 (save-restriction | |
184 (widen) | |
185 (narrow-to-region start end) | |
186 (goto-char start) | |
187 (vertical-motion (buffer-size)))))) | |
188 | |
189 | |
190 ;; Resize the minibuffer window to contain the minibuffer's contents. | |
191 ;; The minibuffer must be the current window. | |
192 (defun resize-minibuffer-window () | |
193 (let ((height (window-height)) | |
194 (lines (1+ (resize-minibuffer-count-window-lines)))) | |
195 (and (numberp resize-minibuffer-window-max-height) | |
196 (> resize-minibuffer-window-max-height 0) | |
197 (setq lines (min | |
198 lines | |
199 resize-minibuffer-window-max-height))) | |
200 (or (if resize-minibuffer-window-exactly | |
201 (= lines height) | |
202 (<= lines height)) | |
203 (enlarge-window (- lines height))))) | |
204 | |
205 | |
206 ;; Resize the minibuffer frame to contain the minibuffer's contents. | |
207 ;; The minibuffer frame must be the current frame. | |
208 (defun resize-minibuffer-frame () | |
209 (let ((height (frame-height)) | |
210 (lines (1+ (resize-minibuffer-count-window-lines)))) | |
211 (and (numberp resize-minibuffer-frame-max-height) | |
212 (> resize-minibuffer-frame-max-height 0) | |
213 (setq lines (min | |
214 lines | |
215 resize-minibuffer-frame-max-height))) | |
216 (cond | |
217 ((> lines height) | |
218 (set-frame-size (selected-frame) (frame-width) lines)) | |
219 ((and resize-minibuffer-frame-exactly | |
220 (> height (plist-get minibuffer-frame-plist 'height)) | |
221 (< lines height)) | |
222 (set-frame-size (selected-frame) (frame-width) lines))))) | |
223 | |
224 ;; Restore the original height of the frame. | |
225 (defun resize-minibuffer-frame-restore () | |
226 (set-frame-size (selected-frame) (frame-width) | |
227 (plist-get minibuffer-frame-plist 'height))) | |
228 | |
229 | |
230 (provide 'rsz-minibuf) | |
231 | |
232 (add-hook 'minibuffer-setup-hook 'resize-minibuffer-setup) | |
233 | |
234 ;;; rsz-minibuf.el ends here |