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