Update for rename islamic-diary-entry-symbol to diary-islamic-entry-symbol.
[emacs.git] / lisp / ediff-wind.el
blobe094c15bdfe327e448b8b5e18facb88c518cabb2
1 ;;; ediff-wind.el --- window manipulation utilities
3 ;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003,
4 ;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
8 ;; This file is part of GNU Emacs.
10 ;; GNU Emacs is free software; you can redistribute it and/or modify
11 ;; it under the terms of the GNU General Public License as published by
12 ;; the Free Software Foundation; either version 3, or (at your option)
13 ;; any later version.
15 ;; GNU Emacs is distributed in the hope that it will be useful,
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18 ;; GNU General Public License for more details.
20 ;; You should have received a copy of the GNU General Public License
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the
22 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
23 ;; Boston, MA 02110-1301, USA.
25 ;;; Commentary:
27 ;;; Code:
30 ;; Compiler pacifier
31 (defvar icon-title-format)
32 (defvar top-toolbar-height)
33 (defvar bottom-toolbar-height)
34 (defvar left-toolbar-height)
35 (defvar right-toolbar-height)
36 (defvar left-toolbar-width)
37 (defvar right-toolbar-width)
38 (defvar default-menubar)
39 (defvar top-gutter)
40 (defvar frame-icon-title-format)
41 (defvar ediff-diff-status)
43 ;; declare-function does not exist in XEmacs
44 (eval-and-compile
45 (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
48 (eval-when-compile
49 (require 'ediff-init)
50 (require 'ediff-util)
51 (require 'ediff-help)
52 (require 'ediff-tbar nil 'noerror)
54 ;; end pacifier
56 (require 'ediff-init)
58 ;; be careful with ediff-tbar
59 (if (featurep 'xemacs)
60 (condition-case nil
61 (require 'ediff-tbar)
62 (error
63 (defun ediff-compute-toolbar-width () 0)))
64 (defun ediff-compute-toolbar-width () 0))
66 (defgroup ediff-window nil
67 "Ediff window manipulation."
68 :prefix "ediff-"
69 :group 'ediff
70 :group 'frames)
73 ;; Determine which window setup function to use based on current window system.
74 (defun ediff-choose-window-setup-function-automatically ()
75 (if (ediff-window-display-p)
76 'ediff-setup-windows-multiframe
77 'ediff-setup-windows-plain))
79 (defcustom ediff-window-setup-function (ediff-choose-window-setup-function-automatically)
80 "*Function called to set up windows.
81 Ediff provides a choice of two functions: `ediff-setup-windows-plain', for
82 doing everything in one frame and `ediff-setup-windows-multiframe', which sets
83 the control panel in a separate frame. By default, the appropriate function is
84 chosen automatically depending on the current window system.
85 However, `ediff-toggle-multiframe' can be used to toggle between the multiframe
86 display and the single frame display.
87 If the multiframe function detects that one of the buffers A/B is seen in some
88 other frame, it will try to keep that buffer in that frame.
90 If you don't like any of the two provided functions, write your own one.
91 The basic guidelines:
92 1. It should leave the control buffer current and the control window
93 selected.
94 2. It should set `ediff-window-A', `ediff-window-B', `ediff-window-C',
95 and `ediff-control-window' to contain window objects that display
96 the corresponding buffers.
97 3. It should accept the following arguments:
98 buffer-A, buffer-B, buffer-C, control-buffer
99 Buffer C may not be used in jobs that compare only two buffers.
100 If you plan to do something fancy, take a close look at how the two
101 provided functions are written."
102 :type '(choice (const :tag "Multi Frame" ediff-setup-windows-multiframe)
103 (const :tag "Single Frame" ediff-setup-windows-plain)
104 (function :tag "Other function"))
105 :group 'ediff-window)
107 ;; indicates if we are in a multiframe setup
108 (ediff-defvar-local ediff-multiframe nil "")
110 ;; Share of the frame occupied by the merge window (buffer C)
111 (ediff-defvar-local ediff-merge-window-share 0.45 "")
113 ;; The control window.
114 (ediff-defvar-local ediff-control-window nil "")
115 ;; Official window for buffer A
116 (ediff-defvar-local ediff-window-A nil "")
117 ;; Official window for buffer B
118 (ediff-defvar-local ediff-window-B nil "")
119 ;; Official window for buffer C
120 (ediff-defvar-local ediff-window-C nil "")
121 ;; Ediff's window configuration.
122 ;; Used to minimize the need to rearrange windows.
123 (ediff-defvar-local ediff-window-config-saved "" "")
125 ;; Association between buff-type and ediff-window-*
126 (defconst ediff-window-alist
127 '((A . ediff-window-A)
128 (?A . ediff-window-A)
129 (B . ediff-window-B)
130 (?B . ediff-window-B)
131 (C . ediff-window-C)
132 (?C . ediff-window-C)))
135 (defcustom ediff-split-window-function 'split-window-vertically
136 "*The function used to split the main window between buffer-A and buffer-B.
137 You can set it to a horizontal split instead of the default vertical split
138 by setting this variable to `split-window-horizontally'.
139 You can also have your own function to do fancy splits.
140 This variable has no effect when buffer-A/B are shown in different frames.
141 In this case, Ediff will use those frames to display these buffers."
142 :type 'function
143 :group 'ediff-window)
145 (defcustom ediff-merge-split-window-function 'split-window-horizontally
146 "*The function used to split the main window between buffer-A and buffer-B.
147 You can set it to a vertical split instead of the default horizontal split
148 by setting this variable to `split-window-vertically'.
149 You can also have your own function to do fancy splits.
150 This variable has no effect when buffer-A/B/C are shown in different frames.
151 In this case, Ediff will use those frames to display these buffers."
152 :type 'function
153 :group 'ediff-window)
155 ;; Definitions hidden from the compiler by compat wrappers.
156 (declare-function ediff-display-pixel-width "ediff-init")
157 (declare-function ediff-display-pixel-height "ediff-init")
159 (defconst ediff-control-frame-parameters
160 (list
161 '(name . "Ediff")
162 ;;'(unsplittable . t)
163 '(minibuffer . nil)
164 '(user-position . t) ; Emacs only
165 '(vertical-scroll-bars . nil) ; Emacs only
166 '(scrollbar-width . 0) ; XEmacs only
167 '(scrollbar-height . 0) ; XEmacs only
168 '(menu-bar-lines . 0) ; Emacs only
169 '(tool-bar-lines . 0) ; Emacs 21+ only
170 '(left-fringe . 0)
171 '(right-fringe . 0)
172 ;; don't lower but auto-raise
173 '(auto-lower . nil)
174 '(auto-raise . t)
175 '(visibility . nil)
176 ;; make initial frame small to avoid distraction
177 '(width . 1) '(height . 1)
178 ;; this blocks queries from window manager as to where to put
179 ;; ediff's control frame. we put the frame outside the display,
180 ;; so the initial frame won't jump all over the screen
181 (cons 'top (if (fboundp 'ediff-display-pixel-height)
182 (1+ (ediff-display-pixel-height))
183 3000))
184 (cons 'left (if (fboundp 'ediff-display-pixel-width)
185 (1+ (ediff-display-pixel-width))
186 3000))
188 "Frame parameters for displaying Ediff Control Panel.
189 Used internally---not a user option.")
191 ;; position of the mouse; used to decide whether to warp the mouse into ctl
192 ;; frame
193 (ediff-defvar-local ediff-mouse-pixel-position nil "")
195 ;; not used for now
196 (defvar ediff-mouse-pixel-threshold 30
197 "If the user moves mouse more than this many pixels, Ediff won't warp mouse into control window.")
199 (defcustom ediff-grab-mouse t
200 "*If t, Ediff will always grab the mouse and put it in the control frame.
201 If 'maybe, Ediff will do it sometimes, but not after operations that require
202 relatively long time. If nil, the mouse will be entirely user's
203 responsibility."
204 :type 'boolean
205 :group 'ediff-window)
207 (defcustom ediff-control-frame-position-function 'ediff-make-frame-position
208 "Function to call to determine the desired location for the control panel.
209 Expects three parameters: the control buffer, the desired width and height
210 of the control frame. It returns an association list
211 of the form \(\(top . <position>\) \(left . <position>\)\)"
212 :type 'function
213 :group 'ediff-window)
215 (defcustom ediff-control-frame-upward-shift 42
216 "*The upward shift of control frame from the top of buffer A's frame.
217 Measured in pixels.
218 This is used by the default control frame positioning function,
219 `ediff-make-frame-position'. This variable is provided for easy
220 customization of the default control frame positioning."
221 :type 'integer
222 :group 'ediff-window)
224 (defcustom ediff-narrow-control-frame-leftward-shift (if (featurep 'xemacs) 7 3)
225 "*The leftward shift of control frame from the right edge of buf A's frame.
226 Measured in characters.
227 This is used by the default control frame positioning function,
228 `ediff-make-frame-position' to adjust the position of the control frame
229 when it shows the short menu. This variable is provided for easy
230 customization of the default."
231 :type 'integer
232 :group 'ediff-window)
234 (defcustom ediff-wide-control-frame-rightward-shift 7
235 "*The rightward shift of control frame from the left edge of buf A's frame.
236 Measured in characters.
237 This is used by the default control frame positioning function,
238 `ediff-make-frame-position' to adjust the position of the control frame
239 when it shows the full menu. This variable is provided for easy
240 customization of the default."
241 :type 'integer
242 :group 'ediff-window)
245 ;; Wide frame display
247 ;; t means Ediff is using wide display
248 (ediff-defvar-local ediff-wide-display-p nil "")
249 ;; keeps frame config for toggling wide display
250 (ediff-defvar-local ediff-wide-display-orig-parameters nil
251 "Frame parameters to be restored when the user wants to toggle the wide
252 display off.")
253 (ediff-defvar-local ediff-wide-display-frame nil
254 "Frame to be used for wide display.")
255 (ediff-defvar-local ediff-make-wide-display-function 'ediff-make-wide-display
256 "The value is a function that is called to create a wide display.
257 The function is called without arguments. It should resize the frame in
258 which buffers A, B, and C are to be displayed, and it should save the old
259 frame parameters in `ediff-wide-display-orig-parameters'.
260 The variable `ediff-wide-display-frame' should be set to contain
261 the frame used for the wide display.")
263 ;; Frame used for the control panel in a windowing system.
264 (ediff-defvar-local ediff-control-frame nil "")
266 (defcustom ediff-prefer-iconified-control-frame nil
267 "*If t, keep control panel iconified when help message is off.
268 This has effect only on a windowing system.
269 If t, hitting `?' to toggle control panel off iconifies it.
271 This is only useful in Emacs and only for certain kinds of window managers,
272 such as TWM and its derivatives, since the window manager must permit
273 keyboard input to go into icons. XEmacs completely ignores keyboard input
274 into icons, regardless of the window manager."
275 :type 'boolean
276 :group 'ediff-window)
278 ;;; Functions
280 (defun ediff-get-window-by-clicking (wind prev-wind wind-number)
281 (let (event)
282 (message
283 "Select windows by clicking. Please click on Window %d " wind-number)
284 (while (not (ediff-mouse-event-p (setq event (ediff-read-event))))
285 (if (sit-for 1) ; if sequence of events, wait till the final word
286 (beep 1))
287 (message "Please click on Window %d " wind-number))
288 (ediff-read-event) ; discard event
289 (setq wind (if (featurep 'xemacs)
290 (event-window event)
291 (posn-window (event-start event))))))
294 ;; Select the lowest window on the frame.
295 (defun ediff-select-lowest-window ()
296 (if (featurep 'xemacs)
297 (select-window (frame-lowest-window))
298 (let* ((lowest-window (selected-window))
299 (bottom-edge (car (cdr (cdr (cdr (window-edges))))))
300 (last-window (save-excursion
301 (other-window -1) (selected-window)))
302 (window-search t))
303 (while window-search
304 (let* ((this-window (next-window))
305 (next-bottom-edge
306 (car (cdr (cdr (cdr (window-edges this-window)))))))
307 (if (< bottom-edge next-bottom-edge)
308 (setq bottom-edge next-bottom-edge
309 lowest-window this-window))
310 (select-window this-window)
311 (when (eq last-window this-window)
312 (select-window lowest-window)
313 (setq window-search nil)))))))
316 ;;; Common window setup routines
318 ;; Set up the window configuration. If POS is given, set the points to
319 ;; the beginnings of the buffers.
320 ;; When 3way comparison is added, this will have to choose the appropriate
321 ;; setup function based on ediff-job-name
322 (defun ediff-setup-windows (buffer-A buffer-B buffer-C control-buffer)
323 ;; Make sure we are not in the minibuffer window when we try to delete
324 ;; all other windows.
325 (run-hooks 'ediff-before-setup-windows-hook)
326 (if (eq (selected-window) (minibuffer-window))
327 (other-window 1))
329 ;; in case user did a no-no on a tty
330 (or (ediff-window-display-p)
331 (setq ediff-window-setup-function 'ediff-setup-windows-plain))
333 (or (ediff-keep-window-config control-buffer)
334 (funcall
335 (ediff-with-current-buffer control-buffer ediff-window-setup-function)
336 buffer-A buffer-B buffer-C control-buffer))
337 (run-hooks 'ediff-after-setup-windows-hook))
339 ;; Just set up 3 windows.
340 ;; Usually used without windowing systems
341 ;; With windowing, we want to use dedicated frames.
342 (defun ediff-setup-windows-plain (buffer-A buffer-B buffer-C control-buffer)
343 (ediff-with-current-buffer control-buffer
344 (setq ediff-multiframe nil))
345 (if ediff-merge-job
346 (ediff-setup-windows-plain-merge
347 buffer-A buffer-B buffer-C control-buffer)
348 (ediff-setup-windows-plain-compare
349 buffer-A buffer-B buffer-C control-buffer)))
351 (defun ediff-setup-windows-plain-merge (buf-A buf-B buf-C control-buffer)
352 ;; skip dedicated and unsplittable frames
353 (ediff-destroy-control-frame control-buffer)
354 (let ((window-min-height 1)
355 split-window-function
356 merge-window-share merge-window-lines
357 wind-A wind-B wind-C)
358 (ediff-with-current-buffer control-buffer
359 (setq merge-window-share ediff-merge-window-share
360 ;; this lets us have local versions of ediff-split-window-function
361 split-window-function ediff-split-window-function))
362 (delete-other-windows)
363 (set-window-dedicated-p (selected-window) nil)
364 (split-window-vertically)
365 (ediff-select-lowest-window)
366 (ediff-setup-control-buffer control-buffer)
368 ;; go to the upper window and split it betw A, B, and possibly C
369 (other-window 1)
370 (setq merge-window-lines
371 (max 2 (round (* (window-height) merge-window-share))))
372 (switch-to-buffer buf-A)
373 (setq wind-A (selected-window))
375 ;; XEmacs used to have a lot of trouble with display
376 ;; It did't set things right unless we tell it to sit still
377 ;; 19.12 seems ok.
378 ;;(if (featurep 'xemacs) (sit-for 0))
380 (split-window-vertically (max 2 (- (window-height) merge-window-lines)))
381 (if (eq (selected-window) wind-A)
382 (other-window 1))
383 (setq wind-C (selected-window))
384 (switch-to-buffer buf-C)
386 (select-window wind-A)
387 (funcall split-window-function)
389 (if (eq (selected-window) wind-A)
390 (other-window 1))
391 (switch-to-buffer buf-B)
392 (setq wind-B (selected-window))
394 (ediff-with-current-buffer control-buffer
395 (setq ediff-window-A wind-A
396 ediff-window-B wind-B
397 ediff-window-C wind-C))
399 (ediff-select-lowest-window)
400 (ediff-setup-control-buffer control-buffer)
404 ;; This function handles all comparison jobs, including 3way jobs
405 (defun ediff-setup-windows-plain-compare (buf-A buf-B buf-C control-buffer)
406 ;; skip dedicated and unsplittable frames
407 (ediff-destroy-control-frame control-buffer)
408 (let ((window-min-height 1)
409 split-window-function wind-width-or-height
410 three-way-comparison
411 wind-A-start wind-B-start wind-A wind-B wind-C)
412 (ediff-with-current-buffer control-buffer
413 (setq wind-A-start (ediff-overlay-start
414 (ediff-get-value-according-to-buffer-type
415 'A ediff-narrow-bounds))
416 wind-B-start (ediff-overlay-start
417 (ediff-get-value-according-to-buffer-type
418 'B ediff-narrow-bounds))
419 ;; this lets us have local versions of ediff-split-window-function
420 split-window-function ediff-split-window-function
421 three-way-comparison ediff-3way-comparison-job))
422 (delete-other-windows)
423 (set-window-dedicated-p (selected-window) nil)
424 (split-window-vertically)
425 (ediff-select-lowest-window)
426 (ediff-setup-control-buffer control-buffer)
428 ;; go to the upper window and split it betw A, B, and possibly C
429 (other-window 1)
430 (switch-to-buffer buf-A)
431 (setq wind-A (selected-window))
432 (if three-way-comparison
433 (setq wind-width-or-height
434 (/ (if (eq split-window-function 'split-window-vertically)
435 (window-height wind-A)
436 (window-width wind-A))
437 3)))
439 ;; XEmacs used to have a lot of trouble with display
440 ;; It did't set things right unless we told it to sit still
441 ;; 19.12 seems ok.
442 ;;(if (featurep 'xemacs) (sit-for 0))
444 (funcall split-window-function wind-width-or-height)
446 (if (eq (selected-window) wind-A)
447 (other-window 1))
448 (switch-to-buffer buf-B)
449 (setq wind-B (selected-window))
451 (if three-way-comparison
452 (progn
453 (funcall split-window-function) ; equally
454 (if (eq (selected-window) wind-B)
455 (other-window 1))
456 (switch-to-buffer buf-C)
457 (setq wind-C (selected-window))))
459 (ediff-with-current-buffer control-buffer
460 (setq ediff-window-A wind-A
461 ediff-window-B wind-B
462 ediff-window-C wind-C))
464 ;; It is unlikely that we will want to implement 3way window comparison.
465 ;; So, only buffers A and B are used here.
466 (if ediff-windows-job
467 (progn
468 (set-window-start wind-A wind-A-start)
469 (set-window-start wind-B wind-B-start)))
471 (ediff-select-lowest-window)
472 (ediff-setup-control-buffer control-buffer)
476 ;; dispatch an appropriate window setup function
477 (defun ediff-setup-windows-multiframe (buf-A buf-B buf-C control-buf)
478 (ediff-with-current-buffer control-buf
479 (setq ediff-multiframe t))
480 (if ediff-merge-job
481 (ediff-setup-windows-multiframe-merge buf-A buf-B buf-C control-buf)
482 (ediff-setup-windows-multiframe-compare buf-A buf-B buf-C control-buf)))
484 (defun ediff-setup-windows-multiframe-merge (buf-A buf-B buf-C control-buf)
485 ;;; Algorithm:
486 ;;; 1. Never use frames that have dedicated windows in them---it is bad to
487 ;;; destroy dedicated windows.
488 ;;; 2. If A and B are in the same frame but C's frame is different--- use one
489 ;;; frame for A and B and use a separate frame for C.
490 ;;; 3. If C's frame is non-existent, then: if the first suitable
491 ;;; non-dedicated frame is different from A&B's, then use it for C.
492 ;;; Otherwise, put A,B, and C in one frame.
493 ;;; 4. If buffers A, B, C are is separate frames, use them to display these
494 ;;; buffers.
496 ;; Skip dedicated or iconified frames.
497 ;; Unsplittable frames are taken care of later.
498 (ediff-skip-unsuitable-frames 'ok-unsplittable)
500 (let* ((window-min-height 1)
501 (wind-A (ediff-get-visible-buffer-window buf-A))
502 (wind-B (ediff-get-visible-buffer-window buf-B))
503 (wind-C (ediff-get-visible-buffer-window buf-C))
504 (frame-A (if wind-A (window-frame wind-A)))
505 (frame-B (if wind-B (window-frame wind-B)))
506 (frame-C (if wind-C (window-frame wind-C)))
507 ;; on wide display, do things in one frame
508 (force-one-frame
509 (ediff-with-current-buffer control-buf ediff-wide-display-p))
510 ;; this lets us have local versions of ediff-split-window-function
511 (split-window-function
512 (ediff-with-current-buffer control-buf ediff-split-window-function))
513 (orig-wind (selected-window))
514 (orig-frame (selected-frame))
515 (use-same-frame (or force-one-frame
516 ;; A and C must be in one frame
517 (eq frame-A (or frame-C orig-frame))
518 ;; B and C must be in one frame
519 (eq frame-B (or frame-C orig-frame))
520 ;; A or B is not visible
521 (not (frame-live-p frame-A))
522 (not (frame-live-p frame-B))
523 ;; A or B is not suitable for display
524 (not (ediff-window-ok-for-display wind-A))
525 (not (ediff-window-ok-for-display wind-B))
526 ;; A and B in the same frame, and no good frame
527 ;; for C
528 (and (eq frame-A frame-B)
529 (not (frame-live-p frame-C)))
531 ;; use-same-frame-for-AB implies wind A and B are ok for display
532 (use-same-frame-for-AB (and (not use-same-frame)
533 (eq frame-A frame-B)))
534 (merge-window-share (ediff-with-current-buffer control-buf
535 ediff-merge-window-share))
536 merge-window-lines
537 designated-minibuffer-frame
538 done-A done-B done-C)
540 ;; buf-A on its own
541 (if (and (window-live-p wind-A)
542 (null use-same-frame) ; implies wind-A is suitable
543 (null use-same-frame-for-AB))
544 (progn ; bug A on its own
545 ;; buffer buf-A is seen in live wind-A
546 (select-window wind-A)
547 (delete-other-windows)
548 (setq wind-A (selected-window))
549 (setq done-A t)))
551 ;; buf-B on its own
552 (if (and (window-live-p wind-B)
553 (null use-same-frame) ; implies wind-B is suitable
554 (null use-same-frame-for-AB))
555 (progn ; buf B on its own
556 ;; buffer buf-B is seen in live wind-B
557 (select-window wind-B)
558 (delete-other-windows)
559 (setq wind-B (selected-window))
560 (setq done-B t)))
562 ;; buf-C on its own
563 (if (and (window-live-p wind-C)
564 (ediff-window-ok-for-display wind-C)
565 (null use-same-frame)) ; buf C on its own
566 (progn
567 ;; buffer buf-C is seen in live wind-C
568 (select-window wind-C)
569 (delete-other-windows)
570 (setq wind-C (selected-window))
571 (setq done-C t)))
573 (if (and use-same-frame-for-AB ; implies wind A and B are suitable
574 (window-live-p wind-A))
575 (progn
576 ;; wind-A must already be displaying buf-A
577 (select-window wind-A)
578 (delete-other-windows)
579 (setq wind-A (selected-window))
581 (funcall split-window-function)
582 (if (eq (selected-window) wind-A)
583 (other-window 1))
584 (switch-to-buffer buf-B)
585 (setq wind-B (selected-window))
587 (setq done-A t
588 done-B t)))
590 (if use-same-frame
591 (let ((window-min-height 1))
592 (if (and (eq frame-A frame-B)
593 (eq frame-B frame-C)
594 (frame-live-p frame-A))
595 (select-frame frame-A)
596 ;; avoid dedicated and non-splittable windows
597 (ediff-skip-unsuitable-frames))
598 (delete-other-windows)
599 (setq merge-window-lines
600 (max 2 (round (* (window-height) merge-window-share))))
601 (switch-to-buffer buf-A)
602 (setq wind-A (selected-window))
604 (split-window-vertically
605 (max 2 (- (window-height) merge-window-lines)))
606 (if (eq (selected-window) wind-A)
607 (other-window 1))
608 (setq wind-C (selected-window))
609 (switch-to-buffer buf-C)
611 (select-window wind-A)
613 (funcall split-window-function)
614 (if (eq (selected-window) wind-A)
615 (other-window 1))
616 (switch-to-buffer buf-B)
617 (setq wind-B (selected-window))
619 (setq done-A t
620 done-B t
621 done-C t)
624 (or done-A ; Buf A to be set in its own frame,
625 ;;; or it was set before because use-same-frame = 1
626 (progn
627 ;; Buf-A was not set up yet as it wasn't visible,
628 ;; and use-same-frame = nil, use-same-frame-for-AB = nil
629 (select-window orig-wind)
630 (delete-other-windows)
631 (switch-to-buffer buf-A)
632 (setq wind-A (selected-window))
634 (or done-B ; Buf B to be set in its own frame,
635 ;;; or it was set before because use-same-frame = 1
636 (progn
637 ;; Buf-B was not set up yet as it wasn't visible
638 ;; and use-same-frame = nil, use-same-frame-for-AB = nil
639 (select-window orig-wind)
640 (delete-other-windows)
641 (switch-to-buffer buf-B)
642 (setq wind-B (selected-window))
645 (or done-C ; Buf C to be set in its own frame,
646 ;;; or it was set before because use-same-frame = 1
647 (progn
648 ;; Buf-C was not set up yet as it wasn't visible
649 ;; and use-same-frame = nil
650 (select-window orig-wind)
651 (delete-other-windows)
652 (switch-to-buffer buf-C)
653 (setq wind-C (selected-window))
656 (ediff-with-current-buffer control-buf
657 (setq ediff-window-A wind-A
658 ediff-window-B wind-B
659 ediff-window-C wind-C)
660 (setq frame-A (window-frame ediff-window-A)
661 designated-minibuffer-frame
662 (window-frame (minibuffer-window frame-A))))
664 (ediff-setup-control-frame control-buf designated-minibuffer-frame)
668 ;; Window setup for all comparison jobs, including 3way comparisons
669 (defun ediff-setup-windows-multiframe-compare (buf-A buf-B buf-C control-buf)
670 ;;; Algorithm:
671 ;;; If a buffer is seen in a frame, use that frame for that buffer.
672 ;;; If it is not seen, use the current frame.
673 ;;; If both buffers are not seen, they share the current frame. If one
674 ;;; of the buffers is not seen, it is placed in the current frame (where
675 ;;; ediff started). If that frame is displaying the other buffer, it is
676 ;;; shared between the two buffers.
677 ;;; However, if we decide to put both buffers in one frame
678 ;;; and the selected frame isn't splittable, we create a new frame and
679 ;;; put both buffers there, event if one of this buffers is visible in
680 ;;; another frame.
682 ;; Skip dedicated or iconified frames.
683 ;; Unsplittable frames are taken care of later.
684 (ediff-skip-unsuitable-frames 'ok-unsplittable)
686 (let* ((window-min-height 1)
687 (wind-A (ediff-get-visible-buffer-window buf-A))
688 (wind-B (ediff-get-visible-buffer-window buf-B))
689 (wind-C (ediff-get-visible-buffer-window buf-C))
690 (frame-A (if wind-A (window-frame wind-A)))
691 (frame-B (if wind-B (window-frame wind-B)))
692 (frame-C (if wind-C (window-frame wind-C)))
693 (ctl-frame-exists-p (ediff-with-current-buffer control-buf
694 (frame-live-p ediff-control-frame)))
695 ;; on wide display, do things in one frame
696 (force-one-frame
697 (ediff-with-current-buffer control-buf ediff-wide-display-p))
698 ;; this lets us have local versions of ediff-split-window-function
699 (split-window-function
700 (ediff-with-current-buffer control-buf ediff-split-window-function))
701 (three-way-comparison
702 (ediff-with-current-buffer control-buf ediff-3way-comparison-job))
703 (orig-wind (selected-window))
704 (use-same-frame (or force-one-frame
705 (eq frame-A frame-B)
706 (not (ediff-window-ok-for-display wind-A))
707 (not (ediff-window-ok-for-display wind-B))
708 (if three-way-comparison
709 (or (eq frame-A frame-C)
710 (eq frame-B frame-C)
711 (not (ediff-window-ok-for-display wind-C))
712 (not (frame-live-p frame-A))
713 (not (frame-live-p frame-B))
714 (not (frame-live-p frame-C))))
715 (and (not (frame-live-p frame-B))
716 (or ctl-frame-exists-p
717 (eq frame-A (selected-frame))))
718 (and (not (frame-live-p frame-A))
719 (or ctl-frame-exists-p
720 (eq frame-B (selected-frame))))))
721 wind-A-start wind-B-start
722 designated-minibuffer-frame
723 done-A done-B done-C)
725 (ediff-with-current-buffer control-buf
726 (setq wind-A-start (ediff-overlay-start
727 (ediff-get-value-according-to-buffer-type
728 'A ediff-narrow-bounds))
729 wind-B-start (ediff-overlay-start
730 (ediff-get-value-according-to-buffer-type
731 'B ediff-narrow-bounds))))
733 (if (and (window-live-p wind-A) (null use-same-frame)) ; buf-A on its own
734 (progn
735 ;; buffer buf-A is seen in live wind-A
736 (select-window wind-A) ; must be displaying buf-A
737 (delete-other-windows)
738 (setq wind-A (selected-window))
739 (setq done-A t)))
741 (if (and (window-live-p wind-B) (null use-same-frame)) ; buf B on its own
742 (progn
743 ;; buffer buf-B is seen in live wind-B
744 (select-window wind-B) ; must be displaying buf-B
745 (delete-other-windows)
746 (setq wind-B (selected-window))
747 (setq done-B t)))
749 (if (and (window-live-p wind-C) (null use-same-frame)) ; buf C on its own
750 (progn
751 ;; buffer buf-C is seen in live wind-C
752 (select-window wind-C) ; must be displaying buf-C
753 (delete-other-windows)
754 (setq wind-C (selected-window))
755 (setq done-C t)))
757 (if use-same-frame
758 (let (wind-width-or-height) ; this affects 3way setups only
759 (if (and (eq frame-A frame-B) (frame-live-p frame-A))
760 (select-frame frame-A)
761 ;; avoid dedicated and non-splittable windows
762 (ediff-skip-unsuitable-frames))
763 (delete-other-windows)
764 (switch-to-buffer buf-A)
765 (setq wind-A (selected-window))
767 (if three-way-comparison
768 (setq wind-width-or-height
770 (if (eq split-window-function 'split-window-vertically)
771 (window-height wind-A)
772 (window-width wind-A))
773 3)))
775 (funcall split-window-function wind-width-or-height)
776 (if (eq (selected-window) wind-A)
777 (other-window 1))
778 (switch-to-buffer buf-B)
779 (setq wind-B (selected-window))
781 (if three-way-comparison
782 (progn
783 (funcall split-window-function) ; equally
784 (if (memq (selected-window) (list wind-A wind-B))
785 (other-window 1))
786 (switch-to-buffer buf-C)
787 (setq wind-C (selected-window))))
788 (setq done-A t
789 done-B t
790 done-C t)
793 (or done-A ; Buf A to be set in its own frame
794 ;;; or it was set before because use-same-frame = 1
795 (progn
796 ;; Buf-A was not set up yet as it wasn't visible,
797 ;; and use-same-frame = nil
798 (select-window orig-wind)
799 (delete-other-windows)
800 (switch-to-buffer buf-A)
801 (setq wind-A (selected-window))
803 (or done-B ; Buf B to be set in its own frame
804 ;;; or it was set before because use-same-frame = 1
805 (progn
806 ;; Buf-B was not set up yet as it wasn't visible,
807 ;; and use-same-frame = nil
808 (select-window orig-wind)
809 (delete-other-windows)
810 (switch-to-buffer buf-B)
811 (setq wind-B (selected-window))
814 (if three-way-comparison
815 (or done-C ; Buf C to be set in its own frame
816 ;;; or it was set before because use-same-frame = 1
817 (progn
818 ;; Buf-C was not set up yet as it wasn't visible,
819 ;; and use-same-frame = nil
820 (select-window orig-wind)
821 (delete-other-windows)
822 (switch-to-buffer buf-C)
823 (setq wind-C (selected-window))
826 (ediff-with-current-buffer control-buf
827 (setq ediff-window-A wind-A
828 ediff-window-B wind-B
829 ediff-window-C wind-C)
831 (setq frame-A (window-frame ediff-window-A)
832 designated-minibuffer-frame
833 (window-frame (minibuffer-window frame-A))))
835 ;; It is unlikely that we'll implement a version of ediff-windows that
836 ;; would compare 3 windows at once. So, we don't use buffer C here.
837 (if ediff-windows-job
838 (progn
839 (set-window-start wind-A wind-A-start)
840 (set-window-start wind-B wind-B-start)))
842 (ediff-setup-control-frame control-buf designated-minibuffer-frame)
845 ;; skip unsplittable frames and frames that have dedicated windows.
846 ;; create a new splittable frame if none is found
847 (defun ediff-skip-unsuitable-frames (&optional ok-unsplittable)
848 (if (ediff-window-display-p)
849 (let ((wind-frame (window-frame (selected-window)))
850 seen-windows)
851 (while (and (not (memq (selected-window) seen-windows))
853 (ediff-frame-has-dedicated-windows wind-frame)
854 (ediff-frame-iconified-p wind-frame)
855 ;; skip small windows
856 (< (frame-height wind-frame)
857 (* 3 window-min-height))
858 (if ok-unsplittable
860 (ediff-frame-unsplittable-p wind-frame))))
861 ;; remember history
862 (setq seen-windows (cons (selected-window) seen-windows))
863 ;; try new window
864 (other-window 1 t)
865 (setq wind-frame (window-frame (selected-window)))
867 (if (memq (selected-window) seen-windows)
868 ;; fed up, no appropriate frames
869 (setq wind-frame (make-frame '((unsplittable)))))
871 (select-frame wind-frame)
874 (defun ediff-frame-has-dedicated-windows (frame)
875 (let (ans)
876 (walk-windows
877 (lambda (wind) (if (window-dedicated-p wind)
878 (setq ans t)))
879 'ignore-minibuffer
880 frame)
881 ans))
883 ;; window is ok, if it is only one window on the frame, not counting the
884 ;; minibuffer, or none of the frame's windows is dedicated.
885 ;; The idea is that it is bad to destroy dedicated windows while creating an
886 ;; ediff window setup
887 (defun ediff-window-ok-for-display (wind)
888 (and
889 (window-live-p wind)
891 ;; only one window
892 (eq wind (next-window wind 'ignore-minibuffer (window-frame wind)))
893 ;; none is dedicated (in multiframe setup)
894 (not (ediff-frame-has-dedicated-windows (window-frame wind)))
897 ;; Prepare or refresh control frame
898 (defun ediff-setup-control-frame (ctl-buffer designated-minibuffer-frame)
899 (let ((window-min-height 1)
900 ctl-frame-iconified-p dont-iconify-ctl-frame deiconify-ctl-frame
901 ctl-frame old-ctl-frame lines
902 ;; user-grabbed-mouse
903 fheight fwidth adjusted-parameters)
905 (ediff-with-current-buffer ctl-buffer
906 (if (and (featurep 'xemacs) (featurep 'menubar))
907 (set-buffer-menubar nil))
908 ;;(setq user-grabbed-mouse (ediff-user-grabbed-mouse))
909 (run-hooks 'ediff-before-setup-control-frame-hook))
911 (setq old-ctl-frame (ediff-with-current-buffer ctl-buffer ediff-control-frame))
912 (ediff-with-current-buffer ctl-buffer
913 (setq ctl-frame (if (frame-live-p old-ctl-frame)
914 old-ctl-frame
915 (make-frame ediff-control-frame-parameters))
916 ediff-control-frame ctl-frame)
917 ;; protect against undefined face-attribute
918 (condition-case nil
919 (if (and (featurep 'emacs) (face-attribute 'mode-line :box))
920 (set-face-attribute 'mode-line ctl-frame :box nil))
921 (error)))
923 (setq ctl-frame-iconified-p (ediff-frame-iconified-p ctl-frame))
924 (select-frame ctl-frame)
925 (if (window-dedicated-p (selected-window))
927 (delete-other-windows)
928 (switch-to-buffer ctl-buffer))
930 ;; must be before ediff-setup-control-buffer
931 ;; just a precaution--we should be in ctl-buffer already
932 (ediff-with-current-buffer ctl-buffer
933 (make-local-variable 'frame-title-format)
934 (make-local-variable 'frame-icon-title-format) ; XEmacs
935 (make-local-variable 'icon-title-format)) ; Emacs
937 (ediff-setup-control-buffer ctl-buffer)
938 (setq dont-iconify-ctl-frame
939 (not (string= ediff-help-message ediff-brief-help-message)))
940 (setq deiconify-ctl-frame
941 (and (eq this-command 'ediff-toggle-help)
942 dont-iconify-ctl-frame))
944 ;; 1 more line for the modeline
945 (setq lines (1+ (count-lines (point-min) (point-max)))
946 fheight lines
947 fwidth (max (+ (ediff-help-message-line-length) 2)
948 (ediff-compute-toolbar-width))
949 adjusted-parameters
950 (list
951 ;; possibly change surrogate minibuffer
952 (cons 'minibuffer
953 (minibuffer-window
954 designated-minibuffer-frame))
955 (cons 'width fwidth)
956 (cons 'height fheight)
957 (cons 'user-position t)
960 ;; adjust autoraise
961 (setq adjusted-parameters
962 (cons (if ediff-use-long-help-message
963 '(auto-raise . nil)
964 '(auto-raise . t))
965 adjusted-parameters))
967 ;; In XEmacs, buffer menubar needs to be killed before frame parameters
968 ;; are changed.
969 (if (ediff-has-toolbar-support-p)
970 (when (featurep 'xemacs)
971 (if (ediff-has-gutter-support-p)
972 (set-specifier top-gutter (list ctl-frame nil)))
973 (sit-for 0)
974 (set-specifier top-toolbar-height (list ctl-frame 0))
975 ;;(set-specifier bottom-toolbar-height (list ctl-frame 0))
976 (set-specifier left-toolbar-width (list ctl-frame 0))
977 (set-specifier right-toolbar-width (list ctl-frame 0))))
979 ;; Under OS/2 (emx) we have to call modify frame parameters twice, in order
980 ;; to make sure that at least once we do it for non-iconified frame. If
981 ;; appears that in the OS/2 port of Emacs, one can't modify frame
982 ;; parameters of iconified frames. As a precaution, we do likewise for
983 ;; windows-nt.
984 (if (memq system-type '(emx windows-nt windows-95))
985 (modify-frame-parameters ctl-frame adjusted-parameters))
987 ;; make or zap toolbar (if not requested)
988 (ediff-make-bottom-toolbar ctl-frame)
990 (goto-char (point-min))
992 (modify-frame-parameters ctl-frame adjusted-parameters)
993 (make-frame-visible ctl-frame)
995 ;; This works around a bug in 19.25 and earlier. There, if frame gets
996 ;; iconified, the current buffer changes to that of the frame that
997 ;; becomes exposed as a result of this iconification.
998 ;; So, we make sure the current buffer doesn't change.
999 (select-frame ctl-frame)
1000 (ediff-refresh-control-frame)
1002 (cond ((and ediff-prefer-iconified-control-frame
1003 (not ctl-frame-iconified-p) (not dont-iconify-ctl-frame))
1004 (iconify-frame ctl-frame))
1005 ((or deiconify-ctl-frame (not ctl-frame-iconified-p))
1006 (raise-frame ctl-frame)))
1008 (set-window-dedicated-p (selected-window) t)
1010 ;; Now move the frame. We must do it separately due to an obscure bug in
1011 ;; XEmacs
1012 (modify-frame-parameters
1013 ctl-frame
1014 (funcall ediff-control-frame-position-function ctl-buffer fwidth fheight))
1016 ;; synchronize so the cursor will move to control frame
1017 ;; per RMS suggestion
1018 (if (ediff-window-display-p)
1019 (let ((count 7))
1020 (sit-for .1)
1021 (while (and (not (frame-visible-p ctl-frame)) (> count 0))
1022 (setq count (1- count))
1023 (sit-for .3))))
1025 (or (ediff-frame-iconified-p ctl-frame)
1026 ;; don't warp the mouse, unless ediff-grab-mouse = t
1027 (ediff-reset-mouse ctl-frame
1028 (or (eq this-command 'ediff-quit)
1029 (not (eq ediff-grab-mouse t)))))
1031 (when (featurep 'xemacs)
1032 (ediff-with-current-buffer ctl-buffer
1033 (make-local-hook 'select-frame-hook)
1034 (add-hook 'select-frame-hook
1035 'ediff-xemacs-select-frame-hook nil 'local)))
1037 (ediff-with-current-buffer ctl-buffer
1038 (run-hooks 'ediff-after-setup-control-frame-hook))))
1041 (defun ediff-destroy-control-frame (ctl-buffer)
1042 (ediff-with-current-buffer ctl-buffer
1043 (if (and (ediff-window-display-p) (frame-live-p ediff-control-frame))
1044 (let ((ctl-frame ediff-control-frame))
1045 (if (and (featurep 'xemacs) (featurep 'menubar))
1046 (set-buffer-menubar default-menubar))
1047 (setq ediff-control-frame nil)
1048 (delete-frame ctl-frame))))
1049 (if ediff-multiframe
1050 (ediff-skip-unsuitable-frames))
1051 ;;(ediff-reset-mouse nil)
1055 ;; finds a good place to clip control frame
1056 (defun ediff-make-frame-position (ctl-buffer ctl-frame-width ctl-frame-height)
1057 (ediff-with-current-buffer ctl-buffer
1058 (let* ((frame-A (window-frame ediff-window-A))
1059 (frame-A-parameters (frame-parameters frame-A))
1060 (frame-A-top (eval (cdr (assoc 'top frame-A-parameters))))
1061 (frame-A-left (eval (cdr (assoc 'left frame-A-parameters))))
1062 (frame-A-width (frame-width frame-A))
1063 (ctl-frame ediff-control-frame)
1064 horizontal-adjustment upward-adjustment
1065 ctl-frame-top ctl-frame-left)
1067 ;; Multiple control frames are clipped based on the value of
1068 ;; ediff-control-buffer-number. This is done in order not to obscure
1069 ;; other active control panels.
1070 (setq horizontal-adjustment (* 2 ediff-control-buffer-number)
1071 upward-adjustment (* -14 ediff-control-buffer-number))
1073 (setq ctl-frame-top
1074 (- frame-A-top upward-adjustment ediff-control-frame-upward-shift)
1075 ctl-frame-left
1076 (+ frame-A-left
1077 (if ediff-use-long-help-message
1078 (* (ediff-frame-char-width ctl-frame)
1079 (+ ediff-wide-control-frame-rightward-shift
1080 horizontal-adjustment))
1081 (- (* frame-A-width (ediff-frame-char-width frame-A))
1082 (* (ediff-frame-char-width ctl-frame)
1083 (+ ctl-frame-width
1084 ediff-narrow-control-frame-leftward-shift
1085 horizontal-adjustment))))))
1086 (setq ctl-frame-top
1087 (min ctl-frame-top
1088 (- (ediff-display-pixel-height)
1089 (* 2 ctl-frame-height
1090 (ediff-frame-char-height ctl-frame))))
1091 ctl-frame-left
1092 (min ctl-frame-left
1093 (- (ediff-display-pixel-width)
1094 (* ctl-frame-width (ediff-frame-char-width ctl-frame)))))
1095 ;; keep ctl frame within the visible bounds
1096 (setq ctl-frame-top (max ctl-frame-top 1)
1097 ctl-frame-left (max ctl-frame-left 1))
1099 (list (cons 'top ctl-frame-top)
1100 (cons 'left ctl-frame-left))
1103 (defun ediff-xemacs-select-frame-hook ()
1104 (if (and (equal (selected-frame) ediff-control-frame)
1105 (not ediff-use-long-help-message))
1106 (raise-frame ediff-control-frame)))
1108 (defun ediff-make-wide-display ()
1109 "Construct an alist of parameters for the wide display.
1110 Saves the old frame parameters in `ediff-wide-display-orig-parameters'.
1111 The frame to be resized is kept in `ediff-wide-display-frame'.
1112 This function modifies only the left margin and the width of the display.
1113 It assumes that it is called from within the control buffer."
1114 (if (not (fboundp 'ediff-display-pixel-width))
1115 (error "Can't determine display width"))
1116 (let* ((frame-A (window-frame ediff-window-A))
1117 (frame-A-params (frame-parameters frame-A))
1118 (cw (ediff-frame-char-width frame-A))
1119 (wd (- (/ (ediff-display-pixel-width) cw) 5)))
1120 (setq ediff-wide-display-orig-parameters
1121 (list (cons 'left (max 0 (eval (cdr (assoc 'left frame-A-params)))))
1122 (cons 'width (cdr (assoc 'width frame-A-params))))
1123 ediff-wide-display-frame frame-A)
1124 (modify-frame-parameters
1125 frame-A `((left . ,cw) (width . ,wd) (user-position t)))))
1128 ;; Revise the mode line to display which difference we have selected
1129 ;; Also resets modelines of buffers A/B, since they may be clobbered by
1130 ;; anothe invocations of Ediff.
1131 (defun ediff-refresh-mode-lines ()
1132 (let (buf-A-state-diff buf-B-state-diff buf-C-state-diff buf-C-state-merge)
1134 (if (ediff-valid-difference-p)
1135 (setq
1136 buf-C-state-diff (ediff-get-state-of-diff ediff-current-difference 'C)
1137 buf-C-state-merge (ediff-get-state-of-merge ediff-current-difference)
1138 buf-A-state-diff (ediff-get-state-of-diff ediff-current-difference 'A)
1139 buf-B-state-diff (ediff-get-state-of-diff ediff-current-difference 'B)
1140 buf-A-state-diff (if buf-A-state-diff
1141 (format "[%s] " buf-A-state-diff)
1143 buf-B-state-diff (if buf-B-state-diff
1144 (format "[%s] " buf-B-state-diff)
1146 buf-C-state-diff (if (and (ediff-buffer-live-p ediff-buffer-C)
1147 (or buf-C-state-diff buf-C-state-merge))
1148 (format "[%s%s%s] "
1149 (or buf-C-state-diff "")
1150 (if buf-C-state-merge
1151 (concat " " buf-C-state-merge)
1153 (if (ediff-get-state-of-ancestor
1154 ediff-current-difference)
1155 " AncestorEmpty"
1158 ""))
1159 (setq buf-A-state-diff ""
1160 buf-B-state-diff ""
1161 buf-C-state-diff ""))
1163 ;; control buffer format
1164 (setq mode-line-format
1165 (if (ediff-narrow-control-frame-p)
1166 (list " " mode-line-buffer-identification)
1167 (list "-- " mode-line-buffer-identification " Quick Help")))
1168 ;; control buffer id
1169 (setq mode-line-buffer-identification
1170 (if (ediff-narrow-control-frame-p)
1171 (ediff-make-narrow-control-buffer-id 'skip-name)
1172 (ediff-make-wide-control-buffer-id)))
1173 ;; Force mode-line redisplay
1174 (force-mode-line-update)
1176 (if (and (ediff-window-display-p) (frame-live-p ediff-control-frame))
1177 (ediff-refresh-control-frame))
1179 (ediff-with-current-buffer ediff-buffer-A
1180 (setq ediff-diff-status buf-A-state-diff)
1181 (ediff-strip-mode-line-format)
1182 (setq mode-line-format
1183 (list " A: " 'ediff-diff-status mode-line-format))
1184 (force-mode-line-update))
1185 (ediff-with-current-buffer ediff-buffer-B
1186 (setq ediff-diff-status buf-B-state-diff)
1187 (ediff-strip-mode-line-format)
1188 (setq mode-line-format
1189 (list " B: " 'ediff-diff-status mode-line-format))
1190 (force-mode-line-update))
1191 (if ediff-3way-job
1192 (ediff-with-current-buffer ediff-buffer-C
1193 (setq ediff-diff-status buf-C-state-diff)
1194 (ediff-strip-mode-line-format)
1195 (setq mode-line-format
1196 (list " C: " 'ediff-diff-status mode-line-format))
1197 (force-mode-line-update)))
1198 (if (ediff-buffer-live-p ediff-ancestor-buffer)
1199 (ediff-with-current-buffer ediff-ancestor-buffer
1200 (ediff-strip-mode-line-format)
1201 ;; we keep the second dummy string in the mode line format of the
1202 ;; ancestor, since for other buffers Ediff prepends 2 strings and
1203 ;; ediff-strip-mode-line-format expects that.
1204 (setq mode-line-format
1205 (list " Ancestor: "
1206 (cond ((not (stringp buf-C-state-merge))
1208 ((string-match "prefer-A" buf-C-state-merge)
1209 "[=diff(B)] ")
1210 ((string-match "prefer-B" buf-C-state-merge)
1211 "[=diff(A)] ")
1212 (t ""))
1213 mode-line-format))))
1217 (defun ediff-refresh-control-frame ()
1218 (if (featurep 'emacs)
1219 ;; set frame/icon titles for Emacs
1220 (modify-frame-parameters
1221 ediff-control-frame
1222 (list (cons 'title (ediff-make-base-title))
1223 (cons 'icon-name (ediff-make-narrow-control-buffer-id))
1225 ;; set frame/icon titles for XEmacs
1226 (setq frame-title-format (ediff-make-base-title)
1227 frame-icon-title-format (ediff-make-narrow-control-buffer-id))
1228 ;; force an update of the frame title
1229 (modify-frame-parameters ediff-control-frame '(()))))
1232 (defun ediff-make-narrow-control-buffer-id (&optional skip-name)
1233 (concat
1234 (if skip-name
1236 (ediff-make-base-title))
1237 (cond ((< ediff-current-difference 0)
1238 (format " _/%d" ediff-number-of-differences))
1239 ((>= ediff-current-difference ediff-number-of-differences)
1240 (format " $/%d" ediff-number-of-differences))
1242 (format " %d/%d"
1243 (1+ ediff-current-difference)
1244 ediff-number-of-differences)))))
1246 (defun ediff-make-base-title ()
1247 (concat
1248 (cdr (assoc 'name ediff-control-frame-parameters))
1249 ediff-control-buffer-suffix))
1251 (defun ediff-make-wide-control-buffer-id ()
1252 (cond ((< ediff-current-difference 0)
1253 (list (format "%%b At start of %d diffs"
1254 ediff-number-of-differences)))
1255 ((>= ediff-current-difference ediff-number-of-differences)
1256 (list (format "%%b At end of %d diffs"
1257 ediff-number-of-differences)))
1259 (list (format "%%b diff %d of %d"
1260 (1+ ediff-current-difference)
1261 ediff-number-of-differences)))))
1265 ;; If buff is not live, return nil
1266 (defun ediff-get-visible-buffer-window (buff)
1267 (if (ediff-buffer-live-p buff)
1268 (if (featurep 'xemacs)
1269 (get-buffer-window buff t)
1270 (get-buffer-window buff 'visible))))
1273 ;;; Functions to decide when to redraw windows
1275 (defun ediff-keep-window-config (control-buf)
1276 (and (eq control-buf (current-buffer))
1277 (/= (buffer-size) 0)
1278 (ediff-with-current-buffer control-buf
1279 (let ((ctl-wind ediff-control-window)
1280 (A-wind ediff-window-A)
1281 (B-wind ediff-window-B)
1282 (C-wind ediff-window-C))
1284 (and
1285 (ediff-window-visible-p A-wind)
1286 (ediff-window-visible-p B-wind)
1287 ;; if buffer C is defined then take it into account
1288 (or (not ediff-3way-job)
1289 (ediff-window-visible-p C-wind))
1290 (eq (window-buffer A-wind) ediff-buffer-A)
1291 (eq (window-buffer B-wind) ediff-buffer-B)
1292 (or (not ediff-3way-job)
1293 (eq (window-buffer C-wind) ediff-buffer-C))
1294 (string= ediff-window-config-saved
1295 (format "%S%S%S%S%S%S%S"
1296 ctl-wind A-wind B-wind C-wind
1297 ediff-split-window-function
1298 (ediff-multiframe-setup-p)
1299 ediff-wide-display-p)))))))
1302 (provide 'ediff-wind)
1305 ;;; Local Variables:
1306 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
1307 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
1308 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
1309 ;;; End:
1311 ;;; arch-tag: 73d9a5d7-eed7-4d9c-8b4b-21d5d78eb597
1312 ;;; ediff-wind.el ends here