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