Mercurial > hg > xemacs-beta
view lisp/resize-minibuffer.el @ 826:6728e641994e
[xemacs-hg @ 2002-05-05 11:30:15 by ben]
syntax cache, 8-bit-format, lots of code cleanup
README.packages: Update info about --package-path.
i.c: Create an inheritable event and pass it on to XEmacs, so that ^C
can be handled properly. Intercept ^C and signal the event.
"Stop Build" in VC++ now works.
bytecomp-runtime.el: Doc string changes.
compat.el: Some attempts to redo this to
make it truly useful and fix the "multiple versions interacting
with each other" problem. Not yet done. Currently doesn't work.
files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code.
xemacs.mak: Split up CFLAGS into a version without flags specifying the C
library. The problem seems to be that minitar depends on zlib,
which depends specifically on libc.lib, not on any of the other C
libraries. Unless you compile with libc.lib, you get errors --
specifically, no _errno in the other libraries, which must make it
something other than an int. (#### But this doesn't seem to obtain
in XEmacs, which also uses zlib, and can be linked with any of the
C libraries. Maybe zlib is used differently and doesn't need
errno, or maybe XEmacs provides an int errno; ... I don't
understand.
Makefile.in.in: Fix so that packages are around when testing.
abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch.
-- FUNCTIONALITY CHANGES:
add partial support for 8-bit-fixed, 16-bit-fixed, and
32-bit-fixed formats. not quite done yet. (in particular, needs
functions to actually convert the buffer.) NOTE: lots of changes
to regex.c here. also, many new *_fmt() inline funs that take an
Internal_Format argument.
redo syntax cache code. make the cache per-buffer; keep the cache
valid across calls to functions that use it. also keep it valid
across insertions/deletions and extent changes, as much as is
possible. eliminate the junky regex-reentrancy code by passing in
the relevant lisp info to the regex routines as local vars.
add general mechanism in extents code for signalling extent changes.
fix numerous problems with the case-table implementation; yoshiki
never properly transferred many algorithms from old-style to
new-style case tables.
redo char tables to support a default argument, so that mapping
only occurs over changed args. change many chartab functions to
accept Lisp_Object instead of Lisp_Char_Table *.
comment out the code in font-lock.c by default, because
font-lock.el no longer uses it. we should consider eliminating it
entirely.
Don't output bell as ^G in console-stream when not a TTY.
add -mswindows-termination-handle to interface with i.c, so we can
properly kill a build.
add more error-checking to buffer/string macros.
add some additional buffer_or_string_() funs.
-- INTERFACE CHANGES AFFECTING MORE CODE:
switch the arguments of write_c_string and friends to be
consistent with write_fmt_string, which must have printcharfun
first.
change BI_* macros to BYTE_* for increased clarity; similarly for
bi_* local vars.
change VOID_TO_LISP to be a one-argument function. eliminate
no-longer-needed CVOID_TO_LISP.
-- char/string macro changes:
rename MAKE_CHAR() to make_emchar() for slightly less confusion
with make_char(). (The former generates an Emchar, the latter a
Lisp object. Conceivably we should rename make_char() -> wrap_char()
and similarly for make_int(), make_float().)
Similar changes for other *CHAR* macros -- we now consistently use
names with `emchar' whenever we are working with Emchars. Any
remaining name with just `char' always refers to a Lisp object.
rename macros with XSTRING_* to string_* except for those that
reference actual fields in the Lisp_String object, following
conventions used elsewhere.
rename set_string_{data,length} macros (the only ones to work with
a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_*
to make the difference clear.
try to be consistent about caps vs. lowercase in macro/inline-fun
names for chars and such, which wasn't the case before. we now
reserve caps either for XFOO_ macros that reference object fields
(e.g. XSTRING_DATA) or for things that have non-function semantics,
e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an
arg (any arg) more than once. otherwise, use lowercase.
here is a summary of most of the macros/inline funs changed by all
of the above changes:
BYTE_*_P -> byte_*_p
XSTRING_BYTE -> string_byte
set_string_data/length -> set_lispstringp_data/length
XSTRING_CHAR_LENGTH -> string_char_length
XSTRING_CHAR -> string_emchar
INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p
INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p
charptr_copy_char -> charptr_copy_emchar
LEADING_BYTE_* -> leading_byte_*
CHAR_* -> EMCHAR_*
*_CHAR_* -> *_EMCHAR_*
*_CHAR -> *_EMCHAR
CHARSET_BY_ -> charset_by_*
BYTE_SHIFT_JIS* -> byte_shift_jis*
BYTE_BIG5* -> byte_big5*
REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte
char_to_unicode -> emchar_to_unicode
valid_char_p -> valid_emchar_p
Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality).
-- INTERFACE CHANGES AFFECTING LESS CODE:
use DECLARE_INLINE_HEADER in various places.
remove '#ifdef emacs' from XEmacs-only files.
eliminate CHAR_TABLE_VALUE(), which duplicated the functionality
of get_char_table().
add BUFFER_TEXT_LOOP to simplify iterations over buffer text.
define typedefs for signed and unsigned types of fixed sizes
(INT_32_BIT, UINT_32_BIT, etc.).
create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE;
fix code to use it.
add charptr_emchar_len to return the text length of the character
pointed to by a ptr; use it in place of
charcount_to_bytecount(..., 1). add emchar_len to return the text
length of a given character.
add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount
and Charbpos/Charcount, in code (particularly, the extents code
and redisplay code) that works with either kind of index. rename
redisplay struct params with names such as `charbpos' to
e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos.
eliminate xxDEFUN in place of DEFUN; no longer necessary with
changes awhile back to doc.c.
split up big ugly combined list of EXFUNs in lisp.h on a
file-by-file basis, since other prototypes are similarly split.
rewrite some "*_UNSAFE" macros as inline funs and eliminate the
_UNSAFE suffix.
move most string code from lisp.h to text.h; the string code and
text.h code is now intertwined in such a fashion that they need
to be in the same place and partially interleaved. (you can't
create forward references for inline funs)
automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in
batch mode.
Fix up some problems in lisp-tests/symbol-tests that were
causing spurious failures.
author | ben |
---|---|
date | Sun, 05 May 2002 11:33:57 +0000 |
parents | 79940b592197 |
children | 94ecba3ecd77 |
line wrap: on
line source
;;; resize-minibuffer.el --- dynamically resize minibuffer to display entire contents ;; Copyright (C) 1990 Roland McGrath ;; Copyright (C) 1993, 1994 Noah S. Friedman ;; Author: Noah Friedman <friedman@prep.ai.mit.edu> ;; Author: Roland McGrath <roland@prep.ai.mit.edu> ;; Modified for Lucid Emacs By: Peter Stout <pds@cs.cmu.edu> ;; Maintainer: friedman@prep.ai.mit.edu ;; Keywords: minibuffer, window, frames, display ;; 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, you can either ;; send email to this program's maintainer or write to: The Free ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. ;;; Synched up with: Not synched. Copied from rsz-minibuf.el to ;;; resize-minibuffer.el to avoid current problems where, when there's a ;;; file in dump and a file with the same name in packages, a dumping ;;; XEmacs will find the wrong one! ;;; Commentary: ;; This file has received maintenance by the XEmacs development team. ;; $Id: resize-minibuffer.el,v 1.4 2002/03/15 07:43:21 ben Exp $ ;; This package allows the entire contents (or as much as possible) of the ;; minibuffer to be visible at once when typing. As the end of a line is ;; reached, the minibuffer will resize itself. When the user is done ;; typing, the minibuffer will return to its original size. ;; In window systems where it is possible to have a frame in which the ;; minibuffer is the only window, the frame itself can be resized. In FSF ;; GNU Emacs 19.22 and earlier, the frame may not be properly returned to ;; its original size after it ceases to be active because ;; `minibuffer-exit-hook' didn't exist until version 19.23. ;; NOTE: The code to resize frames has not been tested under Lucid Emacs, ;; because detached minibuffers are broken. ;; Note that the minibuffer and echo area are not the same! They simply ;; happen to occupy roughly the same place on the frame. Messages put in ;; the echo area will not cause any resizing by this package. ;; This package is considered a minor mode but it doesn't put anything in ;; minor-mode-alist because this mode is specific to the minibuffer, which ;; has no modeline. ;; To use this package, put the following in your .emacs: ;; ;; (autoload 'resize-minibuffer-mode "rsz-minibuf" nil t) ;; ;; Invoking the command `resize-minibuffer-mode' will then enable this mode. ;;; Code: (defgroup resize-minibuffer nil "Dynamically resize minibuffer to display entire contents" :group 'frames) (defcustom resize-minibuffer-mode nil "*If non-`nil', resize the minibuffer so its entire contents are visible." :type 'boolean :require 'rsz-minibuf :group 'resize-minibuffer) (defcustom resize-minibuffer-window-max-height nil "*Maximum size the minibuffer window is allowed to become. If less than 1 or not a number, the limit is the height of the frame in which the active minibuffer window resides." :type '(choice (const nil) integer) :group 'resize-minibuffer) (defcustom resize-minibuffer-window-exactly t "*If non-`nil', make minibuffer exactly the size needed to display all its contents. Otherwise, the minibuffer window can temporarily increase in size but never get smaller while it is active." :type 'boolean :group 'resize-minibuffer) (defcustom resize-minibuffer-frame nil "*If non-`nil' and the active minibuffer is the sole window in its frame, allow changing the frame height." :type 'boolean :group 'resize-minibuffer) (defcustom resize-minibuffer-frame-max-height nil "*Maximum size the minibuffer frame is allowed to become. If less than 1 or not a number, there is no limit.") (defcustom resize-minibuffer-frame-exactly nil "*If non-`nil', make minibuffer frame exactly the size needed to display all its contents. Otherwise, the minibuffer frame can temporarily increase in size but never get smaller while it is active." :type 'boolean :group 'resize-minibuffer) ;;;###autoload (defun resize-minibuffer-mode (&optional prefix) "Enable or disable resize-minibuffer mode. A negative prefix argument disables this mode. A positive argument or argument of 0 enables it. When this minor mode is enabled, the minibuffer is dynamically resized to contain the entire region of text put in it as you type. The variable `resize-minibuffer-mode' is set to t or nil depending on whether this mode is active or not. The maximum height to which the minibuffer can grow is controlled by the variable `resize-minibuffer-window-max-height'. The variable `resize-minibuffer-window-exactly' determines whether the minibuffer window should ever be shrunk to make it no larger than needed to display its contents. When using a window system, it is possible for a minibuffer to be the sole window in a frame. Since that window is already its maximum size, the only way to make more text visible at once is to increase the size of the frame. The variable `resize-minibuffer-frame' controls whether this should be done. The variables `resize-minibuffer-frame-max-height' and `resize-minibuffer-frame-exactly' are analogous to their window counterparts." (interactive "p") (or prefix (setq prefix 0)) (cond ((>= prefix 0) (setq resize-minibuffer-mode t)) (t (setq resize-minibuffer-mode nil)))) (defun resize-minibuffer-setup () (cond (resize-minibuffer-mode (cond ((and (not (eq 'tty (console-type))) (eq 'only (plist-get (frame-properties) 'minibuffer))) (and resize-minibuffer-frame (progn (make-local-hook 'minibuffer-exit-hook) (add-hook 'minibuffer-exit-hook 'resize-minibuffer-frame-restore nil t) (make-local-hook 'post-command-hook) (add-hook 'post-command-hook 'resize-minibuffer-frame nil t) (unless (and-boundp 'icomplete-mode icomplete-mode) (resize-minibuffer-frame))))) (t (make-local-hook 'post-command-hook) (add-hook 'post-command-hook 'resize-minibuffer-window nil t) (unless (and-boundp 'icomplete-mode icomplete-mode) (resize-minibuffer-window))))))) (defun resize-minibuffer-count-window-lines (&optional start end) "Return number of window lines occupied by text in region. The number of window lines may be greater than the number of actual lines in the buffer if any wrap on the display due to their length. Optional arguments START and END default to point-min and point-max, respectively." (or start (setq start (point-min))) (or end (setq end (point-max))) (if (= start end) 0 (save-excursion (save-restriction (widen) (narrow-to-region start end) (goto-char start) (vertical-motion (buffer-size)))))) ;; Resize the minibuffer window to contain the minibuffer's contents. ;; The minibuffer must be the current window. (defun resize-minibuffer-window () (let ((height (window-height)) (lines (1+ (resize-minibuffer-count-window-lines)))) (and (numberp resize-minibuffer-window-max-height) (> resize-minibuffer-window-max-height 0) (setq lines (min lines resize-minibuffer-window-max-height))) (or (if resize-minibuffer-window-exactly (= lines height) (<= lines height)) (enlarge-window (- lines height))))) ;; Resize the minibuffer frame to contain the minibuffer's contents. ;; The minibuffer frame must be the current frame. (defun resize-minibuffer-frame () (let ((height (frame-height)) (lines (1+ (resize-minibuffer-count-window-lines)))) (and (numberp resize-minibuffer-frame-max-height) (> resize-minibuffer-frame-max-height 0) (setq lines (min lines resize-minibuffer-frame-max-height))) (cond ((> lines height) (set-frame-size (selected-frame) (frame-width) lines)) ((and resize-minibuffer-frame-exactly (> height (plist-get minibuffer-frame-plist 'height)) (< lines height)) (set-frame-size (selected-frame) (frame-width) lines))))) ;; Restore the original height of the frame. (defun resize-minibuffer-frame-restore () (set-frame-size (selected-frame) (frame-width) (plist-get minibuffer-frame-plist 'height))) (provide 'rsz-minibuf) (add-hook 'minibuffer-setup-hook 'resize-minibuffer-setup) ;;; rsz-minibuf.el ends here