Mercurial > hg > xemacs-beta
annotate lisp/window-xemacs.el @ 5518:3cc7470ea71c
gnuclient: if TMPDIR was set and connect failed, try again with /tmp
2011-06-03 Aidan Kehoe <kehoea@parhasard.net>
* gnuslib.c (connect_to_unix_server):
Retry with /tmp as a directory in which to search for Unix sockets
if an attempt to connect with some other directory failed (which
may be because gnuclient and gnuserv don't share an environment
value for TMPDIR, or because gnuserv was compiled with USE_TMPDIR
turned off).
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Fri, 03 Jun 2011 18:40:57 +0100 |
parents | ac37a5f7e5be |
children | 5d3bb1100832 |
rev | line source |
---|---|
428 | 1 ;;; window-xemacs.el --- XEmacs window commands aside from those written in C. |
2 | |
3 ;; Copyright (C) 1985, 1989, 1993-94, 1997 Free Software Foundation, Inc. | |
4 ;; Copyright (C) 1995, 1996 Ben Wing. | |
5 | |
6 ;; Maintainer: XEmacs Development Team | |
7 ;; Keywords: frames, extensions, dumped | |
8 | |
9 ;; This file is part of XEmacs. | |
10 | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4674
diff
changeset
|
11 ;; XEmacs is free software: you can redistribute it and/or modify it |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4674
diff
changeset
|
12 ;; under the terms of the GNU General Public License as published by the |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4674
diff
changeset
|
13 ;; Free Software Foundation, either version 3 of the License, or (at your |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4674
diff
changeset
|
14 ;; option) any later version. |
428 | 15 |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4674
diff
changeset
|
16 ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4674
diff
changeset
|
17 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4674
diff
changeset
|
18 ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4674
diff
changeset
|
19 ;; for more details. |
428 | 20 |
21 ;; You should have received a copy of the GNU General Public License | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4674
diff
changeset
|
22 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
428 | 23 |
24 ;;; Synched up with: Not synched. | |
25 | |
26 ;;; Commentary: | |
27 | |
28 ;; This file is dumped with XEmacs. | |
29 | |
30 ;; slb - 5/29/97 | |
31 ;; Split apart from window.el in order to keep that file better in synch | |
32 ;; with Emacs. | |
33 | |
34 ;;; Code: | |
35 | |
36 (defgroup windows nil | |
37 "Windows within a frame." | |
38 :group 'environment) | |
39 | |
40 (defun recenter (&optional n window) | |
41 "Center point in WINDOW and redisplay frame. With N, put point on line N. | |
42 The desired position of point is always relative to the window. | |
43 Just C-u as prefix means put point in the center of the window. | |
44 No N (i.e., it is nil) erases the entire frame and then | |
45 redraws with point in the center of the window. | |
46 If WINDOW is nil, the selected window is used." | |
47 (interactive "_P") | |
48 (center-to-window-line (if (consp n) nil n) window) | |
49 (when (null n) | |
50 (redraw-frame (window-frame window) t))) | |
51 | |
444 | 52 (defun backward-other-window (count &optional which-frames which-devices) |
53 "Select the COUNT'th different window on this frame, going backwards. | |
54 This is just like calling `other-window' with COUNT negated." | |
428 | 55 (interactive "p") |
444 | 56 (other-window (- count) which-frames which-devices)) |
428 | 57 |
58 (defalias 'windows-of-buffer 'get-buffer-window-list) | |
59 | |
60 (defun buffer-in-multiple-windows-p (&optional buffer) | |
61 "Return t if BUFFER is in multiple windows. | |
62 If BUFFER is not specified, the current buffer will be used." | |
63 (setq buffer (or buffer | |
64 (get-buffer buffer) | |
65 (get-file-buffer buffer) | |
66 (current-buffer))) | |
67 (> (length (windows-of-buffer buffer)) 1)) | |
68 | |
69 (defun window-list (&optional frame minibuf window) | |
70 "Return a list of windows on FRAME, beginning with WINDOW. | |
71 FRAME and WINDOW default to the selected ones. | |
72 Optional second arg MINIBUF t means count the minibuffer window | |
73 even if not active. If MINIBUF is neither t nor nil it means | |
74 not to count the minibuffer even if it is active." | |
1261 | 75 (setq frame (or frame (selected-frame)) |
76 window (or window (selected-window frame))) | |
428 | 77 (if (not (eq (window-frame window) frame)) |
78 (error "Window must be on frame.")) | |
79 (let ((current-frame (selected-frame)) | |
80 list) | |
81 (unwind-protect | |
82 (save-window-excursion | |
83 (select-frame frame) | |
84 (walk-windows | |
85 (function (lambda (cur-window) | |
86 (if (not (eq window cur-window)) | |
87 (setq list (cons cur-window list))))) | |
88 minibuf) | |
89 (setq list (cons window list))) | |
90 (select-frame current-frame)))) | |
91 | |
92 ;; We used to have set-window-dedicated-p as an obsolete version | |
93 ;; of set-window-buffer-dedicated, but it really makes more sense | |
94 ;; this way. | |
95 | |
96 (make-obsolete 'set-window-buffer-dedicated 'set-window-dedicated-p) | |
97 (defun set-window-buffer-dedicated (window buffer) | |
98 "Make WINDOW display BUFFER and be dedicated to that buffer. | |
99 Then Emacs will not automatically change which buffer appears in WINDOW. | |
100 If BUFFER is nil, make WINDOW not be dedicated (but don't change which | |
101 buffer appears in it currently)." | |
102 (if (bufferp buffer) | |
103 (set-window-buffer window (get-buffer-create buffer))) | |
104 (set-window-dedicated-p window (not (null buffer)))) | |
1149 | 105 |
106 ;; Window configurations | |
428 | 107 |
3646 | 108 (defcustom window-configuration-includes-position nil |
109 "*Whether restoring window configurations will restore positions too. | |
110 If nil, only the size of windows will be restored. | |
111 | |
112 Note that setting this value to t may have counterintuitive consequences, | |
113 if a window manager employing virtual desktops is in use." | |
114 :type 'boolean | |
115 :group 'windows) | |
116 | |
1149 | 117 (defstruct saved-window |
118 currentp minibufferp minibuffer-scrollp | |
119 buffer mark-marker | |
120 start-marker | |
121 point-marker | |
122 pixel-left pixel-top pixel-right pixel-bottom | |
123 hscroll modeline-hscroll | |
124 dedicatedp | |
4445
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
125 first-hchild first-vchild next-child |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
126 window) |
1149 | 127 |
128 (defstruct window-configuration | |
129 frame | |
2872 | 130 frame-top frame-left |
1149 | 131 frame-pixel-width frame-pixel-height |
132 current-buffer | |
133 minibuffer-pixel-height | |
134 min-width min-height | |
135 saved-root-window) | |
136 | |
4444
715c3ced8fa8
Use `real-split-window', `real-delete-window' in window-config code.
Mike Sperber <sperber@deinprogramm.de>
parents:
4438
diff
changeset
|
137 ; make sure we don't get affected by harmful advice |
715c3ced8fa8
Use `real-split-window', `real-delete-window' in window-config code.
Mike Sperber <sperber@deinprogramm.de>
parents:
4438
diff
changeset
|
138 (fset 'real-split-window (symbol-function 'split-window)) |
715c3ced8fa8
Use `real-split-window', `real-delete-window' in window-config code.
Mike Sperber <sperber@deinprogramm.de>
parents:
4438
diff
changeset
|
139 (fset 'real-delete-window (symbol-function 'delete-window)) |
715c3ced8fa8
Use `real-split-window', `real-delete-window' in window-config code.
Mike Sperber <sperber@deinprogramm.de>
parents:
4438
diff
changeset
|
140 |
1149 | 141 (defun window-configuration-equal (conf-1 conf-2) |
142 "Returns a boolean indicating whether the two given configurations | |
3646 | 143 are identical. |
144 | |
145 Window configurations containing windows with different window | |
146 positions are not identical iff `window-configuration-includes-position' | |
147 is t." | |
1149 | 148 (or (eq conf-1 conf-2) |
149 (and (eq (window-configuration-frame conf-1) | |
150 (window-configuration-frame conf-2)) | |
151 (= (window-configuration-frame-pixel-width conf-1) | |
152 (window-configuration-frame-pixel-width conf-2)) | |
153 (= (window-configuration-frame-pixel-height conf-1) | |
154 (window-configuration-frame-pixel-height conf-2)) | |
3646 | 155 (if window-configuration-includes-position |
156 (and (equal (window-configuration-frame-top conf-1) | |
157 (window-configuration-frame-top conf-2)) | |
158 (equal (window-configuration-frame-left conf-1) | |
159 (window-configuration-frame-left conf-2))) | |
160 t) | |
1149 | 161 (eq (window-configuration-current-buffer conf-1) |
162 (window-configuration-current-buffer conf-2)) | |
163 (saved-window-equal (window-configuration-saved-root-window conf-1) | |
164 (window-configuration-saved-root-window conf-2))))) | |
165 | |
166 (defun saved-window-equal (saved-1 saved-2) | |
167 "Returns a boolean indicating whether the two given saved windows | |
168 are identical." | |
169 (or (eq saved-1 saved-2) | |
170 (and (eq (saved-window-currentp saved-1) | |
171 (saved-window-currentp saved-2)) | |
172 (eq (saved-window-minibuffer-scrollp saved-1) | |
173 (saved-window-minibuffer-scrollp saved-2)) | |
174 (eq (saved-window-buffer saved-1) | |
175 (saved-window-buffer saved-2)) | |
176 (equal (saved-window-mark-marker saved-1) | |
177 (saved-window-mark-marker saved-2)) | |
178 (or (and (saved-window-currentp saved-1) | |
179 (saved-window-currentp saved-2)) | |
180 (equal (saved-window-start-marker saved-1) | |
181 (saved-window-start-marker saved-2))) | |
182 (or (and (saved-window-currentp saved-1) | |
183 (saved-window-currentp saved-2)) | |
184 (equal (saved-window-point-marker saved-1) | |
185 (saved-window-point-marker saved-2))) | |
186 (= (saved-window-pixel-left saved-1) | |
187 (saved-window-pixel-left saved-2)) | |
188 (= (saved-window-pixel-top saved-1) | |
189 (saved-window-pixel-top saved-2)) | |
190 (= (saved-window-pixel-right saved-1) | |
191 (saved-window-pixel-right saved-2)) | |
192 (= (saved-window-pixel-bottom saved-1) | |
193 (saved-window-pixel-bottom saved-2)) | |
194 (= (saved-window-hscroll saved-1) | |
195 (saved-window-hscroll saved-2)) | |
1387 | 196 (equal (saved-window-modeline-hscroll saved-1) |
197 (saved-window-modeline-hscroll saved-2)) | |
1149 | 198 (eq (saved-window-dedicatedp saved-1) |
199 (saved-window-dedicatedp saved-2)) | |
200 (maybe-saved-window-equal (saved-window-first-hchild saved-1) | |
201 (saved-window-first-hchild saved-2)) | |
202 (maybe-saved-window-equal (saved-window-first-vchild saved-1) | |
203 (saved-window-first-vchild saved-2)) | |
204 (maybe-saved-window-equal (saved-window-next-child saved-1) | |
205 (saved-window-next-child saved-2))))) | |
206 | |
207 (defun maybe-saved-window-equal (maybe-saved-1 maybe-saved-2) | |
208 "Returns a boolean indicating whether the two given saved windows | |
209 or NILs are identical." | |
210 (cond | |
211 ((and (not maybe-saved-1) (not maybe-saved-2)) t) | |
212 ((not maybe-saved-1) (not maybe-saved-2)) | |
213 ((not maybe-saved-2) (not maybe-saved-1)) | |
214 (t (saved-window-equal maybe-saved-1 maybe-saved-2)))) | |
215 | |
216 (defun current-window-configuration (&optional frame) | |
217 "Return an object representing the current window configuration of FRAME. | |
218 If FRAME is nil or omitted, use the selected frame. | |
219 This describes the number of windows, their sizes and current buffers, | |
220 and for each window on FRAME the displayed buffer, where display | |
221 starts, and the positions of point and mark. | |
222 An exception is made for point in the current buffer: | |
223 its value is -not- saved." | |
224 (let ((frame (or frame (selected-frame)))) | |
225 ;; The original C code used complicated but still incomplete logic | |
226 ;; to decide if and how to restore the size of the minibuffer. It | |
227 ;; goes something like this: | |
228 ; (let ((real-font-height | |
229 ; (font-height (face-font 'default) frame)) | |
230 ; (minibuffer-height | |
231 ; (if (and (minibuffer-window frame) | |
232 ; (not (frame-minibuffer-only-p frame))) | |
233 ; (window-pixel-height (minibuffer-window frame)) | |
234 ; 0))) | |
235 ; ...) | |
236 | |
237 (make-window-configuration | |
238 :frame frame | |
2885 | 239 :frame-top (frame-property frame 'top) |
240 :frame-left (frame-property frame 'left) | |
1149 | 241 :frame-pixel-width (frame-pixel-width frame) |
242 :frame-pixel-height (frame-pixel-height frame) | |
243 :current-buffer (current-buffer) | |
244 :min-width window-min-width :min-height window-min-height | |
245 :minibuffer-pixel-height (window-pixel-height (minibuffer-window frame)) | |
246 ;; this tries to do what the old code did: | |
247 ; :minibuffer-height (if (zerop (% minibuffer-height real-font-height)) | |
248 ; (- (/ minibuffer-height real-font-height)) ; lines | |
249 ; minibuffer-height) ; pixels | |
250 :saved-root-window (root-window->saved-window (frame-root-window frame))))) | |
251 | |
252 (defun root-window->saved-window (window) | |
253 "Converts a root window into a tree of saved-window structures." | |
254 (let ((buffer (window-buffer window)) | |
255 (edges (window-pixel-edges window))) | |
256 (let ((left (nth 0 edges)) | |
257 (top (nth 1 edges)) | |
258 (right (nth 2 edges)) | |
259 (bottom (nth 3 edges))) | |
260 (let ((saved-window | |
261 (make-saved-window | |
4445
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
262 :window window |
1149 | 263 :currentp (eq window (selected-window (window-frame window))) |
264 :minibufferp (eq window (minibuffer-window (window-frame window))) | |
265 :minibuffer-scrollp (eq window minibuffer-scroll-window) | |
266 :buffer buffer | |
267 :pixel-left left :pixel-top top :pixel-right right :pixel-bottom bottom | |
268 :hscroll (window-hscroll window) | |
269 :modeline-hscroll (modeline-hscroll window) | |
270 :dedicatedp (window-dedicated-p window) | |
271 :first-hchild (if (window-first-hchild window) | |
272 (root-window->saved-window (window-first-hchild window)) | |
273 nil) | |
274 :first-vchild (if (window-first-vchild window) | |
275 (root-window->saved-window (window-first-vchild window)) | |
276 nil) | |
277 :next-child (if (window-next-child window) | |
278 (root-window->saved-window (window-next-child window)) | |
279 nil)))) | |
280 (if buffer | |
281 (progn | |
282 (let ((marker (make-marker))) | |
283 (set-marker marker (window-start window) buffer) | |
284 (setf (saved-window-start-marker saved-window) marker)) | |
4136 | 285 (if (not (eq buffer (current-buffer))) |
286 (let ((marker (make-marker))) | |
287 (set-marker marker (window-point window) buffer) | |
288 (setf (saved-window-point-marker saved-window) marker))) | |
1149 | 289 (setf (saved-window-mark-marker saved-window) |
290 (copy-marker (mark-marker t buffer))))) | |
291 saved-window)))) | |
292 | |
4445
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
293 (defmacro save-window-excursion/mapping (&rest body) |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
294 "Execute body, preserving window sizes and contents. |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
295 Restores which buffer appears in which window, where display starts, |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
296 as well as the current buffer. |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
297 Return alist mapping old windows to new windows. |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
298 This alist maps the originally captured windows to the windows that correspond |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
299 to them in the restored configuration. It does not include entries for |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
300 windows that have not changed identity. |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
301 Does not restore the value of point in current buffer." |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
302 (let ((window-config (gensym 'window-config)) |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
303 (mapping (gensym 'mapping))) |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
304 `(let ((,window-config (current-window-configuration)) |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
305 (,mapping)) |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
306 (unwind-protect |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
307 (progn ,@body) |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
308 (setq ,mapping (set-window-configuration/mapping ,window-config))) |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
309 ,mapping))) |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
310 |
4674
e95ddfd6a409
In `set-window-configuration', don't restore frame size unconditionally.
Mike Sperber <sperber@deinprogramm.de>
parents:
4673
diff
changeset
|
311 (defun set-window-configuration (configuration &optional set-frame-size-p) |
4445
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
312 "Set the configuration of windows and buffers as specified by CONFIGURATION. |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
313 CONFIGURATION must be a value previously returned |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
314 by `current-window-configuration'. |
4674
e95ddfd6a409
In `set-window-configuration', don't restore frame size unconditionally.
Mike Sperber <sperber@deinprogramm.de>
parents:
4673
diff
changeset
|
315 If SET-FRAME-SIZE-P is true, the frame size is also restored. |
e95ddfd6a409
In `set-window-configuration', don't restore frame size unconditionally.
Mike Sperber <sperber@deinprogramm.de>
parents:
4673
diff
changeset
|
316 " |
e95ddfd6a409
In `set-window-configuration', don't restore frame size unconditionally.
Mike Sperber <sperber@deinprogramm.de>
parents:
4673
diff
changeset
|
317 (set-window-configuration/mapping configuration set-frame-size-p) |
e95ddfd6a409
In `set-window-configuration', don't restore frame size unconditionally.
Mike Sperber <sperber@deinprogramm.de>
parents:
4673
diff
changeset
|
318 nil) ; make sure nobody relies on mapping return value |
e95ddfd6a409
In `set-window-configuration', don't restore frame size unconditionally.
Mike Sperber <sperber@deinprogramm.de>
parents:
4673
diff
changeset
|
319 |
e95ddfd6a409
In `set-window-configuration', don't restore frame size unconditionally.
Mike Sperber <sperber@deinprogramm.de>
parents:
4673
diff
changeset
|
320 (defun set-window-configuration/mapping (configuration &optional set-frame-size-p) |
e95ddfd6a409
In `set-window-configuration', don't restore frame size unconditionally.
Mike Sperber <sperber@deinprogramm.de>
parents:
4673
diff
changeset
|
321 "Set the configuration of windows and buffers as specified by CONFIGURATION. |
e95ddfd6a409
In `set-window-configuration', don't restore frame size unconditionally.
Mike Sperber <sperber@deinprogramm.de>
parents:
4673
diff
changeset
|
322 CONFIGURATION must be a value previously returned |
e95ddfd6a409
In `set-window-configuration', don't restore frame size unconditionally.
Mike Sperber <sperber@deinprogramm.de>
parents:
4673
diff
changeset
|
323 by `current-window-configuration'. |
e95ddfd6a409
In `set-window-configuration', don't restore frame size unconditionally.
Mike Sperber <sperber@deinprogramm.de>
parents:
4673
diff
changeset
|
324 If SET-FRAME-SIZE-P is true, the frame size is also restored. |
4445
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
325 Return alist mapping old windows to new windows. |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
326 This alist maps the originally captured windows to the windows that correspond |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
327 to them in the restored configuration. It does not include entries for |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
328 windows that have not changed identity." |
1149 | 329 (let ((frame (window-configuration-frame configuration))) |
330 (if (and (frame-live-p frame) | |
331 (not (window-configuration-equal configuration | |
332 (current-window-configuration)))) | |
4674
e95ddfd6a409
In `set-window-configuration', don't restore frame size unconditionally.
Mike Sperber <sperber@deinprogramm.de>
parents:
4673
diff
changeset
|
333 (really-set-window-configuration frame configuration set-frame-size-p)))) |
1149 | 334 |
4674
e95ddfd6a409
In `set-window-configuration', don't restore frame size unconditionally.
Mike Sperber <sperber@deinprogramm.de>
parents:
4673
diff
changeset
|
335 (defun really-set-window-configuration (frame configuration set-frame-size-p) |
4445
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
336 "Set the window configuration CONFIGURATION on live frame FRAME. |
4674
e95ddfd6a409
In `set-window-configuration', don't restore frame size unconditionally.
Mike Sperber <sperber@deinprogramm.de>
parents:
4673
diff
changeset
|
337 If SET-FRAME-SIZE-P is true, the frame size is also restored. |
4445
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
338 Return alist mapping old windows to new windows." |
1149 | 339 ;; avoid potential temporary problems |
340 (setq window-min-width 0) | |
341 (setq window-min-height 0) | |
342 (setq minibuffer-scroll-window nil) | |
343 | |
344 (frame-reduce-to-one-window frame) | |
4674
e95ddfd6a409
In `set-window-configuration', don't restore frame size unconditionally.
Mike Sperber <sperber@deinprogramm.de>
parents:
4673
diff
changeset
|
345 (if set-frame-size-p |
e95ddfd6a409
In `set-window-configuration', don't restore frame size unconditionally.
Mike Sperber <sperber@deinprogramm.de>
parents:
4673
diff
changeset
|
346 (set-window-configuration-frame-size configuration)) |
2888 | 347 |
4673
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
348 ;; avoid setting these if they're already up-to-date |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
349 ;; This also avoids potential inaccuracies in these settings --Mike |
3646 | 350 (when window-configuration-includes-position |
351 (let ((left (window-configuration-frame-left configuration)) | |
4673
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
352 (top (window-configuration-frame-top configuration))) |
3646 | 353 (if (not (equal left (frame-property frame 'left))) |
4673
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
354 (set-frame-property frame 'left left)) |
3646 | 355 (if (not (equal top (frame-property frame 'top))) |
4673
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
356 (set-frame-property frame 'top top)))) |
1149 | 357 |
358 ;; these may have changed because of the delete | |
4673
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
359 (set-window-pixel-height (minibuffer-window frame) |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
360 (window-configuration-minibuffer-pixel-height configuration)) |
1149 | 361 |
4673
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
362 ;; avoid that `set-window-point' will set the buffer's point for |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
363 ;; the selected window |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
364 (select-window (minibuffer-window frame)) |
1149 | 365 |
4673
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
366 (let ((window-configuration-current-window nil) |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
367 (mapping (list nil))) ; poor man's box |
4445
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
368 |
4673
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
369 (declare (special window-configuration-current-window)) |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
370 (restore-saved-window configuration |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
371 (frame-root-window frame) |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
372 (window-configuration-saved-root-window configuration) |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
373 'vertical |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
374 mapping) |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
375 (if window-configuration-current-window |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
376 (select-window window-configuration-current-window)) |
4445
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
377 |
4673
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
378 (setq window-min-width (window-configuration-min-width configuration)) |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
379 (setq window-min-height (window-configuration-min-height configuration)) |
4445
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
380 |
4673
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
381 (let ((buffer (window-configuration-current-buffer configuration))) |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
382 (if (buffer-live-p buffer) |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
383 (set-buffer buffer) |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
384 (set-buffer (car (buffer-list))))) |
4674
e95ddfd6a409
In `set-window-configuration', don't restore frame size unconditionally.
Mike Sperber <sperber@deinprogramm.de>
parents:
4673
diff
changeset
|
385 ; this resets the window configuration so that the frame is filled |
e95ddfd6a409
In `set-window-configuration', don't restore frame size unconditionally.
Mike Sperber <sperber@deinprogramm.de>
parents:
4673
diff
changeset
|
386 (if (not set-frame-size-p) |
e95ddfd6a409
In `set-window-configuration', don't restore frame size unconditionally.
Mike Sperber <sperber@deinprogramm.de>
parents:
4673
diff
changeset
|
387 (set-frame-pixel-size frame (frame-pixel-width frame) (frame-pixel-height frame))) |
4673
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
388 (car mapping))) |
1149 | 389 |
390 (defun set-window-configuration-frame-size (configuration) | |
391 "Restore the frame size of a window configuration." | |
392 (set-frame-pixel-size | |
393 (window-configuration-frame configuration) | |
394 (window-configuration-frame-pixel-width configuration) | |
395 (window-configuration-frame-pixel-height configuration))) | |
396 | |
397 (defun frame-reduce-to-one-window (frame) | |
398 "Delete all windows except the minibuffer and one other in FRAME." | |
399 (let* ((root-window (frame-root-window frame)) | |
400 (combination-start (or (window-first-hchild root-window) | |
401 (window-first-vchild root-window)))) | |
402 (if combination-start | |
403 (window-reduce-to-one combination-start)))) | |
404 | |
1230 | 405 ;; Note that simply using `delete-other-windows' causes obscure |
406 ;; breakage. --Mike | |
407 | |
1149 | 408 (defun window-reduce-to-one (window) |
409 "Make sure only one subwindow of WINDOW is left." | |
1230 | 410 (let ((window (window-next-child window))) |
411 (while window | |
412 (if (window-live-p window) | |
413 (let ((next (window-next-child window))) | |
4444
715c3ced8fa8
Use `real-split-window', `real-delete-window' in window-config code.
Mike Sperber <sperber@deinprogramm.de>
parents:
4438
diff
changeset
|
414 (real-delete-window window) |
1230 | 415 (setq window next))))) |
416 (cond | |
417 ((window-first-hchild window) | |
418 (window-reduce-to-one (window-first-hchild window))) | |
419 ((window-first-vchild window) | |
420 (window-reduce-to-one (window-first-vchild window))))) | |
1149 | 421 |
4445
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
422 (defun restore-saved-window (configuration window saved-window direction mapping) |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
423 "Within CONFIGURATION, restore WINDOW to the state of SAVED-WINDOW. |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
424 MAPPING is a one-element list whose element is an old-window-to-new-window |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
425 mapping, which this function will extend." |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
426 (if (not (eq (saved-window-window saved-window) window)) |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
427 (rplaca mapping |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
428 (cons (cons (saved-window-window saved-window) window) |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
429 (car mapping)))) |
4438
2785829fe37c
Fix window-configuration problem.
Mike Sperber <sperber@deinprogramm.de>
parents:
4136
diff
changeset
|
430 (cond |
2785829fe37c
Fix window-configuration problem.
Mike Sperber <sperber@deinprogramm.de>
parents:
4136
diff
changeset
|
431 ((and (saved-window-next-child saved-window) |
2785829fe37c
Fix window-configuration problem.
Mike Sperber <sperber@deinprogramm.de>
parents:
4136
diff
changeset
|
432 (not (saved-window-minibufferp (saved-window-next-child saved-window)))) |
2785829fe37c
Fix window-configuration problem.
Mike Sperber <sperber@deinprogramm.de>
parents:
4136
diff
changeset
|
433 (cond ((eq direction 'vertical) |
4444
715c3ced8fa8
Use `real-split-window', `real-delete-window' in window-config code.
Mike Sperber <sperber@deinprogramm.de>
parents:
4438
diff
changeset
|
434 (real-split-window window nil nil)) |
4438
2785829fe37c
Fix window-configuration problem.
Mike Sperber <sperber@deinprogramm.de>
parents:
4136
diff
changeset
|
435 ((eq direction 'horizontal) |
4444
715c3ced8fa8
Use `real-split-window', `real-delete-window' in window-config code.
Mike Sperber <sperber@deinprogramm.de>
parents:
4438
diff
changeset
|
436 (real-split-window window nil t))) |
4438
2785829fe37c
Fix window-configuration problem.
Mike Sperber <sperber@deinprogramm.de>
parents:
4136
diff
changeset
|
437 (if (not (saved-window-minibufferp saved-window)) |
2785829fe37c
Fix window-configuration problem.
Mike Sperber <sperber@deinprogramm.de>
parents:
4136
diff
changeset
|
438 (restore-saved-window-parameters configuration window saved-window)) |
2785829fe37c
Fix window-configuration problem.
Mike Sperber <sperber@deinprogramm.de>
parents:
4136
diff
changeset
|
439 (restore-saved-window configuration |
2785829fe37c
Fix window-configuration problem.
Mike Sperber <sperber@deinprogramm.de>
parents:
4136
diff
changeset
|
440 (window-next-child window) |
2785829fe37c
Fix window-configuration problem.
Mike Sperber <sperber@deinprogramm.de>
parents:
4136
diff
changeset
|
441 (saved-window-next-child saved-window) |
4445
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
442 direction |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
443 mapping)) |
4438
2785829fe37c
Fix window-configuration problem.
Mike Sperber <sperber@deinprogramm.de>
parents:
4136
diff
changeset
|
444 ((not (saved-window-minibufferp saved-window)) |
2785829fe37c
Fix window-configuration problem.
Mike Sperber <sperber@deinprogramm.de>
parents:
4136
diff
changeset
|
445 (restore-saved-window-parameters configuration window saved-window))) |
1149 | 446 |
1576 | 447 (if (saved-window-first-hchild saved-window) |
448 (restore-saved-window configuration | |
449 window | |
450 (saved-window-first-hchild saved-window) | |
4445
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
451 'horizontal |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
452 mapping)) |
1576 | 453 (if (saved-window-first-vchild saved-window) |
454 (restore-saved-window configuration | |
455 window | |
456 (saved-window-first-vchild saved-window) | |
4445
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
457 'vertical |
1d41b9bcf74f
Add `set-window-configuration/mapping' and `save-window-excursion/mapping'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4444
diff
changeset
|
458 mapping))) |
1149 | 459 |
460 (defun restore-saved-window-parameters (configuration window saved-window) | |
461 "Restore the window parameters stored in SAVED-WINDOW on WINDOW." | |
1261 | 462 (declare (special window-configuration-current-window)) |
1149 | 463 (let ((buffer (saved-window-buffer saved-window))) |
464 (if (and buffer (buffer-live-p buffer)) | |
465 (progn | |
466 (set-window-buffer window | |
467 (saved-window-buffer saved-window)) | |
468 (set-window-start window | |
1161 | 469 (marker-position (saved-window-start-marker saved-window)) |
470 t) | |
4136 | 471 (if (markerp (saved-window-point-marker saved-window)) |
472 (set-window-point window | |
473 (marker-position (saved-window-point-marker saved-window)))) | |
1149 | 474 (set-marker (mark-marker t buffer) |
475 (marker-position (saved-window-mark-marker saved-window)) | |
476 buffer) | |
477 (if (not (eq buffer (window-configuration-current-buffer configuration))) | |
478 (goto-char (window-point window) buffer))))) | |
479 | |
480 (if (and (not (saved-window-first-hchild saved-window)) | |
481 (not (saved-window-first-vchild saved-window))) | |
482 ;; only set size for non-container windows | |
483 (progn | |
484 ;; If this is the root window, it may be the only window. | |
485 ;; Because of mismatches between actual and reported frame | |
486 ;; size, it may not let us actually set the size of the root | |
487 ;; window to what we want. --Mike | |
488 (if (not (eq window (frame-root-window (window-frame window)))) | |
489 (progn | |
4673
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
490 (set-window-pixel-width window |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
491 (saved-window-pixel-width saved-window)) |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
492 (set-window-pixel-height window |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
493 (saved-window-pixel-height saved-window)))) |
1149 | 494 (set-window-hscroll window (saved-window-hscroll saved-window)) |
495 (set-modeline-hscroll window | |
496 (saved-window-modeline-hscroll saved-window)) | |
497 (set-window-dedicated-p window (saved-window-dedicatedp saved-window)))) | |
498 | |
499 (if (saved-window-currentp saved-window) | |
500 (setq window-configuration-current-window window)) | |
501 (if (saved-window-minibuffer-scrollp saved-window) | |
502 (setq minibuffer-scroll-window window))) | |
503 | |
504 (defun saved-window-pixel-width (saved-window) | |
505 "Compute the pixel width of SAVED-WINDOW." | |
506 (- (saved-window-pixel-right saved-window) | |
507 (saved-window-pixel-left saved-window))) | |
508 | |
509 (defun saved-window-pixel-height (saved-window) | |
510 "Compute the pixel height of SAVED-WINDOW." | |
511 (- (saved-window-pixel-bottom saved-window) | |
512 (saved-window-pixel-top saved-window))) | |
4673
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
513 |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
514 (defun set-window-pixel-width (window width) |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
515 "Set the pixel width of WINDOW." |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
516 (enlarge-window-pixels (- width (window-pixel-width window)) t window)) |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
517 |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
518 (defun set-window-pixel-height (window height) |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
519 "Set the pixel height of WINDOW." |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
520 (enlarge-window-pixels (- height (window-pixel-height window)) nil window)) |
11d71be1c232
Add `set-window-pixel-{width,height} convenience functions.
Mike Sperber <sperber@deinprogramm.de>
parents:
4445
diff
changeset
|
521 |
428 | 522 |
523 ;; The window-config stack is stored as a list in frame property | |
524 ;; 'window-config-stack, with the most recent element at the front. | |
525 ;; When you pop off an element, the popped off element gets put at the | |
526 ;; front of frame property 'window-config-unpop-stack, so you can | |
527 ;; retrieve it using unpop-window-configuration. | |
528 | |
529 (defcustom window-config-stack-max 16 | |
530 "*Maximum size of window configuration stack. | |
531 Start discarding off end if it gets this big." | |
532 :type 'integer | |
533 :group 'windows) | |
534 | |
535 (defun window-config-stack (&optional frame) | |
536 (or frame (setq frame (selected-frame))) | |
537 (let ((stack (frame-property frame 'window-config-stack))) | |
538 (if stack | |
539 (set-undoable-stack-max stack window-config-stack-max) | |
540 (progn | |
541 (setq stack (make-undoable-stack window-config-stack-max)) | |
542 (set-frame-property frame 'window-config-stack stack))) | |
543 stack)) | |
544 | |
545 (defun push-window-configuration (&optional config) | |
546 "Push the current window configuration onto the window-config stack. | |
547 If CONFIG is specified, push it instead of the current window configuration. | |
548 Each frame has its own window-config stack." | |
549 (interactive) | |
550 (let ((wc (or config (current-window-configuration))) | |
551 (stack (window-config-stack))) | |
5366
f00192e1cd49
Examining the result of #'length: `eql', not `=', it's better style & cheaper
Aidan Kehoe <kehoea@parhasard.net>
parents:
4674
diff
changeset
|
552 (if (or (eql 0 (undoable-stack-a-length stack)) |
428 | 553 (not (equal (undoable-stack-a-top stack) wc))) |
554 (undoable-stack-push stack wc)))) | |
555 | |
556 (defun pop-window-configuration () | |
557 "Pop the top window configuration off the window-config stack and set it. | |
558 Before setting the new window configuration, the current window configuration | |
559 is pushed onto the \"unpop\" stack. | |
560 `unpop-window-configuration' undoes what this function does. | |
561 Each frame has its own window-config and \"unpop\" stack." | |
562 (interactive) | |
563 (let ((stack (window-config-stack)) | |
564 (wc (current-window-configuration)) | |
565 popped) | |
566 (condition-case nil | |
567 (progn | |
568 (setq popped (undoable-stack-pop stack)) | |
569 (while (equal popped wc) | |
570 (setq popped (undoable-stack-pop stack))) | |
571 (undoable-stack-push stack wc) | |
572 (undoable-stack-undo stack) | |
573 (set-window-configuration popped) | |
574 popped) | |
575 (trunc-stack-bottom | |
576 (error "Bottom of window config stack"))))) | |
577 | |
578 (defun unpop-window-configuration () | |
579 "Undo the effect of the most recent `pop-window-configuration'. | |
580 This does exactly the inverse of what `pop-window-configuration' does: | |
581 i.e. it pops a window configuration off of the \"unpop\" stack and | |
582 pushes the current window configuration onto the window-config stack. | |
583 Each frame has its own window-config and \"unpop\" stack." | |
584 (interactive) | |
585 (let ((stack (window-config-stack)) | |
586 (wc (current-window-configuration)) | |
587 popped) | |
588 (condition-case nil | |
589 (progn | |
590 (setq popped | |
591 (progn | |
592 (undoable-stack-redo stack) | |
593 (undoable-stack-pop stack))) | |
594 (while (equal popped wc) | |
595 (setq popped | |
596 (progn | |
597 (undoable-stack-redo stack) | |
598 (undoable-stack-pop stack)))) | |
599 (undoable-stack-push stack wc) | |
600 (set-window-configuration popped) | |
601 popped) | |
602 (trunc-stack-bottom | |
603 (error "Top of window config stack"))))) | |
604 | |
605 | |
606 ;;;;;;;;;;;;; display-buffer, moved here from C. Hallelujah. | |
607 | |
442 | 608 (make-variable-buffer-local '__buffer-dedicated-frame) |
609 | |
610 (defun buffer-dedicated-frame (&optional buffer) | |
611 "Return the frame dedicated to this BUFFER, or nil if there is none. | |
612 No argument or nil as argument means use current buffer as BUFFER." | |
613 (let ((buffer (decode-buffer buffer))) | |
614 (let ((frame (symbol-value-in-buffer '__buffer-dedicated-frame buffer))) | |
615 ;; XEmacs addition: if the frame is dead, silently make it go away. | |
616 (when (and (framep frame) (not (frame-live-p frame))) | |
617 (with-current-buffer buffer | |
618 (setq __buffer-dedicated-frame nil)) | |
619 (setq frame nil)) | |
620 frame))) | |
621 | |
622 (defun set-buffer-dedicated-frame (buffer frame) | |
623 "For this BUFFER, set the FRAME dedicated to it. | |
624 FRAME must be a frame or nil." | |
625 (let ((buffer (decode-buffer buffer))) | |
626 (and frame | |
627 (check-argument-type #'frame-live-p frame)) | |
628 (with-current-buffer buffer | |
629 (setq __buffer-dedicated-frame frame)))) | |
630 | |
428 | 631 (defvar display-buffer-function nil |
632 "If non-nil, function to call to handle `display-buffer'. | |
903 | 633 It will receive four args: the same as those to `display-buffer'.") |
428 | 634 |
635 (defvar pre-display-buffer-function nil | |
636 "If non-nil, function that will be called from `display-buffer' | |
903 | 637 as the first action. It will receive four args: the same as those |
428 | 638 to `display-buffer'. |
639 This function may be used to select an appropriate frame for the buffer, | |
640 for example. See also the variable `display-buffer-function', which may | |
641 be used to completely replace the `display-buffer' function. | |
642 If the return value of this function is non-nil, it should be a frame, | |
643 and that frame will be used to display the buffer.") | |
644 | |
645 (defcustom pop-up-frames nil | |
646 "*Non-nil means `display-buffer' should make a separate frame." | |
647 :type 'boolean | |
648 :group 'frames) | |
649 | |
650 (defvar pop-up-frame-function nil | |
651 "Function to call to handle automatic new frame creation. | |
652 It is called with no arguments and should return a newly created frame. | |
653 | |
654 A typical value might be `(lambda () (new-frame pop-up-frame-alist))' | |
655 where `pop-up-frame-alist' would hold the default frame parameters.") | |
656 | |
657 (defcustom special-display-buffer-names nil | |
658 "*List of buffer names that should have their own special frames. | |
659 Displaying a buffer whose name is in this list makes a special frame for it | |
660 using `special-display-function'. | |
661 | |
662 An element of the list can be a cons cell instead of just a string. | |
663 Then the car should be a buffer name, and the cdr specifies frame | |
664 parameters for creating the frame for that buffer. | |
665 More precisely, the cdr is passed as the second argument to | |
666 the function found in `special-display-function', when making that frame. | |
667 See also `special-display-regexps'." | |
668 :type '(repeat (choice :value "" | |
669 (string :tag "Name") | |
670 (cons :menu-tag "Properties" | |
671 :value ("" . nil) | |
672 (string :tag "Name") | |
673 (repeat :tag "Properties" | |
674 (group :inline t | |
675 (symbol :tag "Property") | |
676 (sexp :tag "Value")))))) | |
677 :group 'frames) | |
678 | |
679 (defcustom special-display-regexps nil | |
680 "*List of regexps saying which buffers should have their own special frames. | |
681 If a buffer name matches one of these regexps, it gets its own frame. | |
682 Displaying a buffer whose name is in this list makes a special frame for it | |
683 using `special-display-function'. | |
684 | |
685 An element of the list can be a cons cell instead of just a string. | |
686 Then the car should be the regexp, and the cdr specifies frame | |
687 parameters for creating the frame for buffers that match. | |
688 More precisely, the cdr is passed as the second argument to | |
689 the function found in `special-display-function', when making that frame. | |
690 See also `special-display-buffer-names'." | |
691 :type '(repeat (choice :value "" | |
692 regexp | |
693 (cons :menu-tag "Properties" | |
694 :value ("" . nil) | |
695 regexp | |
696 (repeat :tag "Properties" | |
697 (group :inline t | |
698 (symbol :tag "Property") | |
699 (sexp :tag "Value")))))) | |
700 :group 'frames) | |
701 | |
702 (defvar special-display-function nil | |
703 "Function to call to make a new frame for a special buffer. | |
704 It is called with two arguments, the buffer and optional buffer specific | |
705 data, and should return a window displaying that buffer. | |
706 The default value makes a separate frame for the buffer, | |
707 using `special-display-frame-alist' to specify the frame parameters. | |
708 | |
709 A buffer is special if its is listed in `special-display-buffer-names' | |
710 or matches a regexp in `special-display-regexps'.") | |
711 | |
712 (defcustom same-window-buffer-names nil | |
713 "*List of buffer names that should appear in the selected window. | |
714 Displaying one of these buffers using `display-buffer' or `pop-to-buffer' | |
715 switches to it in the selected window, rather than making it appear | |
716 in some other window. | |
717 | |
718 An element of the list can be a cons cell instead of just a string. | |
719 Then the car must be a string, which specifies the buffer name. | |
720 This is for compatibility with `special-display-buffer-names'; | |
721 the cdr of the cons cell is ignored. | |
722 | |
723 See also `same-window-regexps'." | |
724 :type '(repeat (string :tag "Name")) | |
725 :group 'windows) | |
726 | |
727 (defcustom same-window-regexps nil | |
728 "*List of regexps saying which buffers should appear in the selected window. | |
729 If a buffer name matches one of these regexps, then displaying it | |
730 using `display-buffer' or `pop-to-buffer' switches to it | |
731 in the selected window, rather than making it appear in some other window. | |
732 | |
733 An element of the list can be a cons cell instead of just a string. | |
734 Then the car must be a string, which specifies the buffer name. | |
735 This is for compatibility with `special-display-buffer-names'; | |
736 the cdr of the cons cell is ignored. | |
737 | |
738 See also `same-window-buffer-names'." | |
739 :type '(repeat regexp) | |
740 :group 'windows) | |
741 | |
742 (defcustom pop-up-windows t | |
743 "*Non-nil means display-buffer should make new windows." | |
744 :type 'boolean | |
745 :group 'windows) | |
746 | |
747 (defcustom split-height-threshold 500 | |
748 "*display-buffer would prefer to split the largest window if this large. | |
749 If there is only one window, it is split regardless of this value." | |
750 :type 'integer | |
751 :group 'windows) | |
752 | |
753 (defcustom split-width-threshold 500 | |
754 "*display-buffer would prefer to split the largest window if this large. | |
755 If there is only one window, it is split regardless of this value." | |
756 :type 'integer | |
757 :group 'windows) | |
758 | |
759 ;; Deiconify the frame containing the window WINDOW, then return WINDOW. | |
760 | |
761 (defun display-buffer-1 (window) | |
762 (if (frame-iconified-p (window-frame window)) | |
763 (make-frame-visible (window-frame window))) | |
764 window) | |
765 | |
766 ;; Can you believe that all of this crap was formerly in C? | |
767 ;; Praise Jesus that it's not there any more. | |
768 | |
903 | 769 (defun display-buffer (buffer &optional not-this-window-p override-frame |
770 shrink-to-fit) | |
428 | 771 "Make BUFFER appear in some window on the current frame, but don't select it. |
772 BUFFER can be a buffer or a buffer name. | |
773 If BUFFER is shown already in some window in the current frame, | |
774 just uses that one, unless the window is the selected window and | |
775 NOT-THIS-WINDOW-P is non-nil (interactively, with prefix arg). | |
776 | |
777 If BUFFER has a dedicated frame, display on that frame instead of | |
778 the current frame, unless OVERRIDE-FRAME is non-nil. | |
779 | |
780 If OVERRIDE-FRAME is non-nil, display on that frame instead of | |
781 the current frame (or the dedicated frame). | |
782 | |
903 | 783 If SHRINK-TO-FIT is non-nil and splitting the window is appropriate, give |
784 the new buffer less than half the space if it is small enough to fit. | |
785 | |
428 | 786 If `pop-up-windows' is non-nil, always use the |
787 current frame and create a new window regardless of whether the | |
788 buffer has a dedicated frame, and regardless of whether | |
789 OVERRIDE-FRAME was specified. | |
790 | |
791 If `pop-up-frames' is non-nil, make a new frame if no window shows BUFFER. | |
792 | |
2590 | 793 If the buffer name is a member of the `same-window-buffer-names' list, |
794 or matches one of the `same-window-regexps' expressions, display the | |
795 buffer in the currently selected window. | |
796 | |
428 | 797 Returns the window displaying BUFFER." |
798 (interactive "BDisplay buffer:\nP") | |
799 | |
800 (let ((wconfig (current-window-configuration)) | |
801 (result | |
802 ;; We just simulate a `return' in C. This function is way ugly | |
803 ;; and does `returns' all over the place and there's no sense | |
804 ;; in trying to rewrite it to be more Lispy. | |
805 (catch 'done | |
1669 | 806 (let (window old-frame target-frame explicit-frame shrink-it) |
428 | 807 (setq old-frame (or (last-nonminibuf-frame) (selected-frame))) |
808 (setq buffer (get-buffer buffer)) | |
809 (check-argument-type 'bufferp buffer) | |
810 | |
811 (setq explicit-frame | |
812 (if pre-display-buffer-function | |
813 (funcall pre-display-buffer-function buffer | |
814 not-this-window-p | |
903 | 815 override-frame |
816 shrink-to-fit))) | |
428 | 817 |
818 ;; Give the user the ability to completely reimplement | |
819 ;; this function via the `display-buffer-function'. | |
820 (if display-buffer-function | |
821 (throw 'done | |
822 (funcall display-buffer-function buffer | |
823 not-this-window-p | |
903 | 824 override-frame |
825 shrink-to-fit))) | |
428 | 826 |
827 ;; If the buffer has a dedicated frame, that takes | |
828 ;; precedence over the current frame, and over what the | |
829 ;; pre-display-buffer-function did. | |
830 (let ((dedi (buffer-dedicated-frame buffer))) | |
831 (if (frame-live-p dedi) (setq explicit-frame dedi))) | |
832 | |
833 ;; if override-frame is supplied, that takes precedence over | |
834 ;; everything. This is gonna look bad if the | |
835 ;; pre-display-buffer-function raised some other frame | |
836 ;; already. | |
837 (if override-frame | |
838 (progn | |
839 (check-argument-type 'frame-live-p override-frame) | |
840 (setq explicit-frame override-frame))) | |
841 | |
842 (setq target-frame | |
843 (or explicit-frame | |
844 (last-nonminibuf-frame) | |
845 (selected-frame))) | |
846 | |
847 ;; If we have switched frames, then set not-this-window-p | |
848 ;; to false. Switching frames means that selected-window | |
849 ;; is no longer the same as it was on entry -- it's the | |
850 ;; selected-window of target_frame instead of old_frame, | |
851 ;; so it's a fine candidate for display. | |
852 (if (not (eq old-frame target-frame)) | |
853 (setq not-this-window-p nil)) | |
854 | |
855 ;; if it's in the selected window, and that's ok, then we're done. | |
856 (if (and (not not-this-window-p) | |
857 (eq buffer (window-buffer (selected-window)))) | |
858 (throw 'done (display-buffer-1 (selected-window)))) | |
859 | |
860 ;; See if the user has specified this buffer should appear | |
861 ;; in the selected window. | |
862 | |
863 (if not-this-window-p | |
864 nil | |
865 | |
866 (if (or (member (buffer-name buffer) same-window-buffer-names) | |
867 (assoc (buffer-name buffer) same-window-buffer-names)) | |
868 (progn | |
869 (switch-to-buffer buffer) | |
870 (throw 'done (display-buffer-1 (selected-window))))) | |
871 | |
872 (let ((tem same-window-regexps)) | |
873 (while tem | |
874 (let ((car (car tem))) | |
875 (if (or | |
876 (and (stringp car) | |
877 (string-match car (buffer-name buffer))) | |
878 (and (consp car) (stringp (car car)) | |
879 (string-match (car car) (buffer-name buffer)))) | |
880 (progn | |
881 (switch-to-buffer buffer) | |
882 (throw 'done (display-buffer-1 | |
883 (selected-window)))))) | |
884 (setq tem (cdr tem))))) | |
885 | |
886 ;; If pop-up-frames, look for a window showing BUFFER on | |
887 ;; any visible or iconified frame. Otherwise search only | |
888 ;; the current frame. | |
889 (if (and (not explicit-frame) | |
890 (or pop-up-frames (not (last-nonminibuf-frame)))) | |
891 (setq target-frame 0)) | |
892 | |
893 ;; Otherwise, find some window that it's already in, and | |
894 ;; return that, unless that window is the selected window | |
895 ;; and that isn't ok. What a contorted mess! | |
896 (setq window (or (if (not explicit-frame) | |
897 ;; search the selected frame | |
898 ;; first if the user didn't | |
899 ;; specify an explicit frame. | |
900 (get-buffer-window buffer nil)) | |
901 (get-buffer-window buffer target-frame))) | |
902 (if (and window | |
903 (or (not not-this-window-p) | |
904 (not (eq window (selected-window))))) | |
905 (throw 'done (display-buffer-1 window))) | |
906 | |
907 ;; Certain buffer names get special handling. | |
908 (if special-display-function | |
909 (progn | |
910 (if (member (buffer-name buffer) | |
911 special-display-buffer-names) | |
912 (throw 'done (funcall special-display-function buffer))) | |
913 | |
914 (let ((tem (assoc (buffer-name buffer) | |
915 special-display-buffer-names))) | |
916 (if tem | |
917 (throw 'done (funcall special-display-function | |
918 buffer (cdr tem))))) | |
919 | |
920 (let ((tem special-display-regexps)) | |
921 (while tem | |
922 (let ((car (car tem))) | |
923 (if (and (stringp car) | |
924 (string-match car (buffer-name buffer))) | |
925 (throw 'done | |
926 (funcall special-display-function buffer))) | |
927 (if (and (consp car) | |
928 (stringp (car car)) | |
929 (string-match (car car) | |
930 (buffer-name buffer))) | |
931 (throw 'done (funcall | |
932 special-display-function buffer | |
933 (cdr car))))) | |
934 (setq tem (cdr tem)))))) | |
935 | |
936 ;; If there are no frames open that have more than a minibuffer, | |
937 ;; we need to create a new frame. | |
938 (if (or pop-up-frames | |
939 (null (last-nonminibuf-frame))) | |
940 (progn | |
941 (setq window (frame-selected-window | |
942 (funcall pop-up-frame-function))) | |
943 (set-window-buffer window buffer) | |
944 (throw 'done (display-buffer-1 window)))) | |
945 | |
946 ;; Otherwise, make it be in some window, splitting if | |
947 ;; appropriate/possible. Do not split a window if we are | |
948 ;; displaying the buffer in a different frame than that which | |
949 ;; was current when we were called. (It is already in a | |
950 ;; different window by virtue of being in another frame.) | |
951 (if (or (and pop-up-windows (eq target-frame old-frame)) | |
952 (eq 'only (frame-property (selected-frame) 'minibuffer)) | |
953 ;; If the current frame is a special display frame, | |
954 ;; don't try to reuse its windows. | |
955 (window-dedicated-p (frame-root-window (selected-frame)))) | |
956 (progn | |
957 (if (eq 'only (frame-property (selected-frame) 'minibuffer)) | |
958 (setq target-frame (last-nonminibuf-frame))) | |
959 | |
960 ;; Don't try to create a window if would get an error with | |
961 ;; height. | |
962 (if (< split-height-threshold (* 2 window-min-height)) | |
963 (setq split-height-threshold (* 2 window-min-height))) | |
964 | |
965 ;; Same with width. | |
966 (if (< split-width-threshold (* 2 window-min-width)) | |
967 (setq split-width-threshold (* 2 window-min-width))) | |
968 | |
969 ;; If the frame we would try to split cannot be split, | |
970 ;; try other frames. | |
971 (if (frame-property (if (null target-frame) | |
972 (selected-frame) | |
973 (last-nonminibuf-frame)) | |
974 'unsplittable) | |
975 (setq window | |
976 ;; Try visible frames first. | |
977 (or (get-largest-window 'visible) | |
978 ;; If that didn't work, try iconified frames. | |
979 (get-largest-window 0) | |
980 (get-largest-window t))) | |
981 (setq window (get-largest-window target-frame))) | |
982 | |
983 ;; If we got a tall enough full-width window that | |
984 ;; can be split, split it. | |
985 (if (and window | |
986 (not (frame-property (window-frame window) | |
987 'unsplittable)) | |
988 (>= (window-height window) split-height-threshold) | |
989 (or (>= (window-width window) | |
990 split-width-threshold) | |
991 (and (window-leftmost-p window) | |
992 (window-rightmost-p window)))) | |
993 (setq window (split-window window)) | |
1669 | 994 (let (upper other) |
428 | 995 (setq window (get-lru-window target-frame)) |
996 ;; If the LRU window is selected, and big enough, | |
997 ;; and can be split, split it. | |
998 (if (and window | |
999 (not (frame-property (window-frame window) | |
1000 'unsplittable)) | |
1001 (or (eq window (selected-window)) | |
1002 (not (window-parent window))) | |
1003 (>= (window-height window) | |
1004 (* 2 window-min-height))) | |
1005 (setq window (split-window window))) | |
1006 ;; If get-lru-window returned nil, try other approaches. | |
1007 ;; Try visible frames first. | |
1008 (or window | |
1009 (setq window (or (get-largest-window 'visible) | |
1010 ;; If that didn't work, try | |
1011 ;; iconified frames. | |
1012 (get-largest-window 0) | |
1013 ;; Try invisible frames. | |
1014 (get-largest-window t) | |
1015 ;; As a last resort, make | |
1016 ;; a new frame. | |
1017 (frame-selected-window | |
1018 (funcall | |
1019 pop-up-frame-function))))) | |
1020 ;; If window appears above or below another, | |
1021 ;; even out their heights. | |
1022 (if (window-previous-child window) | |
1023 (setq other (window-previous-child window) | |
1024 upper other)) | |
1025 (if (window-next-child window) | |
1026 (setq other (window-next-child window) | |
1027 upper window)) | |
1028 ;; Check that OTHER and WINDOW are vertically arrayed. | |
1029 (if (and other | |
1030 (not (= (nth 1 (window-pixel-edges other)) | |
1031 (nth 1 (window-pixel-edges window)))) | |
1032 (> (window-pixel-height other) | |
1033 (window-pixel-height window))) | |
1034 (enlarge-window (- (/ (+ (window-height other) | |
1035 (window-height window)) | |
1036 2) | |
1037 (window-height upper)) | |
903 | 1038 nil upper)) |
1669 | 1039 ;; Klaus Berndl <klaus.berndl@sdm.de>: Only in |
1040 ;; this situation we shrink-to-fit but we can do | |
1041 ;; this first after we have displayed buffer in | |
1042 ;; window (s.b. (set-window-buffer window buffer)) | |
1043 (setq shrink-it shrink-to-fit)))) | |
428 | 1044 |
1045 (setq window (get-lru-window target-frame))) | |
1046 | |
1047 ;; Bring the window's previous buffer to the top of the MRU chain. | |
1048 (if (window-buffer window) | |
1049 (save-excursion | |
1050 (save-selected-window | |
1051 (select-window window) | |
1052 (record-buffer (window-buffer window))))) | |
1053 | |
1054 (set-window-buffer window buffer) | |
1055 | |
1669 | 1056 ;; Now window's previous buffer has been brought to the top |
1057 ;; of the MRU chain and window displays buffer - now we can | |
1058 ;; shrink-to-fit if necessary | |
1059 (if shrink-it | |
1060 (shrink-window-if-larger-than-buffer window)) | |
1061 | |
428 | 1062 (display-buffer-1 window))))) |
1063 (or (equal wconfig (current-window-configuration)) | |
1064 (push-window-configuration wconfig)) | |
1065 result)) | |
1066 | |
1067 ;;; window-xemacs.el ends here |