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