Mercurial > hg > xemacs-beta
view lisp/window-xemacs.el @ 4885:6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
lisp/ChangeLog addition:
2010-01-24 Aidan Kehoe <kehoea@parhasard.net>
Correct the semantics of #'member*, #'eql, #'assoc* in the
presence of bignums; change the integerp byte code to fixnump
semantics.
* bytecomp.el (fixnump, integerp, byte-compile-integerp):
Change the integerp byte code to fixnump; add a byte-compile
method to integerp using fixnump and numberp and avoiding a
funcall most of the time, since in the non-core contexts where
integerp is used, it's mostly distinguishing between fixnums and
things that are not numbers at all.
* byte-optimize.el (side-effect-free-fns, byte-after-unbind-ops)
(byte-compile-side-effect-and-error-free-ops):
Replace the integerp bytecode with fixnump; add fixnump to the
side-effect-free-fns. Add the other extended number type
predicates to the list in passing.
* obsolete.el (floatp-safe): Mark this as obsolete.
* cl.el (eql): Go into more detail in the docstring here. Don't
bother checking whether both arguments are numbers; one is enough,
#'equal will fail correctly if they have distinct types.
(subst): Replace a call to #'integerp (deciding whether to use
#'memq or not) with one to #'fixnump.
Delete most-positive-fixnum, most-negative-fixnum from this file;
they're now always in C, so they can't be modified from Lisp.
* cl-seq.el (member*, assoc*, rassoc*):
Correct these functions in the presence of bignums.
* cl-macs.el (cl-make-type-test): The type test for a fixnum is
now fixnump. Ditch floatp-safe, use floatp instead.
(eql): Correct this compiler macro in the presence of bignums.
(assoc*): Correct this compiler macro in the presence of bignums.
* simple.el (undo):
Change #'integerp to #'fixnump here, since we use #'delq with the
same value as ELT a few lines down.
src/ChangeLog addition:
2010-01-24 Aidan Kehoe <kehoea@parhasard.net>
Fix problems with #'eql, extended number types, and the hash table
implementation; change the Bintegerp bytecode to fixnump semantics
even on bignum builds, since #'integerp can have a fast
implementation in terms of #'fixnump for most of its extant uses,
but not vice-versa.
* lisp.h: Always #include number.h; we want the macros provided in
it, even if the various number types are not available.
* number.h (NON_FIXNUM_NUMBER_P): New macro, giving 1 when its
argument is of non-immediate number type. Equivalent to FLOATP if
WITH_NUMBER_TYPES is not defined.
* elhash.c (lisp_object_eql_equal, lisp_object_eql_hash):
Use NON_FIXNUM_NUMBER_P in these functions, instead of FLOATP,
giving more correct behaviour in the presence of the extended
number types.
* bytecode.c (Bfixnump, execute_optimized_program):
Rename Bintegerp to Bfixnump; change its semantics to reflect the
new name on builds with bignum support.
* data.c (Ffixnump, Fintegerp, syms_of_data, vars_of_data):
Always make #'fixnump available, even on non-BIGNUM builds;
always implement #'integerp in this file, even on BIGNUM builds.
Move most-positive-fixnum, most-negative-fixnum here from
number.c, so they are Lisp constants even on builds without number
types, and attempts to change or bind them error.
Use the NUMBERP and INTEGERP macros even on builds without
extended number types.
* data.c (fixnum_char_or_marker_to_int):
Rename this function from integer_char_or_marker_to_int, to better
reflect the arguments it accepts.
* number.c (Fevenp, Foddp, syms_of_number):
Never provide #'integerp in this file. Remove #'oddp,
#'evenp; their implementations are overridden by those in cl.el.
* number.c (vars_of_number):
most-positive-fixnum, most-negative-fixnum are no longer here.
man/ChangeLog addition:
2010-01-23 Aidan Kehoe <kehoea@parhasard.net>
Generally: be careful to say fixnum, not integer, when talking
about fixed-precision integral types. I'm sure I've missed
instances, both here and in the docstrings, but this is a decent
start.
* lispref/text.texi (Columns):
Document where only fixnums, not integers generally, are accepted.
(Registers):
Remove some ancient char-int confoundance here.
* lispref/strings.texi (Creating Strings, Creating Strings):
Be more exact in describing where fixnums but not integers in
general are accepted.
(Creating Strings): Use a more contemporary example to illustrate
how concat deals with lists including integers about #xFF. Delete
some obsolete documentation on same.
(Char Table Types): Document that only fixnums are accepted as
values in syntax tables.
* lispref/searching.texi (String Search, Search and Replace):
Be exact in describing where fixnums but not integers in general
are accepted.
* lispref/range-tables.texi (Range Tables): Be exact in describing
them; only fixnums are accepted to describe ranges.
* lispref/os.texi (Killing XEmacs, User Identification)
(Time of Day, Time Conversion):
Be more exact about using fixnum where only fixed-precision
integers are accepted.
* lispref/objects.texi (Integer Type): Be more exact (and
up-to-date) about the possible values for
integers. Cross-reference to documentation of the bignum extension.
(Equality Predicates):
(Range Table Type):
(Array Type): Use fixnum, not integer, to describe a
fixed-precision integer.
(Syntax Table Type): Correct some English syntax here.
* lispref/numbers.texi (Numbers): Change the phrasing here to use
fixnum to mean the fixed-precision integers normal in emacs.
Document that our terminology deviates from that of Common Lisp,
and that we're working on it.
(Compatibility Issues): Reiterate the Common Lisp versus Emacs
Lisp compatibility issues.
(Comparison of Numbers, Arithmetic Operations):
* lispref/commands.texi (Command Loop Info, Working With Events):
* lispref/buffers.texi (Modification Time):
Be more exact in describing where fixnums but not integers in
general are accepted.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 24 Jan 2010 15:21:27 +0000 |
parents | e95ddfd6a409 |
children | f00192e1cd49 308d34e9f07d |
line wrap: on
line source
;;; window-xemacs.el --- XEmacs window commands aside from those written in C. ;; Copyright (C) 1985, 1989, 1993-94, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996 Ben Wing. ;; Maintainer: XEmacs Development Team ;; Keywords: frames, extensions, 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 synched. ;;; Commentary: ;; This file is dumped with XEmacs. ;; slb - 5/29/97 ;; Split apart from window.el in order to keep that file better in synch ;; with Emacs. ;;; Code: (defgroup windows nil "Windows within a frame." :group 'environment) (defun recenter (&optional n window) "Center point in WINDOW and redisplay frame. With N, put point on line N. The desired position of point is always relative to the window. Just C-u as prefix means put point in the center of the window. No N (i.e., it is nil) erases the entire frame and then redraws with point in the center of the window. If WINDOW is nil, the selected window is used." (interactive "_P") (center-to-window-line (if (consp n) nil n) window) (when (null n) (redraw-frame (window-frame window) t))) (defun backward-other-window (count &optional which-frames which-devices) "Select the COUNT'th different window on this frame, going backwards. This is just like calling `other-window' with COUNT negated." (interactive "p") (other-window (- count) which-frames which-devices)) (defalias 'windows-of-buffer 'get-buffer-window-list) (defun buffer-in-multiple-windows-p (&optional buffer) "Return t if BUFFER is in multiple windows. If BUFFER is not specified, the current buffer will be used." (setq buffer (or buffer (get-buffer buffer) (get-file-buffer buffer) (current-buffer))) (> (length (windows-of-buffer buffer)) 1)) (defun window-list (&optional frame minibuf window) "Return a list of windows on FRAME, beginning with WINDOW. FRAME and WINDOW default to the selected ones. Optional second arg MINIBUF t means count the minibuffer window even if not active. If MINIBUF is neither t nor nil it means not to count the minibuffer even if it is active." (setq frame (or frame (selected-frame)) window (or window (selected-window frame))) (if (not (eq (window-frame window) frame)) (error "Window must be on frame.")) (let ((current-frame (selected-frame)) list) (unwind-protect (save-window-excursion (select-frame frame) (walk-windows (function (lambda (cur-window) (if (not (eq window cur-window)) (setq list (cons cur-window list))))) minibuf) (setq list (cons window list))) (select-frame current-frame)))) ;; We used to have set-window-dedicated-p as an obsolete version ;; of set-window-buffer-dedicated, but it really makes more sense ;; this way. (make-obsolete 'set-window-buffer-dedicated 'set-window-dedicated-p) (defun set-window-buffer-dedicated (window buffer) "Make WINDOW display BUFFER and be dedicated to that buffer. Then Emacs will not automatically change which buffer appears in WINDOW. If BUFFER is nil, make WINDOW not be dedicated (but don't change which buffer appears in it currently)." (if (bufferp buffer) (set-window-buffer window (get-buffer-create buffer))) (set-window-dedicated-p window (not (null buffer)))) ;; Window configurations (defcustom window-configuration-includes-position nil "*Whether restoring window configurations will restore positions too. If nil, only the size of windows will be restored. Note that setting this value to t may have counterintuitive consequences, if a window manager employing virtual desktops is in use." :type 'boolean :group 'windows) (defstruct saved-window currentp minibufferp minibuffer-scrollp buffer mark-marker start-marker point-marker pixel-left pixel-top pixel-right pixel-bottom hscroll modeline-hscroll dedicatedp first-hchild first-vchild next-child window) (defstruct window-configuration frame frame-top frame-left frame-pixel-width frame-pixel-height current-buffer minibuffer-pixel-height min-width min-height saved-root-window) ; make sure we don't get affected by harmful advice (fset 'real-split-window (symbol-function 'split-window)) (fset 'real-delete-window (symbol-function 'delete-window)) (defun window-configuration-equal (conf-1 conf-2) "Returns a boolean indicating whether the two given configurations are identical. Window configurations containing windows with different window positions are not identical iff `window-configuration-includes-position' is t." (or (eq conf-1 conf-2) (and (eq (window-configuration-frame conf-1) (window-configuration-frame conf-2)) (= (window-configuration-frame-pixel-width conf-1) (window-configuration-frame-pixel-width conf-2)) (= (window-configuration-frame-pixel-height conf-1) (window-configuration-frame-pixel-height conf-2)) (if window-configuration-includes-position (and (equal (window-configuration-frame-top conf-1) (window-configuration-frame-top conf-2)) (equal (window-configuration-frame-left conf-1) (window-configuration-frame-left conf-2))) t) (eq (window-configuration-current-buffer conf-1) (window-configuration-current-buffer conf-2)) (saved-window-equal (window-configuration-saved-root-window conf-1) (window-configuration-saved-root-window conf-2))))) (defun saved-window-equal (saved-1 saved-2) "Returns a boolean indicating whether the two given saved windows are identical." (or (eq saved-1 saved-2) (and (eq (saved-window-currentp saved-1) (saved-window-currentp saved-2)) (eq (saved-window-minibuffer-scrollp saved-1) (saved-window-minibuffer-scrollp saved-2)) (eq (saved-window-buffer saved-1) (saved-window-buffer saved-2)) (equal (saved-window-mark-marker saved-1) (saved-window-mark-marker saved-2)) (or (and (saved-window-currentp saved-1) (saved-window-currentp saved-2)) (equal (saved-window-start-marker saved-1) (saved-window-start-marker saved-2))) (or (and (saved-window-currentp saved-1) (saved-window-currentp saved-2)) (equal (saved-window-point-marker saved-1) (saved-window-point-marker saved-2))) (= (saved-window-pixel-left saved-1) (saved-window-pixel-left saved-2)) (= (saved-window-pixel-top saved-1) (saved-window-pixel-top saved-2)) (= (saved-window-pixel-right saved-1) (saved-window-pixel-right saved-2)) (= (saved-window-pixel-bottom saved-1) (saved-window-pixel-bottom saved-2)) (= (saved-window-hscroll saved-1) (saved-window-hscroll saved-2)) (equal (saved-window-modeline-hscroll saved-1) (saved-window-modeline-hscroll saved-2)) (eq (saved-window-dedicatedp saved-1) (saved-window-dedicatedp saved-2)) (maybe-saved-window-equal (saved-window-first-hchild saved-1) (saved-window-first-hchild saved-2)) (maybe-saved-window-equal (saved-window-first-vchild saved-1) (saved-window-first-vchild saved-2)) (maybe-saved-window-equal (saved-window-next-child saved-1) (saved-window-next-child saved-2))))) (defun maybe-saved-window-equal (maybe-saved-1 maybe-saved-2) "Returns a boolean indicating whether the two given saved windows or NILs are identical." (cond ((and (not maybe-saved-1) (not maybe-saved-2)) t) ((not maybe-saved-1) (not maybe-saved-2)) ((not maybe-saved-2) (not maybe-saved-1)) (t (saved-window-equal maybe-saved-1 maybe-saved-2)))) (defun current-window-configuration (&optional frame) "Return an object representing the current window configuration of FRAME. If FRAME is nil or omitted, use the selected frame. This describes the number of windows, their sizes and current buffers, and for each window on FRAME the displayed buffer, where display starts, and the positions of point and mark. An exception is made for point in the current buffer: its value is -not- saved." (let ((frame (or frame (selected-frame)))) ;; The original C code used complicated but still incomplete logic ;; to decide if and how to restore the size of the minibuffer. It ;; goes something like this: ; (let ((real-font-height ; (font-height (face-font 'default) frame)) ; (minibuffer-height ; (if (and (minibuffer-window frame) ; (not (frame-minibuffer-only-p frame))) ; (window-pixel-height (minibuffer-window frame)) ; 0))) ; ...) (make-window-configuration :frame frame :frame-top (frame-property frame 'top) :frame-left (frame-property frame 'left) :frame-pixel-width (frame-pixel-width frame) :frame-pixel-height (frame-pixel-height frame) :current-buffer (current-buffer) :min-width window-min-width :min-height window-min-height :minibuffer-pixel-height (window-pixel-height (minibuffer-window frame)) ;; this tries to do what the old code did: ; :minibuffer-height (if (zerop (% minibuffer-height real-font-height)) ; (- (/ minibuffer-height real-font-height)) ; lines ; minibuffer-height) ; pixels :saved-root-window (root-window->saved-window (frame-root-window frame))))) (defun root-window->saved-window (window) "Converts a root window into a tree of saved-window structures." (let ((buffer (window-buffer window)) (edges (window-pixel-edges window))) (let ((left (nth 0 edges)) (top (nth 1 edges)) (right (nth 2 edges)) (bottom (nth 3 edges))) (let ((saved-window (make-saved-window :window window :currentp (eq window (selected-window (window-frame window))) :minibufferp (eq window (minibuffer-window (window-frame window))) :minibuffer-scrollp (eq window minibuffer-scroll-window) :buffer buffer :pixel-left left :pixel-top top :pixel-right right :pixel-bottom bottom :hscroll (window-hscroll window) :modeline-hscroll (modeline-hscroll window) :dedicatedp (window-dedicated-p window) :first-hchild (if (window-first-hchild window) (root-window->saved-window (window-first-hchild window)) nil) :first-vchild (if (window-first-vchild window) (root-window->saved-window (window-first-vchild window)) nil) :next-child (if (window-next-child window) (root-window->saved-window (window-next-child window)) nil)))) (if buffer (progn (let ((marker (make-marker))) (set-marker marker (window-start window) buffer) (setf (saved-window-start-marker saved-window) marker)) (if (not (eq buffer (current-buffer))) (let ((marker (make-marker))) (set-marker marker (window-point window) buffer) (setf (saved-window-point-marker saved-window) marker))) (setf (saved-window-mark-marker saved-window) (copy-marker (mark-marker t buffer))))) saved-window)))) (defmacro save-window-excursion/mapping (&rest body) "Execute body, preserving window sizes and contents. Restores which buffer appears in which window, where display starts, as well as the current buffer. Return alist mapping old windows to new windows. This alist maps the originally captured windows to the windows that correspond to them in the restored configuration. It does not include entries for windows that have not changed identity. Does not restore the value of point in current buffer." (let ((window-config (gensym 'window-config)) (mapping (gensym 'mapping))) `(let ((,window-config (current-window-configuration)) (,mapping)) (unwind-protect (progn ,@body) (setq ,mapping (set-window-configuration/mapping ,window-config))) ,mapping))) (defun set-window-configuration (configuration &optional set-frame-size-p) "Set the configuration of windows and buffers as specified by CONFIGURATION. CONFIGURATION must be a value previously returned by `current-window-configuration'. If SET-FRAME-SIZE-P is true, the frame size is also restored. " (set-window-configuration/mapping configuration set-frame-size-p) nil) ; make sure nobody relies on mapping return value (defun set-window-configuration/mapping (configuration &optional set-frame-size-p) "Set the configuration of windows and buffers as specified by CONFIGURATION. CONFIGURATION must be a value previously returned by `current-window-configuration'. If SET-FRAME-SIZE-P is true, the frame size is also restored. Return alist mapping old windows to new windows. This alist maps the originally captured windows to the windows that correspond to them in the restored configuration. It does not include entries for windows that have not changed identity." (let ((frame (window-configuration-frame configuration))) (if (and (frame-live-p frame) (not (window-configuration-equal configuration (current-window-configuration)))) (really-set-window-configuration frame configuration set-frame-size-p)))) (defun really-set-window-configuration (frame configuration set-frame-size-p) "Set the window configuration CONFIGURATION on live frame FRAME. If SET-FRAME-SIZE-P is true, the frame size is also restored. Return alist mapping old windows to new windows." ;; avoid potential temporary problems (setq window-min-width 0) (setq window-min-height 0) (setq minibuffer-scroll-window nil) (frame-reduce-to-one-window frame) (if set-frame-size-p (set-window-configuration-frame-size configuration)) ;; avoid setting these if they're already up-to-date ;; This also avoids potential inaccuracies in these settings --Mike (when window-configuration-includes-position (let ((left (window-configuration-frame-left configuration)) (top (window-configuration-frame-top configuration))) (if (not (equal left (frame-property frame 'left))) (set-frame-property frame 'left left)) (if (not (equal top (frame-property frame 'top))) (set-frame-property frame 'top top)))) ;; these may have changed because of the delete (set-window-pixel-height (minibuffer-window frame) (window-configuration-minibuffer-pixel-height configuration)) ;; avoid that `set-window-point' will set the buffer's point for ;; the selected window (select-window (minibuffer-window frame)) (let ((window-configuration-current-window nil) (mapping (list nil))) ; poor man's box (declare (special window-configuration-current-window)) (restore-saved-window configuration (frame-root-window frame) (window-configuration-saved-root-window configuration) 'vertical mapping) (if window-configuration-current-window (select-window window-configuration-current-window)) (setq window-min-width (window-configuration-min-width configuration)) (setq window-min-height (window-configuration-min-height configuration)) (let ((buffer (window-configuration-current-buffer configuration))) (if (buffer-live-p buffer) (set-buffer buffer) (set-buffer (car (buffer-list))))) ; this resets the window configuration so that the frame is filled (if (not set-frame-size-p) (set-frame-pixel-size frame (frame-pixel-width frame) (frame-pixel-height frame))) (car mapping))) (defun set-window-configuration-frame-size (configuration) "Restore the frame size of a window configuration." (set-frame-pixel-size (window-configuration-frame configuration) (window-configuration-frame-pixel-width configuration) (window-configuration-frame-pixel-height configuration))) (defun frame-reduce-to-one-window (frame) "Delete all windows except the minibuffer and one other in FRAME." (let* ((root-window (frame-root-window frame)) (combination-start (or (window-first-hchild root-window) (window-first-vchild root-window)))) (if combination-start (window-reduce-to-one combination-start)))) ;; Note that simply using `delete-other-windows' causes obscure ;; breakage. --Mike (defun window-reduce-to-one (window) "Make sure only one subwindow of WINDOW is left." (let ((window (window-next-child window))) (while window (if (window-live-p window) (let ((next (window-next-child window))) (real-delete-window window) (setq window next))))) (cond ((window-first-hchild window) (window-reduce-to-one (window-first-hchild window))) ((window-first-vchild window) (window-reduce-to-one (window-first-vchild window))))) (defun restore-saved-window (configuration window saved-window direction mapping) "Within CONFIGURATION, restore WINDOW to the state of SAVED-WINDOW. MAPPING is a one-element list whose element is an old-window-to-new-window mapping, which this function will extend." (if (not (eq (saved-window-window saved-window) window)) (rplaca mapping (cons (cons (saved-window-window saved-window) window) (car mapping)))) (cond ((and (saved-window-next-child saved-window) (not (saved-window-minibufferp (saved-window-next-child saved-window)))) (cond ((eq direction 'vertical) (real-split-window window nil nil)) ((eq direction 'horizontal) (real-split-window window nil t))) (if (not (saved-window-minibufferp saved-window)) (restore-saved-window-parameters configuration window saved-window)) (restore-saved-window configuration (window-next-child window) (saved-window-next-child saved-window) direction mapping)) ((not (saved-window-minibufferp saved-window)) (restore-saved-window-parameters configuration window saved-window))) (if (saved-window-first-hchild saved-window) (restore-saved-window configuration window (saved-window-first-hchild saved-window) 'horizontal mapping)) (if (saved-window-first-vchild saved-window) (restore-saved-window configuration window (saved-window-first-vchild saved-window) 'vertical mapping))) (defun restore-saved-window-parameters (configuration window saved-window) "Restore the window parameters stored in SAVED-WINDOW on WINDOW." (declare (special window-configuration-current-window)) (let ((buffer (saved-window-buffer saved-window))) (if (and buffer (buffer-live-p buffer)) (progn (set-window-buffer window (saved-window-buffer saved-window)) (set-window-start window (marker-position (saved-window-start-marker saved-window)) t) (if (markerp (saved-window-point-marker saved-window)) (set-window-point window (marker-position (saved-window-point-marker saved-window)))) (set-marker (mark-marker t buffer) (marker-position (saved-window-mark-marker saved-window)) buffer) (if (not (eq buffer (window-configuration-current-buffer configuration))) (goto-char (window-point window) buffer))))) (if (and (not (saved-window-first-hchild saved-window)) (not (saved-window-first-vchild saved-window))) ;; only set size for non-container windows (progn ;; If this is the root window, it may be the only window. ;; Because of mismatches between actual and reported frame ;; size, it may not let us actually set the size of the root ;; window to what we want. --Mike (if (not (eq window (frame-root-window (window-frame window)))) (progn (set-window-pixel-width window (saved-window-pixel-width saved-window)) (set-window-pixel-height window (saved-window-pixel-height saved-window)))) (set-window-hscroll window (saved-window-hscroll saved-window)) (set-modeline-hscroll window (saved-window-modeline-hscroll saved-window)) (set-window-dedicated-p window (saved-window-dedicatedp saved-window)))) (if (saved-window-currentp saved-window) (setq window-configuration-current-window window)) (if (saved-window-minibuffer-scrollp saved-window) (setq minibuffer-scroll-window window))) (defun saved-window-pixel-width (saved-window) "Compute the pixel width of SAVED-WINDOW." (- (saved-window-pixel-right saved-window) (saved-window-pixel-left saved-window))) (defun saved-window-pixel-height (saved-window) "Compute the pixel height of SAVED-WINDOW." (- (saved-window-pixel-bottom saved-window) (saved-window-pixel-top saved-window))) (defun set-window-pixel-width (window width) "Set the pixel width of WINDOW." (enlarge-window-pixels (- width (window-pixel-width window)) t window)) (defun set-window-pixel-height (window height) "Set the pixel height of WINDOW." (enlarge-window-pixels (- height (window-pixel-height window)) nil window)) ;; The window-config stack is stored as a list in frame property ;; 'window-config-stack, with the most recent element at the front. ;; When you pop off an element, the popped off element gets put at the ;; front of frame property 'window-config-unpop-stack, so you can ;; retrieve it using unpop-window-configuration. (defcustom window-config-stack-max 16 "*Maximum size of window configuration stack. Start discarding off end if it gets this big." :type 'integer :group 'windows) (defun window-config-stack (&optional frame) (or frame (setq frame (selected-frame))) (let ((stack (frame-property frame 'window-config-stack))) (if stack (set-undoable-stack-max stack window-config-stack-max) (progn (setq stack (make-undoable-stack window-config-stack-max)) (set-frame-property frame 'window-config-stack stack))) stack)) (defun push-window-configuration (&optional config) "Push the current window configuration onto the window-config stack. If CONFIG is specified, push it instead of the current window configuration. Each frame has its own window-config stack." (interactive) (let ((wc (or config (current-window-configuration))) (stack (window-config-stack))) (if (or (= 0 (undoable-stack-a-length stack)) (not (equal (undoable-stack-a-top stack) wc))) (undoable-stack-push stack wc)))) (defun pop-window-configuration () "Pop the top window configuration off the window-config stack and set it. Before setting the new window configuration, the current window configuration is pushed onto the \"unpop\" stack. `unpop-window-configuration' undoes what this function does. Each frame has its own window-config and \"unpop\" stack." (interactive) (let ((stack (window-config-stack)) (wc (current-window-configuration)) popped) (condition-case nil (progn (setq popped (undoable-stack-pop stack)) (while (equal popped wc) (setq popped (undoable-stack-pop stack))) (undoable-stack-push stack wc) (undoable-stack-undo stack) (set-window-configuration popped) popped) (trunc-stack-bottom (error "Bottom of window config stack"))))) (defun unpop-window-configuration () "Undo the effect of the most recent `pop-window-configuration'. This does exactly the inverse of what `pop-window-configuration' does: i.e. it pops a window configuration off of the \"unpop\" stack and pushes the current window configuration onto the window-config stack. Each frame has its own window-config and \"unpop\" stack." (interactive) (let ((stack (window-config-stack)) (wc (current-window-configuration)) popped) (condition-case nil (progn (setq popped (progn (undoable-stack-redo stack) (undoable-stack-pop stack))) (while (equal popped wc) (setq popped (progn (undoable-stack-redo stack) (undoable-stack-pop stack)))) (undoable-stack-push stack wc) (set-window-configuration popped) popped) (trunc-stack-bottom (error "Top of window config stack"))))) ;;;;;;;;;;;;; display-buffer, moved here from C. Hallelujah. (make-variable-buffer-local '__buffer-dedicated-frame) (defun buffer-dedicated-frame (&optional buffer) "Return the frame dedicated to this BUFFER, or nil if there is none. No argument or nil as argument means use current buffer as BUFFER." (let ((buffer (decode-buffer buffer))) (let ((frame (symbol-value-in-buffer '__buffer-dedicated-frame buffer))) ;; XEmacs addition: if the frame is dead, silently make it go away. (when (and (framep frame) (not (frame-live-p frame))) (with-current-buffer buffer (setq __buffer-dedicated-frame nil)) (setq frame nil)) frame))) (defun set-buffer-dedicated-frame (buffer frame) "For this BUFFER, set the FRAME dedicated to it. FRAME must be a frame or nil." (let ((buffer (decode-buffer buffer))) (and frame (check-argument-type #'frame-live-p frame)) (with-current-buffer buffer (setq __buffer-dedicated-frame frame)))) (defvar display-buffer-function nil "If non-nil, function to call to handle `display-buffer'. It will receive four args: the same as those to `display-buffer'.") (defvar pre-display-buffer-function nil "If non-nil, function that will be called from `display-buffer' as the first action. It will receive four args: the same as those to `display-buffer'. This function may be used to select an appropriate frame for the buffer, for example. See also the variable `display-buffer-function', which may be used to completely replace the `display-buffer' function. If the return value of this function is non-nil, it should be a frame, and that frame will be used to display the buffer.") (defcustom pop-up-frames nil "*Non-nil means `display-buffer' should make a separate frame." :type 'boolean :group 'frames) (defvar pop-up-frame-function nil "Function to call to handle automatic new frame creation. It is called with no arguments and should return a newly created frame. A typical value might be `(lambda () (new-frame pop-up-frame-alist))' where `pop-up-frame-alist' would hold the default frame parameters.") (defcustom special-display-buffer-names nil "*List of buffer names that should have their own special frames. Displaying a buffer whose name is in this list makes a special frame for it using `special-display-function'. An element of the list can be a cons cell instead of just a string. Then the car should be a buffer name, and the cdr specifies frame parameters for creating the frame for that buffer. More precisely, the cdr is passed as the second argument to the function found in `special-display-function', when making that frame. See also `special-display-regexps'." :type '(repeat (choice :value "" (string :tag "Name") (cons :menu-tag "Properties" :value ("" . nil) (string :tag "Name") (repeat :tag "Properties" (group :inline t (symbol :tag "Property") (sexp :tag "Value")))))) :group 'frames) (defcustom special-display-regexps nil "*List of regexps saying which buffers should have their own special frames. If a buffer name matches one of these regexps, it gets its own frame. Displaying a buffer whose name is in this list makes a special frame for it using `special-display-function'. An element of the list can be a cons cell instead of just a string. Then the car should be the regexp, and the cdr specifies frame parameters for creating the frame for buffers that match. More precisely, the cdr is passed as the second argument to the function found in `special-display-function', when making that frame. See also `special-display-buffer-names'." :type '(repeat (choice :value "" regexp (cons :menu-tag "Properties" :value ("" . nil) regexp (repeat :tag "Properties" (group :inline t (symbol :tag "Property") (sexp :tag "Value")))))) :group 'frames) (defvar special-display-function nil "Function to call to make a new frame for a special buffer. It is called with two arguments, the buffer and optional buffer specific data, and should return a window displaying that buffer. The default value makes a separate frame for the buffer, using `special-display-frame-alist' to specify the frame parameters. A buffer is special if its is listed in `special-display-buffer-names' or matches a regexp in `special-display-regexps'.") (defcustom same-window-buffer-names nil "*List of buffer names that should appear in the selected window. Displaying one of these buffers using `display-buffer' or `pop-to-buffer' switches to it in the selected window, rather than making it appear in some other window. An element of the list can be a cons cell instead of just a string. Then the car must be a string, which specifies the buffer name. This is for compatibility with `special-display-buffer-names'; the cdr of the cons cell is ignored. See also `same-window-regexps'." :type '(repeat (string :tag "Name")) :group 'windows) (defcustom same-window-regexps nil "*List of regexps saying which buffers should appear in the selected window. If a buffer name matches one of these regexps, then displaying it using `display-buffer' or `pop-to-buffer' switches to it in the selected window, rather than making it appear in some other window. An element of the list can be a cons cell instead of just a string. Then the car must be a string, which specifies the buffer name. This is for compatibility with `special-display-buffer-names'; the cdr of the cons cell is ignored. See also `same-window-buffer-names'." :type '(repeat regexp) :group 'windows) (defcustom pop-up-windows t "*Non-nil means display-buffer should make new windows." :type 'boolean :group 'windows) (defcustom split-height-threshold 500 "*display-buffer would prefer to split the largest window if this large. If there is only one window, it is split regardless of this value." :type 'integer :group 'windows) (defcustom split-width-threshold 500 "*display-buffer would prefer to split the largest window if this large. If there is only one window, it is split regardless of this value." :type 'integer :group 'windows) ;; Deiconify the frame containing the window WINDOW, then return WINDOW. (defun display-buffer-1 (window) (if (frame-iconified-p (window-frame window)) (make-frame-visible (window-frame window))) window) ;; Can you believe that all of this crap was formerly in C? ;; Praise Jesus that it's not there any more. (defun display-buffer (buffer &optional not-this-window-p override-frame shrink-to-fit) "Make BUFFER appear in some window on the current frame, but don't select it. BUFFER can be a buffer or a buffer name. If BUFFER is shown already in some window in the current frame, just uses that one, unless the window is the selected window and NOT-THIS-WINDOW-P is non-nil (interactively, with prefix arg). If BUFFER has a dedicated frame, display on that frame instead of the current frame, unless OVERRIDE-FRAME is non-nil. If OVERRIDE-FRAME is non-nil, display on that frame instead of the current frame (or the dedicated frame). If SHRINK-TO-FIT is non-nil and splitting the window is appropriate, give the new buffer less than half the space if it is small enough to fit. If `pop-up-windows' is non-nil, always use the current frame and create a new window regardless of whether the buffer has a dedicated frame, and regardless of whether OVERRIDE-FRAME was specified. If `pop-up-frames' is non-nil, make a new frame if no window shows BUFFER. If the buffer name is a member of the `same-window-buffer-names' list, or matches one of the `same-window-regexps' expressions, display the buffer in the currently selected window. Returns the window displaying BUFFER." (interactive "BDisplay buffer:\nP") (let ((wconfig (current-window-configuration)) (result ;; We just simulate a `return' in C. This function is way ugly ;; and does `returns' all over the place and there's no sense ;; in trying to rewrite it to be more Lispy. (catch 'done (let (window old-frame target-frame explicit-frame shrink-it) (setq old-frame (or (last-nonminibuf-frame) (selected-frame))) (setq buffer (get-buffer buffer)) (check-argument-type 'bufferp buffer) (setq explicit-frame (if pre-display-buffer-function (funcall pre-display-buffer-function buffer not-this-window-p override-frame shrink-to-fit))) ;; Give the user the ability to completely reimplement ;; this function via the `display-buffer-function'. (if display-buffer-function (throw 'done (funcall display-buffer-function buffer not-this-window-p override-frame shrink-to-fit))) ;; If the buffer has a dedicated frame, that takes ;; precedence over the current frame, and over what the ;; pre-display-buffer-function did. (let ((dedi (buffer-dedicated-frame buffer))) (if (frame-live-p dedi) (setq explicit-frame dedi))) ;; if override-frame is supplied, that takes precedence over ;; everything. This is gonna look bad if the ;; pre-display-buffer-function raised some other frame ;; already. (if override-frame (progn (check-argument-type 'frame-live-p override-frame) (setq explicit-frame override-frame))) (setq target-frame (or explicit-frame (last-nonminibuf-frame) (selected-frame))) ;; If we have switched frames, then set not-this-window-p ;; to false. Switching frames means that selected-window ;; is no longer the same as it was on entry -- it's the ;; selected-window of target_frame instead of old_frame, ;; so it's a fine candidate for display. (if (not (eq old-frame target-frame)) (setq not-this-window-p nil)) ;; if it's in the selected window, and that's ok, then we're done. (if (and (not not-this-window-p) (eq buffer (window-buffer (selected-window)))) (throw 'done (display-buffer-1 (selected-window)))) ;; See if the user has specified this buffer should appear ;; in the selected window. (if not-this-window-p nil (if (or (member (buffer-name buffer) same-window-buffer-names) (assoc (buffer-name buffer) same-window-buffer-names)) (progn (switch-to-buffer buffer) (throw 'done (display-buffer-1 (selected-window))))) (let ((tem same-window-regexps)) (while tem (let ((car (car tem))) (if (or (and (stringp car) (string-match car (buffer-name buffer))) (and (consp car) (stringp (car car)) (string-match (car car) (buffer-name buffer)))) (progn (switch-to-buffer buffer) (throw 'done (display-buffer-1 (selected-window)))))) (setq tem (cdr tem))))) ;; If pop-up-frames, look for a window showing BUFFER on ;; any visible or iconified frame. Otherwise search only ;; the current frame. (if (and (not explicit-frame) (or pop-up-frames (not (last-nonminibuf-frame)))) (setq target-frame 0)) ;; Otherwise, find some window that it's already in, and ;; return that, unless that window is the selected window ;; and that isn't ok. What a contorted mess! (setq window (or (if (not explicit-frame) ;; search the selected frame ;; first if the user didn't ;; specify an explicit frame. (get-buffer-window buffer nil)) (get-buffer-window buffer target-frame))) (if (and window (or (not not-this-window-p) (not (eq window (selected-window))))) (throw 'done (display-buffer-1 window))) ;; Certain buffer names get special handling. (if special-display-function (progn (if (member (buffer-name buffer) special-display-buffer-names) (throw 'done (funcall special-display-function buffer))) (let ((tem (assoc (buffer-name buffer) special-display-buffer-names))) (if tem (throw 'done (funcall special-display-function buffer (cdr tem))))) (let ((tem special-display-regexps)) (while tem (let ((car (car tem))) (if (and (stringp car) (string-match car (buffer-name buffer))) (throw 'done (funcall special-display-function buffer))) (if (and (consp car) (stringp (car car)) (string-match (car car) (buffer-name buffer))) (throw 'done (funcall special-display-function buffer (cdr car))))) (setq tem (cdr tem)))))) ;; If there are no frames open that have more than a minibuffer, ;; we need to create a new frame. (if (or pop-up-frames (null (last-nonminibuf-frame))) (progn (setq window (frame-selected-window (funcall pop-up-frame-function))) (set-window-buffer window buffer) (throw 'done (display-buffer-1 window)))) ;; Otherwise, make it be in some window, splitting if ;; appropriate/possible. Do not split a window if we are ;; displaying the buffer in a different frame than that which ;; was current when we were called. (It is already in a ;; different window by virtue of being in another frame.) (if (or (and pop-up-windows (eq target-frame old-frame)) (eq 'only (frame-property (selected-frame) 'minibuffer)) ;; If the current frame is a special display frame, ;; don't try to reuse its windows. (window-dedicated-p (frame-root-window (selected-frame)))) (progn (if (eq 'only (frame-property (selected-frame) 'minibuffer)) (setq target-frame (last-nonminibuf-frame))) ;; Don't try to create a window if would get an error with ;; height. (if (< split-height-threshold (* 2 window-min-height)) (setq split-height-threshold (* 2 window-min-height))) ;; Same with width. (if (< split-width-threshold (* 2 window-min-width)) (setq split-width-threshold (* 2 window-min-width))) ;; If the frame we would try to split cannot be split, ;; try other frames. (if (frame-property (if (null target-frame) (selected-frame) (last-nonminibuf-frame)) 'unsplittable) (setq window ;; Try visible frames first. (or (get-largest-window 'visible) ;; If that didn't work, try iconified frames. (get-largest-window 0) (get-largest-window t))) (setq window (get-largest-window target-frame))) ;; If we got a tall enough full-width window that ;; can be split, split it. (if (and window (not (frame-property (window-frame window) 'unsplittable)) (>= (window-height window) split-height-threshold) (or (>= (window-width window) split-width-threshold) (and (window-leftmost-p window) (window-rightmost-p window)))) (setq window (split-window window)) (let (upper other) (setq window (get-lru-window target-frame)) ;; If the LRU window is selected, and big enough, ;; and can be split, split it. (if (and window (not (frame-property (window-frame window) 'unsplittable)) (or (eq window (selected-window)) (not (window-parent window))) (>= (window-height window) (* 2 window-min-height))) (setq window (split-window window))) ;; If get-lru-window returned nil, try other approaches. ;; Try visible frames first. (or window (setq window (or (get-largest-window 'visible) ;; If that didn't work, try ;; iconified frames. (get-largest-window 0) ;; Try invisible frames. (get-largest-window t) ;; As a last resort, make ;; a new frame. (frame-selected-window (funcall pop-up-frame-function))))) ;; If window appears above or below another, ;; even out their heights. (if (window-previous-child window) (setq other (window-previous-child window) upper other)) (if (window-next-child window) (setq other (window-next-child window) upper window)) ;; Check that OTHER and WINDOW are vertically arrayed. (if (and other (not (= (nth 1 (window-pixel-edges other)) (nth 1 (window-pixel-edges window)))) (> (window-pixel-height other) (window-pixel-height window))) (enlarge-window (- (/ (+ (window-height other) (window-height window)) 2) (window-height upper)) nil upper)) ;; Klaus Berndl <klaus.berndl@sdm.de>: Only in ;; this situation we shrink-to-fit but we can do ;; this first after we have displayed buffer in ;; window (s.b. (set-window-buffer window buffer)) (setq shrink-it shrink-to-fit)))) (setq window (get-lru-window target-frame))) ;; Bring the window's previous buffer to the top of the MRU chain. (if (window-buffer window) (save-excursion (save-selected-window (select-window window) (record-buffer (window-buffer window))))) (set-window-buffer window buffer) ;; Now window's previous buffer has been brought to the top ;; of the MRU chain and window displays buffer - now we can ;; shrink-to-fit if necessary (if shrink-it (shrink-window-if-larger-than-buffer window)) (display-buffer-1 window))))) (or (equal wconfig (current-window-configuration)) (push-window-configuration wconfig)) result)) ;;; window-xemacs.el ends here