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