Mercurial > emacs
annotate lisp/ediff-wind.el @ 12020:6ef622c132df
(ediff-setup-control-frame): Make
Ediff delete the old control frame before creating a new one.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Tue, 30 May 1995 19:20:47 +0000 |
parents | 8b4f8ba23b60 |
children | 4a13777b153b |
rev | line source |
---|---|
11042 | 1 ;;; ediff-wind.el --- window manipulation utilities |
11234 | 2 ;;; Copyright (C) 1994, 1995 Free Software Foundation, Inc. |
11042 | 3 |
4 ;; Author: Michael Kifer <kifer@cs.sunysb.edu> | |
5 | |
6 ;; This file is part of GNU Emacs. | |
7 | |
8 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
9 ;; it under the terms of the GNU General Public License as published by | |
10 ;; the Free Software Foundation; either version 2, or (at your option) | |
11 ;; any later version. | |
12 | |
13 ;; GNU Emacs is distributed in the hope that it will be useful, | |
14 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
16 ;; GNU General Public License for more details. | |
17 | |
18 ;; You should have received a copy of the GNU General Public License | |
19 ;; along with GNU Emacs; see the file COPYING. If not, write to | |
20 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | |
21 | |
22 | |
23 (require 'ediff-init) | |
24 | |
25 | |
26 (defvar ediff-window-setup-function (if (not window-system) | |
27 'ediff-setup-windows-plain | |
28 'ediff-setup-windows-multiframe) | |
29 "*Function called to set up windows. | |
30 Ediff provides a choice of two functions: ediff-setup-windows-plain, for | |
31 doing everything in one frame, and ediff-setup-windows-multiframe, | |
32 which sets the control panel in a separate frame. Also, if the latter | |
33 function detects that one of the buffers A/B is seen in some other frame, | |
34 it will try to keep that buffer in that frame. | |
35 | |
36 If you don't like the two functions provided---write your own one. | |
37 The basic guidelines: | |
38 1. It should leave the control buffer current and the control window | |
39 selected. | |
40 2. It should set ediff-window-A, ediff-window-B, ediff-window-C, | |
41 and ediff-control-window to contain window objects that display | |
42 the corresponding buffers. | |
43 3. It should accept the following arguments: | |
44 buffer-A, buffer-B, buffer-C, control-buffer | |
45 Buffer C may not be used in jobs that compare only two buffers. | |
46 If you plan to do something fancy, take a close look at how the two | |
47 provided functions are written.") | |
48 | |
49 ;; indicates if we are in a multiframe setup | |
50 (ediff-defvar-local ediff-multiframe nil "") | |
51 | |
52 ;; Share of the frame occupied by the merge window (buffer C) | |
53 (ediff-defvar-local ediff-merge-window-share 0.45 "") | |
54 | |
55 ;; The control window. | |
56 (ediff-defvar-local ediff-control-window nil "") | |
57 ;; Official window for buffer A | |
58 (ediff-defvar-local ediff-window-A nil "") | |
59 ;; Official window for buffer B | |
60 (ediff-defvar-local ediff-window-B nil "") | |
61 ;; Official window for buffer C | |
62 (ediff-defvar-local ediff-window-C nil "") | |
63 ;; Ediff's window configuration. | |
64 ;; Used to minimize the need to rearrange windows. | |
65 (ediff-defvar-local ediff-window-config-saved "" "") | |
66 | |
67 | |
68 (defvar ediff-split-window-function 'split-window-vertically | |
69 "*The function used to split the main window between buffer-A and buffer-B. | |
70 You can set it to a horizontal split instead of the default vertical split | |
71 by setting this variable to `split-window-horizontally'. | |
72 You can also have your own function to do fancy splits. | |
73 This variable has no effect when buffer-A/B are shown in different frames. | |
74 In this case, Ediff will use those frames to display these buffers.") | |
75 | |
76 (defvar ediff-merge-split-window-function 'split-window-horizontally | |
77 "*The function used to split the main window between buffer-A and buffer-B. | |
78 You can set it to a vertical split instead of the default horizontal split | |
79 by setting this variable to `split-window-vertically'. | |
80 You can also have your own function to do fancy splits. | |
81 This variable has no effect when buffer-A/B/C are shown in different frames. | |
82 In this case, Ediff will use those frames to display these buffers.") | |
83 | |
84 (defconst ediff-control-frame-parameters | |
85 (if window-system | |
86 (list | |
87 '(name . "Ediff") | |
88 ;;'(unsplittable . t) | |
89 '(minibuffer . nil) | |
90 '(vertical-scroll-bars . nil) ; FSF only | |
91 '(scrollbar-width . 0) ; XEmacs only | |
92 '(menu-bar-lines . 0) ; FSF only | |
93 ;; don't lower and auto-raise | |
94 '(auto-lower . nil) | |
95 '(auto-raise . t) | |
96 ;; this blocks queries from window manager as to where to put | |
97 ;; ediff's control frame. we put the frame outside the display, | |
98 ;; so the initial frame won't jump all over the screen | |
99 (cons 'top (if (fboundp 'x-display-pixel-height) | |
100 (1+ (x-display-pixel-height)) | |
101 3000)) | |
102 (cons 'left (if (fboundp 'x-display-pixel-width) | |
103 (1+ (x-display-pixel-width)) | |
104 3000)) | |
105 )) | |
106 "Frame parameters for displaying Ediff Control Panel. | |
107 Do not specify width and height here. These are computed automatically.") | |
108 | |
109 (defvar ediff-control-frame-position-function 'ediff-make-frame-position | |
110 "Function to call to determine the desired location for the control panel. | |
111 Expects three parameters: the control buffer, the desired width and height | |
112 of the control frame. It returns an association list | |
113 of the form \(\(top . <position>\) \(left . <position>\)\)") | |
114 | |
115 (defvar ediff-control-frame-upward-shift (if ediff-xemacs-p 36 4) | |
116 "*The upward shift of control frame from the top of buffer A's frame. | |
117 Measured in pixels. | |
118 This is used by the default control frame positioning function, | |
119 `ediff-make-frame-position'. This variable is provided for easy | |
120 customization of the default.") | |
121 | |
122 (defvar ediff-narrow-control-frame-leftward-shift (if ediff-xemacs-p 7 3) | |
123 "*The leftward shift of control frame from the right edge of buf A's frame. | |
124 Measured in characters. | |
125 This is used by the default control frame positioning function, | |
126 `ediff-make-frame-position' to adjust the position of the control frame | |
127 when it shows the short menu. This variable is provided for easy | |
128 customization of the default.") | |
129 | |
130 (defvar ediff-wide-control-frame-rightward-shift 7 | |
131 "*The rightward shift of control frame from the left edge of buf A's frame. | |
132 Measured in characters. | |
133 This is used by the default control frame positioning function, | |
134 `ediff-make-frame-position' to adjust the position of the control frame | |
135 when it shows the full menu. This variable is provided for easy | |
136 customization of the default.") | |
137 | |
138 | |
139 ;; Wide frame display | |
140 | |
141 ;; t means Ediff is using wide display | |
142 (ediff-defvar-local ediff-wide-display-p nil "") | |
143 ;; keeps frame config for toggling wide display | |
144 (ediff-defvar-local ediff-wide-display-orig-parameters nil | |
145 "Frame parameters to be restored when the user wants to toggle the wide | |
146 display off.") | |
147 (ediff-defvar-local ediff-wide-display-frame nil | |
148 "Frame to be used for wide display.") | |
149 (ediff-defvar-local ediff-make-wide-display-function 'ediff-make-wide-display | |
150 "The value is a function that is called to create a wide display. | |
151 The function is called without arguments. It should resize the frame in | |
152 which buffers A, B, and C are to be displayed, and it should save the old | |
153 frame parameters in `ediff-wide-display-orig-parameters'. | |
154 The variable `ediff-wide-display-frame' should be set to contain | |
155 the frame used for the wide display.") | |
156 | |
157 ;; Frame used for the control panel in a windowing system. | |
158 (ediff-defvar-local ediff-control-frame nil "") | |
159 | |
160 (defvar ediff-prefer-iconified-control-frame nil | |
161 "*If t, keep control panel iconified when help message is off. | |
162 This has effect only on a windowing system. | |
163 If t, hiting `?' to toggle control panel off iconifies it. | |
164 | |
165 This is only useful in Emacs and only for certain kinds of window managers, | |
166 such as TWM and its derivatives, since the window manager must permit | |
167 keyboard input to go into icons. XEmacs completely ignores keyboard input | |
168 into icons, regardless of the window manager.") | |
169 | |
170 ;;; Functions | |
171 | |
172 (defun ediff-get-window-by-clicking (wind prev-wind wind-number) | |
173 (let (event) | |
174 (message | |
175 "Select windows by clicking. Please click on Window %d " wind-number) | |
176 (while (not (ediff-mouse-event-p (setq event (ediff-read-event)))) | |
177 (if (sit-for 1) ; if sequence of events, wait till the final word | |
178 (beep 1)) | |
179 (message "Please click on Window %d " wind-number)) | |
180 (ediff-read-event) ; discard event | |
181 (setq wind (if ediff-xemacs-p | |
182 (event-window event) | |
183 (posn-window (event-start event)))) | |
184 )) | |
185 | |
186 | |
187 ;; Select the lowest window on the frame. | |
188 (defun ediff-select-lowest-window () | |
189 (let* ((lowest-window (selected-window)) | |
190 (bottom-edge (car (cdr (cdr (cdr (window-edges)))))) | |
191 ;;(last-window (previous-window)) | |
192 (last-window (save-excursion | |
193 (other-window -1) (selected-window))) | |
194 (window-search t)) | |
195 (while window-search | |
196 (let* ((this-window (next-window)) | |
197 (next-bottom-edge (car (cdr (cdr (cdr | |
198 (window-edges this-window))))))) | |
199 (if (< bottom-edge next-bottom-edge) | |
200 (progn | |
201 (setq bottom-edge next-bottom-edge) | |
202 (setq lowest-window this-window))) | |
203 | |
204 (select-window this-window) | |
205 (if (eq last-window this-window) | |
206 (progn | |
207 (select-window lowest-window) | |
208 (setq window-search nil))))))) | |
209 | |
210 | |
211 | |
212 ;;; Common window setup routines | |
213 | |
214 ;; Set up the window configuration. If POS is given, set the points to | |
215 ;; the beginnings of the buffers. | |
216 ;; When 3way comparison is added, this will have to choose the appropriate | |
217 ;; setup function based on ediff-job-name | |
218 (defun ediff-setup-windows (buffer-A buffer-B buffer-C control-buffer) | |
219 ;; Make sure we are not in the minibuffer window when we try to delete | |
220 ;; all other windows. | |
221 (run-hooks 'ediff-before-setup-windows-hooks) | |
222 (if (eq (selected-window) (minibuffer-window)) | |
223 (other-window 1)) | |
224 | |
225 ;; when support for buf C is added, the actual window setup function will | |
226 ;; depend on ediff-job-name | |
227 (or (ediff-keep-window-config control-buffer) | |
228 (funcall | |
229 (ediff-eval-in-buffer control-buffer ediff-window-setup-function) | |
230 buffer-A buffer-B buffer-C control-buffer)) | |
231 (run-hooks 'ediff-after-setup-windows-hooks)) | |
232 | |
233 ;; Just set up 3 windows. | |
234 ;; Usually used without windowing systems | |
235 ;; With windowing, we want to use dedicated frames. | |
236 (defun ediff-setup-windows-plain (buffer-A buffer-B buffer-C control-buffer) | |
237 (ediff-eval-in-buffer control-buffer | |
238 (setq ediff-multiframe nil)) | |
239 (if ediff-merge-job | |
240 (ediff-setup-windows-plain-merge | |
241 buffer-A buffer-B buffer-C control-buffer) | |
242 (ediff-setup-windows-plain-compare | |
243 buffer-A buffer-B buffer-C control-buffer))) | |
244 | |
245 (defun ediff-setup-windows-plain-merge (buf-A buf-B buf-C control-buffer) | |
246 ;; skip dedicated and unsplittable frames | |
247 (ediff-eval-in-buffer control-buffer | |
248 (if (and window-system (ediff-frame-live-p ediff-control-frame)) | |
249 (progn | |
250 (redraw-display) | |
251 (ediff-delete-frame ediff-control-frame) | |
252 (setq ediff-control-frame nil)))) | |
253 (ediff-skip-unsuitable-frames) | |
254 (let ((window-min-height 1) | |
255 split-window-function | |
256 merge-window-share merge-window-lines | |
257 wind-A wind-B wind-C) | |
258 (ediff-eval-in-buffer control-buffer | |
259 (setq merge-window-share ediff-merge-window-share | |
260 ;; this lets us have local versions of ediff-split-window-function | |
261 split-window-function ediff-split-window-function)) | |
262 (delete-other-windows) | |
263 (split-window-vertically) | |
264 (ediff-select-lowest-window) | |
265 (ediff-setup-control-buffer control-buffer) | |
266 | |
267 ;; go to the upper window and split it betw A, B, and possibly C | |
268 (other-window 1) | |
269 (setq merge-window-lines | |
270 (max 2 (round (* (window-height) merge-window-share)))) | |
271 (switch-to-buffer buf-A) | |
272 (setq wind-A (selected-window)) | |
273 | |
274 ;; XEmacs seems to have a lot of trouble with display | |
275 ;; It won't set things right unless we tell it to sit still | |
276 (if ediff-xemacs-p (sit-for 0)) | |
277 | |
278 (split-window-vertically (max 2 (- (window-height) merge-window-lines))) | |
279 (if (eq (selected-window) wind-A) | |
280 (other-window 1)) | |
281 (setq wind-C (selected-window)) | |
282 (switch-to-buffer buf-C) | |
283 | |
284 (select-window wind-A) | |
285 (funcall split-window-function) | |
286 | |
287 (if (eq (selected-window) wind-A) | |
288 (other-window 1)) | |
289 (switch-to-buffer buf-B) | |
290 (setq wind-B (selected-window)) | |
291 | |
292 (ediff-eval-in-buffer control-buffer | |
293 (setq ediff-window-A wind-A | |
294 ediff-window-B wind-B | |
295 ediff-window-C wind-C)) | |
296 | |
297 (ediff-select-lowest-window) | |
298 (ediff-setup-control-buffer control-buffer) | |
299 )) | |
300 | |
301 | |
302 ;; This function handles all comparison jobs, including 3way jobs | |
303 (defun ediff-setup-windows-plain-compare (buf-A buf-B buf-C control-buffer) | |
304 ;; skip dedicated and unsplittable frames | |
305 (ediff-eval-in-buffer control-buffer | |
306 (if (and window-system (ediff-frame-live-p ediff-control-frame)) | |
307 (progn | |
308 (redraw-display) | |
309 (ediff-delete-frame ediff-control-frame) | |
310 (setq ediff-control-frame nil)))) | |
311 (ediff-skip-unsuitable-frames) | |
312 (let ((window-min-height 1) | |
313 split-window-function wind-width-or-height | |
314 three-way-comparison | |
315 job wind-A-start wind-B-start wind-A wind-B wind-C) | |
316 (ediff-eval-in-buffer control-buffer | |
317 (setq wind-A-start (ediff-overlay-start | |
318 (ediff-get-value-according-to-buffer-type | |
319 'A ediff-narrow-bounds)) | |
320 wind-B-start (ediff-overlay-start | |
321 (ediff-get-value-according-to-buffer-type | |
322 'B ediff-narrow-bounds)) | |
323 job ediff-job-name | |
324 ;; this lets us have local versions of ediff-split-window-function | |
325 split-window-function ediff-split-window-function | |
326 three-way-comparison ediff-3way-comparison-job)) | |
327 (delete-other-windows) | |
328 (split-window-vertically) | |
329 (ediff-select-lowest-window) | |
330 (ediff-setup-control-buffer control-buffer) | |
331 | |
332 ;; go to the upper window and split it betw A, B, and possibly C | |
333 (other-window 1) | |
334 (switch-to-buffer buf-A) | |
335 (setq wind-A (selected-window)) | |
336 (if three-way-comparison | |
337 (setq wind-width-or-height | |
338 (/ (if (eq split-window-function 'split-window-vertically) | |
339 (window-height wind-A) | |
340 (window-width wind-A)) | |
341 3))) | |
342 | |
343 ;; XEmacs seems to have a lot of trouble with display | |
344 ;; It won't set things right unless we tell it to sit still | |
345 (if ediff-xemacs-p (sit-for 0)) | |
346 | |
347 (funcall split-window-function wind-width-or-height) | |
348 | |
349 (if (eq (selected-window) wind-A) | |
350 (other-window 1)) | |
351 (switch-to-buffer buf-B) | |
352 (setq wind-B (selected-window)) | |
353 | |
354 (if three-way-comparison | |
355 (progn | |
356 (funcall split-window-function) ; equally | |
357 (if (eq (selected-window) wind-B) | |
358 (other-window 1)) | |
359 (switch-to-buffer buf-C) | |
360 (setq wind-C (selected-window)))) | |
361 | |
362 (ediff-eval-in-buffer control-buffer | |
363 (setq ediff-window-A wind-A | |
364 ediff-window-B wind-B | |
365 ediff-window-C wind-C)) | |
366 | |
367 ;; It is unlikely that we will want to implement 3way window comparison. | |
368 ;; So, only buffers A and B are used here. | |
369 (if (eq job 'ediff-windows) | |
370 (progn | |
371 (set-window-start wind-A wind-A-start) | |
372 (set-window-start wind-B wind-B-start))) | |
373 | |
374 (ediff-select-lowest-window) | |
375 (ediff-setup-control-buffer control-buffer) | |
376 )) | |
377 | |
378 | |
379 ;; dispatch the appropriate window setup function | |
380 (defun ediff-setup-windows-multiframe (buf-A buf-B buf-C control-buf) | |
381 (ediff-eval-in-buffer control-buf | |
382 (setq ediff-multiframe t)) | |
383 (if ediff-merge-job | |
384 (ediff-setup-windows-multiframe-merge buf-A buf-B buf-C control-buf) | |
385 (ediff-setup-windows-multiframe-compare buf-A buf-B buf-C control-buf))) | |
386 | |
387 (defun ediff-setup-windows-multiframe-merge (buf-A buf-B buf-C control-buf) | |
388 ;;; Algorithm: | |
389 ;;; If A and B are in the same frame but C's frame is different--- use one | |
390 ;;; frame for A and B and use a separate frame for C. | |
391 ;;; If C's frame is non-existent, then: if the first suitable | |
392 ;;; non-dedicated frame is different from A&B's, then use it for C. | |
393 ;;; Otherwise, put A,B, and C in one frame. | |
394 ;;; If buffers A, B, C are is separate frames, use them to display these | |
395 ;;; buffers. | |
396 | |
397 ;; Skip dedicated or iconified frames. Unsplittable frames are taken | |
398 ;; care of later. | |
399 (ediff-skip-unsuitable-frames 'ok-unsplittable) | |
400 | |
401 (let* ((window-min-height 1) | |
402 (wind-A (ediff-get-visible-buffer-window buf-A)) | |
403 (wind-B (ediff-get-visible-buffer-window buf-B)) | |
404 (wind-C (ediff-get-visible-buffer-window buf-C)) | |
405 (frame-A (if wind-A (ediff-window-frame wind-A))) | |
406 (frame-B (if wind-B (ediff-window-frame wind-B))) | |
407 (frame-C (if wind-C (ediff-window-frame wind-C))) | |
408 ;; on wide display, do things in one frame | |
409 (force-one-frame | |
410 (ediff-eval-in-buffer control-buf ediff-wide-display-p)) | |
411 ;; this lets us have local versions of ediff-split-window-function | |
412 (split-window-function | |
413 (ediff-eval-in-buffer control-buf ediff-split-window-function)) | |
414 (orig-wind (selected-window)) | |
415 (orig-frame (ediff-selected-frame)) | |
416 (use-same-frame (or force-one-frame | |
417 (eq frame-A (or frame-C orig-frame)) | |
418 (eq frame-B (or frame-C orig-frame)) | |
419 (not (ediff-frame-live-p frame-A)) | |
420 (not (ediff-frame-live-p frame-B)) | |
421 )) | |
422 (use-same-frame-for-AB (and (not use-same-frame) | |
423 (eq frame-A frame-B))) | |
424 (merge-window-share (ediff-eval-in-buffer control-buf | |
425 ediff-merge-window-share)) | |
426 merge-window-lines | |
427 designated-minibuffer-frame | |
428 done-A done-B done-C) | |
429 | |
430 ;; buf-A on its own | |
431 (if (and (window-live-p wind-A) | |
432 (null use-same-frame) | |
433 (null use-same-frame-for-AB)) | |
434 (progn | |
435 (select-window wind-A) | |
436 (delete-other-windows) | |
437 (switch-to-buffer buf-A) | |
438 (setq wind-A (selected-window)) | |
439 (setq done-A t))) | |
440 | |
441 ;; buf-B on its own | |
442 (if (and (window-live-p wind-B) (null use-same-frame)) ; buf B on its own | |
443 (progn | |
444 (select-window wind-B) | |
445 (delete-other-windows) | |
446 (switch-to-buffer buf-B) | |
447 (setq wind-B (selected-window)) | |
448 (setq done-B t))) | |
449 | |
450 ;; buf-C on its own | |
451 (if (and (window-live-p wind-C) (null use-same-frame)) ; buf C on its own | |
452 (progn | |
453 (select-window wind-C) | |
454 (delete-other-windows) | |
455 (switch-to-buffer buf-C) | |
456 (setq wind-C (selected-window)) | |
457 (setq done-C t))) | |
458 | |
459 (if use-same-frame-for-AB | |
460 (progn | |
461 (ediff-select-frame frame-A) | |
462 (switch-to-buffer buf-A) | |
463 (delete-other-windows) | |
464 (setq wind-A (selected-window)) | |
465 | |
466 (funcall split-window-function) | |
467 (if (eq (selected-window) wind-A) | |
468 (other-window 1)) | |
469 (switch-to-buffer buf-B) | |
470 (setq wind-B (selected-window)) | |
471 | |
472 (setq done-A t | |
473 done-B t))) | |
474 | |
475 (if use-same-frame | |
476 (let ((curr-frame (ediff-selected-frame)) | |
477 (window-min-height 1)) | |
478 ;; avoid dedicated and non-splittable windows | |
479 (ediff-skip-unsuitable-frames) | |
480 (or (eq curr-frame (ediff-selected-frame)) | |
481 (setq wind-A nil | |
482 wind-B nil | |
483 wind-C nil | |
484 orig-wind (selected-window))) | |
485 | |
486 ;; set the right frame | |
487 (cond (wind-A (select-window wind-A)) | |
488 (wind-B (select-window wind-B)) | |
489 (wind-C (select-window wind-C)) | |
490 (t (select-window orig-wind))) | |
491 (delete-other-windows) | |
492 (setq merge-window-lines | |
493 (max 2 (round (* (window-height) merge-window-share)))) | |
494 (switch-to-buffer buf-A) | |
495 (setq wind-A (selected-window)) | |
496 | |
497 ;; XEmacs seems to have a lot of trouble with display | |
498 ;; It won't set things right unless we tell it to catch breath | |
499 (if ediff-xemacs-p (sit-for 0)) | |
500 | |
501 (split-window-vertically | |
502 (max 2 (- (window-height) merge-window-lines))) | |
503 (if (eq (selected-window) wind-A) | |
504 (other-window 1)) | |
505 (setq wind-C (selected-window)) | |
506 (switch-to-buffer buf-C) | |
507 | |
508 (select-window wind-A) | |
509 | |
510 (funcall split-window-function) | |
511 (if (eq (selected-window) wind-A) | |
512 (other-window 1)) | |
513 (switch-to-buffer buf-B) | |
514 (setq wind-B (selected-window)) | |
515 | |
516 (setq done-A t | |
517 done-B t | |
518 done-C t) | |
519 )) | |
520 | |
521 (or done-A ; Buf A to be set in its own frame | |
522 (progn ; It was not set up yet as it wasn't visible | |
523 (select-window orig-wind) | |
524 (delete-other-windows) | |
525 (switch-to-buffer buf-A) | |
526 (setq wind-A (selected-window)) | |
527 )) | |
528 (or done-B ; Buf B to be set in its own frame | |
529 (progn ; It was not set up yet as it wasn't visible | |
530 (select-window orig-wind) | |
531 (delete-other-windows) | |
532 (switch-to-buffer buf-B) | |
533 (setq wind-B (selected-window)) | |
534 )) | |
535 | |
536 (or done-C ; Buf C to be set in its own frame. | |
537 (progn ; It was not set up yet as it wasn't visible | |
538 (select-window orig-wind) | |
539 (delete-other-windows) | |
540 (switch-to-buffer buf-C) | |
541 (setq wind-C (selected-window)) | |
542 )) | |
543 | |
544 (ediff-eval-in-buffer control-buf | |
545 (setq ediff-window-A wind-A | |
546 ediff-window-B wind-B | |
547 ediff-window-C wind-C) | |
548 | |
549 (setq frame-A (ediff-window-frame ediff-window-A) | |
550 designated-minibuffer-frame (ediff-window-frame | |
11978
8b4f8ba23b60
(ediff-setup-control-frame): Use
Karl Heuer <kwzh@gnu.org>
parents:
11234
diff
changeset
|
551 (minibuffer-window frame-A)))) |
8b4f8ba23b60
(ediff-setup-control-frame): Use
Karl Heuer <kwzh@gnu.org>
parents:
11234
diff
changeset
|
552 |
11042 | 553 (ediff-setup-control-frame control-buf) |
554 )) | |
555 | |
556 | |
557 ;; Window setup for all comparison jobs, including 3way comparisons | |
558 (defun ediff-setup-windows-multiframe-compare (buf-A buf-B buf-C control-buf) | |
559 ;;; Algorithm: | |
560 ;;; If a buffer is seen in a frame, use that frame for that buffer. | |
561 ;;; If it is not seen, use the current frame. | |
562 ;;; If both buffers are not seen, they share the current frame. If one | |
563 ;;; of the buffers is not seen, it is placed in the current frame (where | |
564 ;;; ediff started). If that frame is displaying the other buffer, it is | |
565 ;;; shared between the two buffers. | |
566 ;;; However, if we decide to put both buffers in one frame | |
567 ;;; and the selected frame isn't splittable, we create a new frame and | |
568 ;;; put both buffers there, event if one of this buffers is visible in | |
569 ;;; another frame. | |
570 | |
571 ;; Skip dedicated or iconified frames. | |
572 ;; Unsplittable frames are taken care of later. | |
573 (ediff-skip-unsuitable-frames 'ok-unsplittable) | |
574 | |
575 (let* ((window-min-height 1) | |
576 (wind-A (ediff-get-visible-buffer-window buf-A)) | |
577 (wind-B (ediff-get-visible-buffer-window buf-B)) | |
578 (wind-C (ediff-get-visible-buffer-window buf-C)) | |
579 (frame-A (if wind-A (ediff-window-frame wind-A))) | |
580 (frame-B (if wind-B (ediff-window-frame wind-B))) | |
581 (frame-C (if wind-C (ediff-window-frame wind-C))) | |
582 (ctl-frame-exists-p (ediff-eval-in-buffer control-buf | |
583 (ediff-frame-live-p ediff-control-frame))) | |
584 ;; on wide display, do things in one frame | |
585 (force-one-frame | |
586 (ediff-eval-in-buffer control-buf ediff-wide-display-p)) | |
587 ;; this lets us have local versions of ediff-split-window-function | |
588 (split-window-function | |
589 (ediff-eval-in-buffer control-buf ediff-split-window-function)) | |
590 (three-way-comparison | |
591 (ediff-eval-in-buffer control-buf ediff-3way-comparison-job)) | |
592 (orig-wind (selected-window)) | |
593 (use-same-frame (or force-one-frame | |
594 (eq frame-A frame-B) | |
595 (if three-way-comparison | |
596 (or (eq frame-A frame-C) | |
597 (eq frame-B frame-C) | |
598 (not (ediff-frame-live-p frame-A)) | |
599 (not (ediff-frame-live-p frame-B)) | |
600 (not (ediff-frame-live-p frame-C)))) | |
601 (and (not (ediff-frame-live-p frame-B)) | |
602 (or ctl-frame-exists-p | |
603 (eq frame-A (ediff-selected-frame)))) | |
604 (and (not (ediff-frame-live-p frame-A)) | |
605 (or ctl-frame-exists-p | |
606 (eq frame-B (ediff-selected-frame)))))) | |
607 wind-A-start wind-B-start job-name | |
608 designated-minibuffer-frame | |
609 done-A done-B done-C) | |
610 | |
611 (ediff-eval-in-buffer control-buf | |
612 (setq wind-A-start (ediff-overlay-start | |
613 (ediff-get-value-according-to-buffer-type | |
614 'A ediff-narrow-bounds)) | |
615 wind-B-start (ediff-overlay-start | |
616 (ediff-get-value-according-to-buffer-type | |
617 'B ediff-narrow-bounds)) | |
618 job-name ediff-job-name)) | |
619 | |
620 (if (and (window-live-p wind-A) (null use-same-frame)) ; buf-A on its own | |
621 (progn | |
622 (select-window wind-A) | |
623 (delete-other-windows) | |
624 (switch-to-buffer buf-A) | |
625 (setq wind-A (selected-window)) | |
626 (setq done-A t))) | |
627 | |
628 (if (and (window-live-p wind-B) (null use-same-frame)) ; buf B on its own | |
629 (progn | |
630 (select-window wind-B) | |
631 (delete-other-windows) | |
632 (switch-to-buffer buf-B) | |
633 (setq wind-B (selected-window)) | |
634 (setq done-B t))) | |
635 | |
636 (if (and (window-live-p wind-C) (null use-same-frame)) ; buf C on its own | |
637 (progn | |
638 (select-window wind-C) | |
639 (delete-other-windows) | |
640 (switch-to-buffer buf-C) | |
641 (setq wind-C (selected-window)) | |
642 (setq done-C t))) | |
643 | |
644 (if use-same-frame | |
645 (let ((curr-frame (ediff-selected-frame)) | |
646 ;; this affects 3way setups only | |
647 wind-width-or-height) | |
648 ;; avoid dedicated and non-splittable windows | |
649 (ediff-skip-unsuitable-frames) | |
650 (or (eq curr-frame (ediff-selected-frame)) | |
651 (setq wind-A nil | |
652 wind-B nil | |
653 wind-C nil | |
654 orig-wind (selected-window))) | |
655 | |
656 ;; set the right frame | |
657 (cond (wind-A (select-window wind-A)) | |
658 (wind-B (select-window wind-B)) | |
659 (wind-C (select-window wind-C)) | |
660 (t (select-window orig-wind))) | |
661 (delete-other-windows) | |
662 (switch-to-buffer buf-A) | |
663 (setq wind-A (selected-window)) | |
664 | |
665 ;; XEmacs seems to have a lot of trouble with display | |
666 ;; It won't set things right unless we tell it to catch breath | |
667 (if ediff-xemacs-p (sit-for 0)) | |
668 | |
669 (if three-way-comparison | |
670 (setq wind-width-or-height | |
671 (/ | |
672 (if (eq split-window-function 'split-window-vertically) | |
673 (window-height wind-A) | |
674 (window-width wind-A)) | |
675 3))) | |
676 | |
677 (funcall split-window-function wind-width-or-height) | |
678 (if (eq (selected-window) wind-A) | |
679 (other-window 1)) | |
680 (switch-to-buffer buf-B) | |
681 (setq wind-B (selected-window)) | |
682 | |
683 (if three-way-comparison | |
684 (progn | |
685 (funcall split-window-function) ; equally | |
686 (if (memq (selected-window) (list wind-A wind-B)) | |
687 (other-window 1)) | |
688 (switch-to-buffer buf-C) | |
689 (setq wind-C (selected-window)))) | |
690 (setq done-A t | |
691 done-B t | |
692 done-C t) | |
693 )) | |
694 | |
695 (or done-A ; Buf A to be set in its own frame | |
696 (progn ; It was not set up yet as it wasn't visible | |
697 (select-window orig-wind) | |
698 (delete-other-windows) | |
699 (switch-to-buffer buf-A) | |
700 (setq wind-A (selected-window)) | |
701 )) | |
702 (or done-B ; Buf B to be set in its own frame | |
703 (progn ; It was not set up yet as it wasn't visible | |
704 (select-window orig-wind) | |
705 (delete-other-windows) | |
706 (switch-to-buffer buf-B) | |
707 (setq wind-B (selected-window)) | |
708 )) | |
709 | |
710 (if three-way-comparison | |
711 (or done-C ; Buf C to be set in its own frame | |
712 (progn ; It was not set up yet as it wasn't visible | |
713 (select-window orig-wind) | |
714 (delete-other-windows) | |
715 (switch-to-buffer buf-C) | |
716 (setq wind-C (selected-window)) | |
717 ))) | |
718 | |
719 (ediff-eval-in-buffer control-buf | |
720 (setq ediff-window-A wind-A | |
721 ediff-window-B wind-B | |
722 ediff-window-C wind-C) | |
723 | |
724 (setq frame-A (ediff-window-frame ediff-window-A) | |
725 designated-minibuffer-frame (ediff-window-frame | |
11978
8b4f8ba23b60
(ediff-setup-control-frame): Use
Karl Heuer <kwzh@gnu.org>
parents:
11234
diff
changeset
|
726 (minibuffer-window frame-A)))) |
11042 | 727 |
728 ;; It is unlikely that we'll implement ediff-windows that would compare | |
729 ;; 3 windows at once. So, we don't use buffer C here. | |
730 (if (eq job-name 'ediff-windows) | |
731 (progn | |
732 (set-window-start wind-A wind-A-start) | |
733 (set-window-start wind-B wind-B-start))) | |
734 | |
735 (ediff-setup-control-frame control-buf) | |
736 )) | |
737 | |
738 ;; skip unsplittable and dedicated windows | |
739 ;; create a new splittable frame if none is found | |
740 (defun ediff-skip-unsuitable-frames (&optional ok-unsplittable) | |
741 (if window-system | |
742 (let (last-window) | |
743 (while (and (not (eq (selected-window) last-window)) | |
744 (or | |
745 (window-dedicated-p (selected-window)) | |
746 (ediff-frame-iconified-p (ediff-selected-frame)) | |
747 (if ok-unsplittable | |
748 nil | |
749 (ediff-frame-unsplittable-p (ediff-selected-frame))))) | |
750 ;; remember where started | |
751 (or last-window (setq last-window (selected-window))) | |
752 ;; try new window | |
753 (other-window 1 t)) | |
754 (if (eq (selected-window) last-window) | |
755 ;; fed up, no appropriate frame | |
756 (progn | |
757 (redraw-display) | |
758 (ediff-select-frame (ediff-make-frame '((unsplittable))))))))) | |
759 | |
760 ;; Prepare or refresh control frame | |
761 (defun ediff-setup-control-frame (ctl-buffer) | |
762 (let ((window-min-height 1) | |
763 ctl-frame-iconified-p dont-iconify-ctl-frame deiconify-ctl-frame | |
764 ctl-frame old-ctl-frame lines | |
765 fheight fwidth adjusted-parameters) | |
766 | |
767 (ediff-eval-in-buffer ctl-buffer | |
768 (run-hooks 'ediff-before-setup-control-frame-hooks)) | |
769 | |
770 (setq old-ctl-frame (ediff-eval-in-buffer ctl-buffer ediff-control-frame)) | |
12020
6ef622c132df
(ediff-setup-control-frame): Make
Karl Heuer <kwzh@gnu.org>
parents:
11978
diff
changeset
|
771 (if (frame-live-p old-ctl-frame) (delete-frame old-ctl-frame)) |
6ef622c132df
(ediff-setup-control-frame): Make
Karl Heuer <kwzh@gnu.org>
parents:
11978
diff
changeset
|
772 (redraw-display) |
6ef622c132df
(ediff-setup-control-frame): Make
Karl Heuer <kwzh@gnu.org>
parents:
11978
diff
changeset
|
773 ;; Make the frame while ctl-buff is current, so that |
6ef622c132df
(ediff-setup-control-frame): Make
Karl Heuer <kwzh@gnu.org>
parents:
11978
diff
changeset
|
774 ;; ediff-control-frame-parameters will have the right value. |
6ef622c132df
(ediff-setup-control-frame): Make
Karl Heuer <kwzh@gnu.org>
parents:
11978
diff
changeset
|
775 (ediff-eval-in-buffer ctl-buffer |
6ef622c132df
(ediff-setup-control-frame): Make
Karl Heuer <kwzh@gnu.org>
parents:
11978
diff
changeset
|
776 (let ((default-minibuffer-frame designated-minibuffer-frame)) |
6ef622c132df
(ediff-setup-control-frame): Make
Karl Heuer <kwzh@gnu.org>
parents:
11978
diff
changeset
|
777 (setq ctl-frame (ediff-make-frame ediff-control-frame-parameters) |
6ef622c132df
(ediff-setup-control-frame): Make
Karl Heuer <kwzh@gnu.org>
parents:
11978
diff
changeset
|
778 ctl-buffer (setq ediff-control-frame ctl-frame)))) |
11042 | 779 |
780 (setq ctl-frame-iconified-p (ediff-frame-iconified-p ctl-frame)) | |
781 (ediff-select-frame ctl-frame) | |
782 (if (window-dedicated-p (selected-window)) | |
783 () | |
784 (delete-other-windows) | |
785 (switch-to-buffer ctl-buffer)) | |
786 | |
787 ;; must be before ediff-setup-control-buffer | |
788 (if ediff-xemacs-p | |
789 ;; just a precaution--we should be in ctl-buffer already | |
790 (ediff-eval-in-buffer ctl-buffer | |
791 (make-local-variable 'screen-title-format) | |
792 (make-local-variable 'screen-icon-title-format))) | |
793 | |
794 (ediff-setup-control-buffer ctl-buffer) | |
795 (setq dont-iconify-ctl-frame | |
796 (not (string= ediff-help-message ediff-brief-help-message))) | |
797 (setq deiconify-ctl-frame | |
798 (and (eq this-command 'ediff-toggle-help) | |
799 dont-iconify-ctl-frame)) | |
800 | |
801 ;; 1 more line for the modeline | |
802 (setq lines (if ediff-xemacs-p | |
803 (+ 2 (count-lines (point-min) (point-max))) | |
804 (1+ (count-lines (point-min) (point-max)))) | |
805 fheight lines | |
806 fwidth (+ (ediff-help-message-line-length) 2) | |
807 adjusted-parameters (append (list | |
808 (cons 'width fwidth) | |
809 (cons 'height fheight)) | |
810 (funcall | |
811 ediff-control-frame-position-function | |
812 ctl-buffer fwidth fheight))) | |
813 | |
814 ;; In XEmacs, buffer menubar needs to be killed before frame parameters | |
815 ;; are changed XEmacs needs to redisplay, as it has trouble setting | |
816 ;; height correctly otherwise. | |
817 (if (and ediff-xemacs-p (ediff-frame-has-menubar)) | |
818 (progn (set-buffer-menubar nil)(sit-for 0))) | |
819 | |
820 ;; Under OS/2 (emx) we have to call modify frame parameters twice, in | |
821 ;; order to make sure that at least once we do it for non-iconified | |
822 ;; frame. If appears that in the OS/2 port of Emacs, one can't modify | |
823 ;; frame parameters of iconified frames. | |
824 (if (eq system-type 'emx) | |
825 (ediff-modify-frame-parameters ctl-frame adjusted-parameters)) | |
826 | |
827 (goto-char (point-min)) | |
828 | |
829 (cond ((and ediff-prefer-iconified-control-frame | |
830 (not ctl-frame-iconified-p) | |
831 (not dont-iconify-ctl-frame)) | |
832 (ediff-iconify-frame ctl-frame)) | |
833 ((or deiconify-ctl-frame | |
834 (not ctl-frame-iconified-p)) | |
835 (ediff-raise-frame ctl-frame))) | |
836 | |
837 ;; This works around a bug in 19.25 and earlier. There, if frame gets | |
838 ;; iconified, the current buffer changes to that of the frame that | |
839 ;; becomes exposed as a result of this iconification. | |
840 ;; So, we make sure the current buffer doesn't change. | |
841 (ediff-select-frame ctl-frame) | |
842 (ediff-refresh-control-frame) | |
843 | |
844 (ediff-modify-frame-parameters ctl-frame adjusted-parameters) | |
845 | |
846 (if ediff-xemacs-p | |
847 (set-window-buffer-dedicated (selected-window) ctl-buffer) | |
848 (set-window-dedicated-p (selected-window) t)) | |
849 | |
850 (or ediff-xemacs-p (sit-for 0 200)) ; emacs has trouble here, needs time | |
851 (or (ediff-frame-iconified-p ctl-frame) | |
852 (set-mouse-position ctl-frame 1 0)) | |
853 (if (ediff-check-version '< 19 11 'xemacs) (sit-for 0)) | |
854 (or ediff-xemacs-p (unfocus-frame)) | |
855 | |
856 (if ediff-xemacs-p | |
857 (ediff-eval-in-buffer ctl-buffer | |
858 (make-local-variable 'select-screen-hook) | |
859 (add-hook 'select-screen-hook 'ediff-xemacs-select-screen-hook) | |
860 )) | |
861 | |
862 (ediff-eval-in-buffer ctl-buffer | |
863 (run-hooks 'ediff-after-setup-control-frame-hooks)) | |
864 | |
865 )) | |
866 | |
867 | |
868 ;; finds a good place to clip control frame | |
869 (defun ediff-make-frame-position (ctl-buffer ctl-frame-width ctl-frame-height) | |
870 (ediff-eval-in-buffer ctl-buffer | |
871 (let* ((frame-A (ediff-window-frame ediff-window-A)) | |
872 (frame-A-parameters (ediff-frame-parameters frame-A)) | |
873 (frame-A-top (cdr (assoc 'top frame-A-parameters))) | |
874 (frame-A-left (cdr (assoc 'left frame-A-parameters))) | |
875 (frame-A-width (ediff-frame-width frame-A)) | |
876 (ctl-frame ediff-control-frame) | |
877 horizontal-adjustment upward-adjustment | |
878 ctl-frame-top) | |
879 | |
880 ;; Multiple control frames are clipped based on the value of | |
881 ;; ediff-control-buffer-number. This is done in order not to obscure | |
882 ;; other active control panels. | |
883 (setq horizontal-adjustment (* 2 ediff-control-buffer-number) | |
884 upward-adjustment (* -14 ediff-control-buffer-number)) | |
885 | |
886 (setq ctl-frame-top (- frame-A-top | |
887 upward-adjustment | |
888 ediff-control-frame-upward-shift)) | |
889 (list | |
890 (cons 'top (if (> ctl-frame-top 0) ctl-frame-top 1)) | |
891 (cons 'left (+ frame-A-left | |
892 (if ediff-prefer-long-help-message | |
893 (* (ediff-frame-char-width ctl-frame) | |
894 (+ ediff-wide-control-frame-rightward-shift | |
895 horizontal-adjustment)) | |
896 (- (* frame-A-width | |
897 (ediff-frame-char-width frame-A)) | |
898 (* (ediff-frame-char-width ctl-frame) | |
899 (+ ctl-frame-width | |
900 ediff-narrow-control-frame-leftward-shift | |
901 horizontal-adjustment)))))))))) | |
902 | |
903 (defun ediff-xemacs-select-screen-hook () | |
904 (if (equal (ediff-selected-frame) ediff-control-frame) | |
905 (ediff-raise-frame ediff-control-frame))) | |
906 | |
907 (defun ediff-make-wide-display () | |
908 "Construct an alist of parameters for the wide display. | |
909 Saves the old frame parameters in `ediff-wide-display-orig-parameters'. | |
910 The frame to be resized is kept in `ediff-wide-display-frame'. | |
911 This function modifies only the left margin and the width of the display. | |
912 It assumes that it is called from within the control buffer." | |
913 (if (not (fboundp 'x-display-pixel-width)) | |
914 (error | |
915 "Can't determine display width. Please upgrade your version of Emacs")) | |
916 (let* ((frame-A (ediff-window-frame ediff-window-A)) | |
917 (frame-A-params (ediff-frame-parameters frame-A)) | |
918 (cw (ediff-frame-char-width frame-A)) | |
919 (wd (- (/ (x-display-pixel-width) cw) 5))) | |
920 (setq ediff-wide-display-orig-parameters | |
921 (list (cons 'left (max 0 (cdr (assoc 'left frame-A-params)))) | |
922 (cons 'width (cdr (assoc 'width frame-A-params)))) | |
923 ediff-wide-display-frame frame-A) | |
924 (ediff-modify-frame-parameters frame-A (list (cons 'left cw) | |
925 (cons 'width wd))))) | |
926 | |
927 | |
928 | |
929 ;; Revise the mode line to display which difference we have selected | |
930 ;; Also resets modelines of buffers A/B, since they may be clobbered by | |
931 ;; anothe invocations of Ediff. | |
932 (defun ediff-refresh-mode-lines () | |
933 (let (buf-A-state-diff buf-B-state-diff buf-C-state-diff buf-C-state-merge) | |
934 | |
935 (if (ediff-valid-difference-p) | |
936 (setq | |
937 buf-C-state-diff (ediff-get-state-of-diff ediff-current-difference 'C) | |
938 buf-C-state-merge (ediff-get-state-of-merge ediff-current-difference) | |
939 buf-A-state-diff (ediff-get-state-of-diff ediff-current-difference 'A) | |
940 buf-B-state-diff (ediff-get-state-of-diff ediff-current-difference 'B) | |
941 buf-A-state-diff (if buf-A-state-diff | |
942 (format "[%s] " buf-A-state-diff) | |
943 "") | |
944 buf-B-state-diff (if buf-B-state-diff | |
945 (format "[%s] " buf-B-state-diff) | |
946 "") | |
947 buf-C-state-diff (if (and (ediff-buffer-live-p ediff-buffer-C) | |
948 (or buf-C-state-diff buf-C-state-merge)) | |
949 (format "[%s%s] " | |
950 (or buf-C-state-diff "") | |
951 (if buf-C-state-merge | |
952 (concat " " buf-C-state-merge) | |
953 "")) | |
954 "")) | |
955 (setq buf-A-state-diff "" | |
956 buf-B-state-diff "" | |
957 buf-C-state-diff "")) | |
958 | |
959 ;; control buffer format | |
960 (setq mode-line-format | |
961 (list (if (ediff-narrow-control-frame-p) " " "-- ") | |
962 mode-line-buffer-identification | |
963 " Howdy!")) | |
964 ;; control buffer id | |
965 (setq mode-line-buffer-identification | |
966 (if (ediff-narrow-control-frame-p) | |
967 (ediff-make-narrow-control-buffer-id 'skip-name) | |
968 (ediff-make-wide-control-buffer-id))) | |
969 ;; Force mode-line redisplay | |
970 (force-mode-line-update) | |
971 | |
972 (if (and window-system (ediff-frame-live-p ediff-control-frame)) | |
973 (ediff-refresh-control-frame)) | |
974 | |
975 (ediff-eval-in-buffer ediff-buffer-A | |
976 (setq ediff-diff-status buf-A-state-diff) | |
977 (ediff-strip-mode-line-format) | |
978 (setq mode-line-format | |
979 (list " A: " 'ediff-diff-status mode-line-format)) | |
980 (force-mode-line-update)) | |
981 (ediff-eval-in-buffer ediff-buffer-B | |
982 (setq ediff-diff-status buf-B-state-diff) | |
983 (ediff-strip-mode-line-format) | |
984 (setq mode-line-format | |
985 (list " B: " 'ediff-diff-status mode-line-format)) | |
986 (force-mode-line-update)) | |
987 (if ediff-3way-job | |
988 (ediff-eval-in-buffer ediff-buffer-C | |
989 (setq ediff-diff-status buf-C-state-diff) | |
990 (ediff-strip-mode-line-format) | |
991 (setq mode-line-format | |
992 (list " C: " 'ediff-diff-status mode-line-format)) | |
993 (force-mode-line-update))) | |
994 )) | |
995 | |
996 | |
997 (defun ediff-refresh-control-frame () | |
998 (if ediff-xemacs-p | |
999 (progn | |
1000 (setq screen-title-format (ediff-make-narrow-control-buffer-id) | |
1001 screen-icon-title-format (ediff-make-narrow-control-buffer-id)) | |
1002 ;; this forces update of the screen title | |
1003 (ediff-modify-frame-parameters ediff-control-frame '(()))) | |
1004 (ediff-modify-frame-parameters | |
1005 ediff-control-frame | |
1006 (list (cons 'name (ediff-make-narrow-control-buffer-id)))) | |
1007 )) | |
1008 | |
1009 | |
1010 (defun ediff-make-narrow-control-buffer-id (&optional skip-name) | |
1011 (concat | |
1012 (if skip-name | |
1013 " " | |
1014 (concat | |
1015 (cdr (assoc 'name ediff-control-frame-parameters)) | |
1016 ediff-control-buffer-suffix)) | |
1017 (cond ((< ediff-current-difference 0) | |
1018 (format " _/%d" ediff-number-of-differences)) | |
1019 ((>= ediff-current-difference ediff-number-of-differences) | |
1020 (format " $/%d" ediff-number-of-differences)) | |
1021 (t | |
1022 (format " %d/%d" | |
1023 (1+ ediff-current-difference) | |
1024 ediff-number-of-differences))))) | |
1025 | |
1026 (defun ediff-make-wide-control-buffer-id () | |
1027 (cond ((< ediff-current-difference 0) | |
1028 (list (format "%%b At start of %d diffs" | |
1029 ediff-number-of-differences))) | |
1030 ((>= ediff-current-difference ediff-number-of-differences) | |
1031 (list (format "%%b At end of %d diffs" | |
1032 ediff-number-of-differences))) | |
1033 (t | |
1034 (list (format "%%b diff %d of %d" | |
1035 (1+ ediff-current-difference) | |
1036 ediff-number-of-differences))))) | |
1037 | |
1038 | |
1039 | |
1040 ;; If buff is not live, return nil | |
1041 (defun ediff-get-visible-buffer-window (buff) | |
1042 (if (ediff-buffer-live-p buff) | |
1043 (if ediff-xemacs-p | |
1044 (get-buffer-window buff t) | |
1045 (get-buffer-window buff 'visible)))) | |
1046 | |
1047 ;;; Functions to decide when to redraw windows | |
1048 | |
1049 | |
1050 (defun ediff-keep-window-config (control-buf) | |
1051 (and (eq control-buf (current-buffer)) | |
1052 (/= (buffer-size) 0) | |
1053 (ediff-eval-in-buffer control-buf | |
1054 (let ((ctl-wind ediff-control-window) | |
1055 (A-wind ediff-window-A) | |
1056 (B-wind ediff-window-B) | |
1057 (C-wind ediff-window-C)) | |
1058 | |
1059 (and | |
1060 (ediff-window-visible-p A-wind) | |
1061 (ediff-window-visible-p B-wind) | |
1062 ;; if buffer C is defined then take it into account | |
1063 (or (not ediff-3way-job) | |
1064 (ediff-window-visible-p C-wind)) | |
1065 (eq (window-buffer A-wind) ediff-buffer-A) | |
1066 (eq (window-buffer B-wind) ediff-buffer-B) | |
1067 (or (not ediff-3way-job) | |
1068 (eq (window-buffer C-wind) ediff-buffer-C)) | |
1069 (string= ediff-window-config-saved | |
1070 (format "%S%S%S%S%S" | |
1071 ctl-wind A-wind B-wind C-wind | |
1072 ediff-split-window-function))))))) | |
1073 | |
1074 | |
1075 (provide 'ediff-wind) | |
1076 | |
1077 | |
1078 ;;; ediff-wind.el ends here |