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