Mercurial > emacs
annotate src/window.c @ 10762:6ca3a749bebc
(ALL_CFLAGS): Allow include files to be found in
`srcdir'.
author | Paul Reilly <pmr@pajato.com> |
---|---|
date | Wed, 15 Feb 1995 19:11:32 +0000 |
parents | e1dfb47b664e |
children | 64fcde7a1438 |
rev | line source |
---|---|
265 | 1 /* Window creation, deletion and examination for GNU Emacs. |
2 Does not include redisplay. | |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
3 Copyright (C) 1985, 1986, 1987, 1993, 1994 Free Software Foundation, Inc. |
265 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
7 GNU Emacs is free software; you can redistribute it and/or modify | |
8 it under the terms of the GNU General Public License as published by | |
708 | 9 the Free Software Foundation; either version 2, or (at your option) |
265 | 10 any later version. |
11 | |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with GNU Emacs; see the file COPYING. If not, write to | |
19 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | |
20 | |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4570
diff
changeset
|
21 #include <config.h> |
265 | 22 #include "lisp.h" |
23 #include "buffer.h" | |
769 | 24 #include "frame.h" |
265 | 25 #include "window.h" |
26 #include "commands.h" | |
27 #include "indent.h" | |
28 #include "termchar.h" | |
29 #include "disptab.h" | |
522 | 30 #include "keyboard.h" |
265 | 31 |
2210
22d78dbb3cc7
Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents:
2190
diff
changeset
|
32 Lisp_Object Qwindowp, Qwindow_live_p; |
265 | 33 |
34 Lisp_Object Fnext_window (), Fdelete_window (), Fselect_window (); | |
35 Lisp_Object Fset_window_buffer (), Fsplit_window (), Frecenter (); | |
36 | |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
37 void delete_all_subwindows (); |
265 | 38 static struct window *decode_window(); |
39 | |
40 /* This is the window in which the terminal's cursor should | |
41 be left when nothing is being done with it. This must | |
42 always be a leaf window, and its buffer is selected by | |
43 the top level editing loop at the end of each command. | |
44 | |
45 This value is always the same as | |
769 | 46 FRAME_SELECTED_WINDOW (selected_frame). */ |
265 | 47 |
48 Lisp_Object selected_window; | |
49 | |
769 | 50 /* The minibuffer window of the selected frame. |
265 | 51 Note that you cannot test for minibufferness of an arbitrary window |
52 by comparing against this; but you can test for minibufferness of | |
53 the selected window. */ | |
54 Lisp_Object minibuf_window; | |
55 | |
56 /* Non-nil means it is the window for C-M-v to scroll | |
57 when the minibuffer is selected. */ | |
58 Lisp_Object Vminibuf_scroll_window; | |
59 | |
60 /* Non-nil means this is the buffer whose window C-M-v should scroll. */ | |
61 Lisp_Object Vother_window_scroll_buffer; | |
62 | |
63 /* Non-nil means it's function to call to display temp buffers. */ | |
64 Lisp_Object Vtemp_buffer_show_function; | |
65 | |
66 /* If a window gets smaller than either of these, it is removed. */ | |
67 int window_min_height; | |
68 int window_min_width; | |
69 | |
70 /* Nonzero implies Fdisplay_buffer should create windows. */ | |
71 int pop_up_windows; | |
72 | |
769 | 73 /* Nonzero implies make new frames for Fdisplay_buffer. */ |
74 int pop_up_frames; | |
265 | 75 |
76 /* Non-nil means use this function instead of default */ | |
769 | 77 Lisp_Object Vpop_up_frame_function; |
265 | 78 |
79 /* Function to call to handle Fdisplay_buffer. */ | |
80 Lisp_Object Vdisplay_buffer_function; | |
81 | |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
82 /* List of buffer *names* for buffers that should have their own frames. */ |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
83 Lisp_Object Vspecial_display_buffer_names; |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
84 |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
85 /* List of regexps for buffer names that should have their own frames. */ |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
86 Lisp_Object Vspecial_display_regexps; |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
87 |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
88 /* Function to pop up a special frame. */ |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
89 Lisp_Object Vspecial_display_function; |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
90 |
10461
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
91 /* Hook run at end of temp_output_buffer_show. */ |
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
92 Lisp_Object Qtemp_buffer_show_hook; |
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
93 |
265 | 94 /* Fdisplay_buffer always splits the largest window |
95 if that window is more than this high. */ | |
96 int split_height_threshold; | |
97 | |
98 /* Number of lines of continuity in scrolling by screenfuls. */ | |
99 int next_screen_context_lines; | |
100 | |
101 /* Incremented for each window created. */ | |
102 static int sequence_number; | |
103 | |
104 #define min(a, b) ((a) < (b) ? (a) : (b)) | |
105 | |
106 DEFUN ("windowp", Fwindowp, Swindowp, 1, 1, 0, | |
107 "Returns t if OBJ is a window.") | |
108 (obj) | |
109 Lisp_Object obj; | |
110 { | |
9105
984a4b1be1d1
(Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents:
9028
diff
changeset
|
111 return WINDOWP (obj) ? Qt : Qnil; |
265 | 112 } |
113 | |
2210
22d78dbb3cc7
Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents:
2190
diff
changeset
|
114 DEFUN ("window-live-p", Fwindow_live_p, Swindow_live_p, 1, 1, 0, |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
115 "Returns t if OBJ is a window which is currently visible.") |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
116 (obj) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
117 Lisp_Object obj; |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
118 { |
9105
984a4b1be1d1
(Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents:
9028
diff
changeset
|
119 return (WINDOWP (obj) && ! NILP (XWINDOW (obj)->buffer) ? Qt : Qnil); |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
120 } |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
121 |
265 | 122 Lisp_Object |
123 make_window () | |
124 { | |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
125 Lisp_Object val; |
265 | 126 register struct window *p; |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
127 register struct Lisp_Vector *vec; |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
128 int i; |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
129 |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
130 vec = allocate_vectorlike ((EMACS_INT) VECSIZE (struct window)); |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
131 for (i = 0; i < VECSIZE (struct window); i++) |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
132 vec->contents[i] = Qnil; |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
133 vec->size = VECSIZE (struct window); |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
134 p = (struct window *)vec; |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
135 XSETFASTINT (p->sequence_number, ++sequence_number); |
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
136 XSETFASTINT (p->left, 0); |
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
137 XSETFASTINT (p->top, 0); |
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
138 XSETFASTINT (p->height, 0); |
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
139 XSETFASTINT (p->width, 0); |
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
140 XSETFASTINT (p->hscroll, 0); |
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
141 XSETFASTINT (p->last_point_x, 0); |
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
142 XSETFASTINT (p->last_point_y, 0); |
265 | 143 p->start = Fmake_marker (); |
144 p->pointm = Fmake_marker (); | |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
145 XSETFASTINT (p->use_time, 0); |
769 | 146 p->frame = Qnil; |
265 | 147 p->display_table = Qnil; |
148 p->dedicated = Qnil; | |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
149 XSETWINDOW (val, p); |
265 | 150 return val; |
151 } | |
152 | |
153 DEFUN ("selected-window", Fselected_window, Sselected_window, 0, 0, 0, | |
154 "Return the window that the cursor now appears in and commands apply to.") | |
155 () | |
156 { | |
157 return selected_window; | |
158 } | |
159 | |
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
160 DEFUN ("minibuffer-window", Fminibuffer_window, Sminibuffer_window, 0, 1, 0, |
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
161 "Return the window used now for minibuffers.\n\ |
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
162 If the optional argument FRAME is specified, return the minibuffer window\n\ |
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
163 used by that frame.") |
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
164 (frame) |
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
165 Lisp_Object frame; |
265 | 166 { |
769 | 167 #ifdef MULTI_FRAME |
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
168 if (NILP (frame)) |
9282
f4fa46f6a032
(Fminibuffer_window, Fwindow_at, Fwindow_end, Fnext_window, Fprevious_window,
Karl Heuer <kwzh@gnu.org>
parents:
9243
diff
changeset
|
169 XSETFRAME (frame, selected_frame); |
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
170 else |
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
171 CHECK_LIVE_FRAME (frame, 0); |
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
172 #endif |
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
173 |
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
174 return FRAME_MINIBUF_WINDOW (XFRAME (frame)); |
265 | 175 } |
176 | |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
177 DEFUN ("window-minibuffer-p", Fwindow_minibuffer_p, Swindow_minibuffer_p, 0, 1, 0, |
265 | 178 "Returns non-nil if WINDOW is a minibuffer window.") |
179 (window) | |
180 Lisp_Object window; | |
181 { | |
182 struct window *w = decode_window (window); | |
183 return (MINI_WINDOW_P (w) ? Qt : Qnil); | |
184 } | |
185 | |
186 DEFUN ("pos-visible-in-window-p", Fpos_visible_in_window_p, | |
187 Spos_visible_in_window_p, 0, 2, 0, | |
769 | 188 "Return t if position POS is currently on the frame in WINDOW.\n\ |
265 | 189 Returns nil if that position is scrolled vertically out of view.\n\ |
190 POS defaults to point; WINDOW, to the selected window.") | |
191 (pos, window) | |
192 Lisp_Object pos, window; | |
193 { | |
194 register struct window *w; | |
195 register int top; | |
196 register int height; | |
197 register int posint; | |
198 register struct buffer *buf; | |
199 struct position posval; | |
5886
08286e54ad0e
(Fpos_visible_in_window_p): Take hscroll into account.
Karl Heuer <kwzh@gnu.org>
parents:
5738
diff
changeset
|
200 int hscroll; |
265 | 201 |
485 | 202 if (NILP (pos)) |
7347 | 203 posint = PT; |
265 | 204 else |
205 { | |
206 CHECK_NUMBER_COERCE_MARKER (pos, 0); | |
207 posint = XINT (pos); | |
208 } | |
209 | |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
210 w = decode_window (window); |
265 | 211 top = marker_position (w->start); |
5886
08286e54ad0e
(Fpos_visible_in_window_p): Take hscroll into account.
Karl Heuer <kwzh@gnu.org>
parents:
5738
diff
changeset
|
212 hscroll = XINT (w->hscroll); |
265 | 213 |
214 if (posint < top) | |
215 return Qnil; | |
216 | |
217 height = XFASTINT (w->height) - ! MINI_WINDOW_P (w); | |
218 | |
219 buf = XBUFFER (w->buffer); | |
220 if (XFASTINT (w->last_modified) >= BUF_MODIFF (buf)) | |
221 { | |
769 | 222 /* If frame is up to date, |
265 | 223 use the info recorded about how much text fit on it. */ |
224 if (posint < BUF_Z (buf) - XFASTINT (w->window_end_pos) | |
225 || (XFASTINT (w->window_end_vpos) < height)) | |
226 return Qt; | |
227 return Qnil; | |
228 } | |
229 else | |
230 { | |
5738
730f63010940
(Fpos_visible_in_window_p): Return nil if POS > ZV.
Karl Heuer <kwzh@gnu.org>
parents:
5232
diff
changeset
|
231 if (posint > BUF_ZV (buf)) |
265 | 232 return Qnil; |
233 | |
8486
52b7441e731b
(Fpos_visible_in_window_p): Do something reasonable
Richard M. Stallman <rms@gnu.org>
parents:
8435
diff
changeset
|
234 /* w->start can be out of range. If it is, do something reasonable. */ |
52b7441e731b
(Fpos_visible_in_window_p): Do something reasonable
Richard M. Stallman <rms@gnu.org>
parents:
8435
diff
changeset
|
235 if (top < BUF_BEGV (buf) || top > BUF_ZV (buf)) |
52b7441e731b
(Fpos_visible_in_window_p): Do something reasonable
Richard M. Stallman <rms@gnu.org>
parents:
8435
diff
changeset
|
236 return Qnil; |
52b7441e731b
(Fpos_visible_in_window_p): Do something reasonable
Richard M. Stallman <rms@gnu.org>
parents:
8435
diff
changeset
|
237 |
265 | 238 /* If that info is not correct, calculate afresh */ |
5886
08286e54ad0e
(Fpos_visible_in_window_p): Take hscroll into account.
Karl Heuer <kwzh@gnu.org>
parents:
5738
diff
changeset
|
239 posval = *compute_motion (top, 0, (hscroll ? 1 - hscroll : 0), |
08286e54ad0e
(Fpos_visible_in_window_p): Take hscroll into account.
Karl Heuer <kwzh@gnu.org>
parents:
5738
diff
changeset
|
240 posint, height, 0, |
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
241 window_internal_width (w) - 1, |
6692
43a79400a664
Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
6576
diff
changeset
|
242 hscroll, 0, w); |
265 | 243 |
244 return posval.vpos < height ? Qt : Qnil; | |
245 } | |
246 } | |
247 | |
248 static struct window * | |
249 decode_window (window) | |
250 register Lisp_Object window; | |
251 { | |
485 | 252 if (NILP (window)) |
265 | 253 return XWINDOW (selected_window); |
254 | |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
255 CHECK_LIVE_WINDOW (window, 0); |
265 | 256 return XWINDOW (window); |
257 } | |
258 | |
259 DEFUN ("window-buffer", Fwindow_buffer, Swindow_buffer, 0, 1, 0, | |
260 "Return the buffer that WINDOW is displaying.") | |
261 (window) | |
262 Lisp_Object window; | |
263 { | |
264 return decode_window (window)->buffer; | |
265 } | |
266 | |
267 DEFUN ("window-height", Fwindow_height, Swindow_height, 0, 1, 0, | |
268 "Return the number of lines in WINDOW (including its mode line).") | |
269 (window) | |
270 Lisp_Object window; | |
271 { | |
272 return decode_window (window)->height; | |
273 } | |
274 | |
275 DEFUN ("window-width", Fwindow_width, Swindow_width, 0, 1, 0, | |
6242
ed4b06e1975b
(Fwindow_width): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6232
diff
changeset
|
276 "Return the number of display columns in WINDOW.\n\ |
ed4b06e1975b
(Fwindow_width): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6232
diff
changeset
|
277 This is the width that is usable columns available for text in WINDOW.\n\ |
ed4b06e1975b
(Fwindow_width): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6232
diff
changeset
|
278 If you want to find out how many columns WINDOW takes up,\n\ |
ed4b06e1975b
(Fwindow_width): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6232
diff
changeset
|
279 use (let ((edges (window-edges))) (- (nth 2 edges) (nth 0 edges))).") |
265 | 280 (window) |
281 Lisp_Object window; | |
282 { | |
6576
851ee89bae86
(Fwindow_width): Delete unnecessary variable declarations.
Karl Heuer <kwzh@gnu.org>
parents:
6517
diff
changeset
|
283 return make_number (window_internal_width (decode_window (window))); |
265 | 284 } |
285 | |
286 DEFUN ("window-hscroll", Fwindow_hscroll, Swindow_hscroll, 0, 1, 0, | |
287 "Return the number of columns by which WINDOW is scrolled from left margin.") | |
288 (window) | |
289 Lisp_Object window; | |
290 { | |
291 return decode_window (window)->hscroll; | |
292 } | |
293 | |
294 DEFUN ("set-window-hscroll", Fset_window_hscroll, Sset_window_hscroll, 2, 2, 0, | |
295 "Set number of columns WINDOW is scrolled from left margin to NCOL.\n\ | |
296 NCOL should be zero or positive.") | |
297 (window, ncol) | |
298 register Lisp_Object window, ncol; | |
299 { | |
300 register struct window *w; | |
301 | |
302 CHECK_NUMBER (ncol, 1); | |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
303 if (XINT (ncol) < 0) XSETFASTINT (ncol, 0); |
265 | 304 if (XFASTINT (ncol) >= (1 << (SHORTBITS - 1))) |
305 args_out_of_range (ncol, Qnil); | |
306 w = decode_window (window); | |
1525
f79a22ad87d0
* window.c (Fwindow_width, Fset_window_hscroll): Use accessors on
Jim Blandy <jimb@redhat.com>
parents:
1444
diff
changeset
|
307 if (XINT (w->hscroll) != XINT (ncol)) |
265 | 308 clip_changed = 1; /* Prevent redisplay shortcuts */ |
309 w->hscroll = ncol; | |
310 return ncol; | |
311 } | |
312 | |
313 DEFUN ("window-edges", Fwindow_edges, Swindow_edges, 0, 1, 0, | |
314 "Return a list of the edge coordinates of WINDOW.\n\ | |
769 | 315 \(LEFT TOP RIGHT BOTTOM), all relative to 0, 0 at top left corner of frame.\n\ |
265 | 316 RIGHT is one more than the rightmost column used by WINDOW,\n\ |
317 and BOTTOM is one more than the bottommost row used by WINDOW\n\ | |
318 and its mode-line.") | |
319 (window) | |
320 Lisp_Object window; | |
321 { | |
322 register struct window *w = decode_window (window); | |
323 | |
324 return Fcons (w->left, Fcons (w->top, | |
325 Fcons (make_number (XFASTINT (w->left) + XFASTINT (w->width)), | |
326 Fcons (make_number (XFASTINT (w->top) | |
327 + XFASTINT (w->height)), | |
328 Qnil)))); | |
329 } | |
330 | |
432 | 331 /* Test if the character at column *x, row *y is within window *w. |
332 If it is not, return 0; | |
333 if it is in the window's text area, | |
334 set *x and *y to its location relative to the upper left corner | |
335 of the window, and | |
336 return 1; | |
337 if it is on the window's modeline, return 2; | |
338 if it is on the border between the window and its right sibling, | |
339 return 3. */ | |
340 static int | |
341 coordinates_in_window (w, x, y) | |
342 register struct window *w; | |
343 register int *x, *y; | |
344 { | |
345 register int left = XINT (w->left); | |
346 register int width = XINT (w->width); | |
347 register int window_height = XINT (w->height); | |
348 register int top = XFASTINT (w->top); | |
349 | |
350 if ( *x < left || *x >= left + width | |
351 || *y < top || *y >= top + window_height) | |
352 return 0; | |
353 | |
354 /* Is the character is the mode line? */ | |
355 if (*y == top + window_height - 1 | |
1049
25046e48ce9a
* window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents:
1016
diff
changeset
|
356 && ! MINI_WINDOW_P (w)) |
432 | 357 return 2; |
358 | |
359 /* Is the character in the right border? */ | |
360 if (*x == left + width - 1 | |
769 | 361 && left + width != FRAME_WIDTH (XFRAME (w->frame))) |
432 | 362 return 3; |
363 | |
364 *x -= left; | |
365 *y -= top; | |
366 return 1; | |
367 } | |
368 | |
369 DEFUN ("coordinates-in-window-p", Fcoordinates_in_window_p, | |
370 Scoordinates_in_window_p, 2, 2, 0, | |
371 "Return non-nil if COORDINATES are in WINDOW.\n\ | |
708 | 372 COORDINATES is a cons of the form (X . Y), X and Y being distances\n\ |
769 | 373 measured in characters from the upper-left corner of the frame.\n\ |
708 | 374 (0 . 0) denotes the character in the upper left corner of the\n\ |
769 | 375 frame.\n\ |
432 | 376 If COORDINATES are in the text portion of WINDOW,\n\ |
377 the coordinates relative to the window are returned.\n\ | |
732 | 378 If they are in the mode line of WINDOW, `mode-line' is returned.\n\ |
432 | 379 If they are on the border between WINDOW and its right sibling,\n\ |
732 | 380 `vertical-line' is returned.") |
432 | 381 (coordinates, window) |
382 register Lisp_Object coordinates, window; | |
383 { | |
384 int x, y; | |
385 | |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
386 CHECK_LIVE_WINDOW (window, 0); |
432 | 387 CHECK_CONS (coordinates, 1); |
388 x = XINT (Fcar (coordinates)); | |
389 y = XINT (Fcdr (coordinates)); | |
390 | |
391 switch (coordinates_in_window (XWINDOW (window), &x, &y)) | |
392 { | |
393 case 0: /* NOT in window at all. */ | |
394 return Qnil; | |
395 | |
396 case 1: /* In text part of window. */ | |
397 return Fcons (x, y); | |
398 | |
399 case 2: /* In mode line of window. */ | |
400 return Qmode_line; | |
401 | |
402 case 3: /* On right border of window. */ | |
732 | 403 return Qvertical_line; |
432 | 404 |
405 default: | |
406 abort (); | |
407 } | |
408 } | |
409 | |
265 | 410 /* Find the window containing column x, row y, and return it as a |
432 | 411 Lisp_Object. If x, y is on the window's modeline, set *part |
412 to 1; if it is on the separating line between the window and its | |
413 right sibling, set it to 2; otherwise set it to 0. If there is no | |
414 window under x, y return nil and leave *part unmodified. */ | |
265 | 415 Lisp_Object |
769 | 416 window_from_coordinates (frame, x, y, part) |
417 FRAME_PTR frame; | |
265 | 418 int x, y; |
432 | 419 int *part; |
265 | 420 { |
421 register Lisp_Object tem, first; | |
422 | |
769 | 423 tem = first = FRAME_SELECTED_WINDOW (frame); |
265 | 424 |
432 | 425 do |
265 | 426 { |
427 int found = coordinates_in_window (XWINDOW (tem), &x, &y); | |
428 | |
429 if (found) | |
430 { | |
432 | 431 *part = found - 1; |
265 | 432 return tem; |
433 } | |
434 | |
432 | 435 tem = Fnext_window (tem, Qt, Qlambda); |
265 | 436 } |
432 | 437 while (! EQ (tem, first)); |
438 | |
439 return Qnil; | |
265 | 440 } |
441 | |
681
026f978690be
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
555
diff
changeset
|
442 DEFUN ("window-at", Fwindow_at, Swindow_at, 2, 3, 0, |
1798 | 443 "Return window containing coordinates X and Y on FRAME.\n\ |
769 | 444 If omitted, FRAME defaults to the currently selected frame.\n\ |
445 The top left corner of the frame is considered to be row 0,\n\ | |
548 | 446 column 0.") |
1798 | 447 (x, y, frame) |
448 Lisp_Object x, y, frame; | |
265 | 449 { |
450 int part; | |
451 | |
983
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
452 #ifdef MULTI_FRAME |
769 | 453 if (NILP (frame)) |
9282
f4fa46f6a032
(Fminibuffer_window, Fwindow_at, Fwindow_end, Fnext_window, Fprevious_window,
Karl Heuer <kwzh@gnu.org>
parents:
9243
diff
changeset
|
454 XSETFRAME (frame, selected_frame); |
432 | 455 else |
769 | 456 CHECK_LIVE_FRAME (frame, 2); |
983
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
457 #endif |
1798 | 458 CHECK_NUMBER (x, 0); |
459 CHECK_NUMBER (y, 1); | |
265 | 460 |
769 | 461 return window_from_coordinates (XFRAME (frame), |
1798 | 462 XINT (x), XINT (y), |
265 | 463 &part); |
464 } | |
465 | |
466 DEFUN ("window-point", Fwindow_point, Swindow_point, 0, 1, 0, | |
467 "Return current value of point in WINDOW.\n\ | |
468 For a nonselected window, this is the value point would have\n\ | |
469 if that window were selected.\n\ | |
470 \n\ | |
471 Note that, when WINDOW is the selected window and its buffer\n\ | |
472 is also currently selected, the value returned is the same as (point).\n\ | |
473 It would be more strictly correct to return the `top-level' value\n\ | |
474 of point, outside of any save-excursion forms.\n\ | |
475 But that is hard to define.") | |
476 (window) | |
477 Lisp_Object window; | |
478 { | |
479 register struct window *w = decode_window (window); | |
480 | |
481 if (w == XWINDOW (selected_window) | |
482 && current_buffer == XBUFFER (w->buffer)) | |
483 return Fpoint (); | |
484 return Fmarker_position (w->pointm); | |
485 } | |
486 | |
487 DEFUN ("window-start", Fwindow_start, Swindow_start, 0, 1, 0, | |
488 "Return position at which display currently starts in WINDOW.") | |
489 (window) | |
490 Lisp_Object window; | |
491 { | |
492 return Fmarker_position (decode_window (window)->start); | |
493 } | |
494 | |
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
495 /* This is text temporarily removed from the doc string below. |
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
496 |
8492
865daa7a9faf
(Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
8486
diff
changeset
|
497 This function returns nil if the position is not currently known.\n\ |
865daa7a9faf
(Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
8486
diff
changeset
|
498 That happens when redisplay is preempted and doesn't finish.\n\ |
865daa7a9faf
(Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
8486
diff
changeset
|
499 If in that case you want to compute where the end of the window would\n\ |
865daa7a9faf
(Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
8486
diff
changeset
|
500 have been if redisplay had finished, do this:\n\ |
865daa7a9faf
(Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
8486
diff
changeset
|
501 (save-excursion\n\ |
865daa7a9faf
(Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
8486
diff
changeset
|
502 (goto-char (window-start window))\n\ |
865daa7a9faf
(Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
8486
diff
changeset
|
503 (vertical-motion (1- (window-height window)) window)\n\ |
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
504 (point))") */ |
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
505 |
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
506 DEFUN ("window-end", Fwindow_end, Swindow_end, 0, 1, 0, |
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
507 "Return position at which display currently ends in WINDOW.\n\ |
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
508 This is updated by redisplay, when it runs to completion.\n\ |
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
509 Simply changing the buffer text or setting `window-start'\n\ |
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
510 does not update this value.") |
265 | 511 (window) |
512 Lisp_Object window; | |
513 { | |
514 Lisp_Object value; | |
515 struct window *w = decode_window (window); | |
4292
990f6ee7f527
(Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents:
4145
diff
changeset
|
516 Lisp_Object buf; |
990f6ee7f527
(Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents:
4145
diff
changeset
|
517 |
990f6ee7f527
(Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents:
4145
diff
changeset
|
518 buf = w->buffer; |
990f6ee7f527
(Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents:
4145
diff
changeset
|
519 CHECK_BUFFER (buf, 0); |
990f6ee7f527
(Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents:
4145
diff
changeset
|
520 |
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
521 #if 0 /* This change broke some things. We should make it later. */ |
8492
865daa7a9faf
(Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
8486
diff
changeset
|
522 /* If we don't know the end position, return nil. |
865daa7a9faf
(Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
8486
diff
changeset
|
523 The user can compute it with vertical-motion if he wants to. |
865daa7a9faf
(Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
8486
diff
changeset
|
524 It would be nicer to do it automatically, |
865daa7a9faf
(Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
8486
diff
changeset
|
525 but that's so slow that it would probably bother people. */ |
865daa7a9faf
(Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
8486
diff
changeset
|
526 if (NILP (w->window_end_valid)) |
865daa7a9faf
(Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
8486
diff
changeset
|
527 return Qnil; |
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
528 #endif |
8492
865daa7a9faf
(Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
8486
diff
changeset
|
529 |
9282
f4fa46f6a032
(Fminibuffer_window, Fwindow_at, Fwindow_end, Fnext_window, Fprevious_window,
Karl Heuer <kwzh@gnu.org>
parents:
9243
diff
changeset
|
530 XSETINT (value, |
f4fa46f6a032
(Fminibuffer_window, Fwindow_at, Fwindow_end, Fnext_window, Fprevious_window,
Karl Heuer <kwzh@gnu.org>
parents:
9243
diff
changeset
|
531 BUF_Z (XBUFFER (buf)) - XFASTINT (w->window_end_pos)); |
265 | 532 |
533 return value; | |
534 } | |
535 | |
536 DEFUN ("set-window-point", Fset_window_point, Sset_window_point, 2, 2, 0, | |
537 "Make point value in WINDOW be at position POS in WINDOW's buffer.") | |
538 (window, pos) | |
539 Lisp_Object window, pos; | |
540 { | |
541 register struct window *w = decode_window (window); | |
542 | |
543 CHECK_NUMBER_COERCE_MARKER (pos, 1); | |
544 if (w == XWINDOW (selected_window)) | |
545 Fgoto_char (pos); | |
546 else | |
547 set_marker_restricted (w->pointm, pos, w->buffer); | |
548 | |
549 return pos; | |
550 } | |
551 | |
552 DEFUN ("set-window-start", Fset_window_start, Sset_window_start, 2, 3, 0, | |
553 "Make display in WINDOW start at position POS in WINDOW's buffer.\n\ | |
554 Optional third arg NOFORCE non-nil inhibits next redisplay\n\ | |
555 from overriding motion of point in order to display at this exact start.") | |
556 (window, pos, noforce) | |
557 Lisp_Object window, pos, noforce; | |
558 { | |
559 register struct window *w = decode_window (window); | |
560 | |
561 CHECK_NUMBER_COERCE_MARKER (pos, 1); | |
562 set_marker_restricted (w->start, pos, w->buffer); | |
563 /* this is not right, but much easier than doing what is right. */ | |
564 w->start_at_line_beg = Qnil; | |
485 | 565 if (NILP (noforce)) |
265 | 566 w->force_start = Qt; |
567 w->update_mode_line = Qt; | |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
568 XSETFASTINT (w->last_modified, 0); |
338 | 569 if (!EQ (window, selected_window)) |
570 windows_or_buffers_changed++; | |
265 | 571 return pos; |
572 } | |
573 | |
574 DEFUN ("window-dedicated-p", Fwindow_dedicated_p, Swindow_dedicated_p, | |
575 1, 1, 0, | |
576 "Return WINDOW's dedicated object, usually t or nil.\n\ | |
2865
427eadecebd6
* window.c (window-dedicated-p): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
2693
diff
changeset
|
577 See also `set-window-dedicated-p'.") |
265 | 578 (window) |
579 Lisp_Object window; | |
580 { | |
581 return decode_window (window)->dedicated; | |
582 } | |
583 | |
722
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
584 DEFUN ("set-window-dedicated-p", Fset_window_dedicated_p, |
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
585 Sset_window_dedicated_p, 2, 2, 0, |
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
586 "Control whether WINDOW is dedicated to the buffer it displays.\n\ |
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
587 If it is dedicated, Emacs will not automatically change\n\ |
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
588 which buffer appears in it.\n\ |
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
589 The second argument is the new value for the dedication flag;\n\ |
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
590 non-nil means yes.") |
265 | 591 (window, arg) |
592 Lisp_Object window, arg; | |
593 { | |
594 register struct window *w = decode_window (window); | |
595 | |
485 | 596 if (NILP (arg)) |
265 | 597 w->dedicated = Qnil; |
598 else | |
722
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
599 w->dedicated = Qt; |
265 | 600 |
601 return w->dedicated; | |
602 } | |
603 | |
604 DEFUN ("window-display-table", Fwindow_display_table, Swindow_display_table, | |
605 0, 1, 0, | |
606 "Return the display-table that WINDOW is using.") | |
607 (window) | |
608 Lisp_Object window; | |
609 { | |
610 return decode_window (window)->display_table; | |
611 } | |
612 | |
613 /* Get the display table for use currently on window W. | |
614 This is either W's display table or W's buffer's display table. | |
615 Ignore the specified tables if they are not valid; | |
616 if no valid table is specified, return 0. */ | |
617 | |
618 struct Lisp_Vector * | |
619 window_display_table (w) | |
620 struct window *w; | |
621 { | |
622 Lisp_Object tem; | |
623 tem = w->display_table; | |
9105
984a4b1be1d1
(Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents:
9028
diff
changeset
|
624 if (VECTORP (tem) && XVECTOR (tem)->size == DISP_TABLE_SIZE) |
265 | 625 return XVECTOR (tem); |
626 tem = XBUFFER (w->buffer)->display_table; | |
9105
984a4b1be1d1
(Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents:
9028
diff
changeset
|
627 if (VECTORP (tem) && XVECTOR (tem)->size == DISP_TABLE_SIZE) |
265 | 628 return XVECTOR (tem); |
629 tem = Vstandard_display_table; | |
9105
984a4b1be1d1
(Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents:
9028
diff
changeset
|
630 if (VECTORP (tem) && XVECTOR (tem)->size == DISP_TABLE_SIZE) |
265 | 631 return XVECTOR (tem); |
632 return 0; | |
633 } | |
634 | |
555 | 635 DEFUN ("set-window-display-table", Fset_window_display_table, Sset_window_display_table, 2, 2, 0, |
265 | 636 "Set WINDOW's display-table to TABLE.") |
637 (window, table) | |
638 register Lisp_Object window, table; | |
639 { | |
640 register struct window *w; | |
641 register Lisp_Object z; /* Return value. */ | |
642 | |
643 w = decode_window (window); | |
644 w->display_table = table; | |
645 return table; | |
646 } | |
647 | |
648 /* Record info on buffer window w is displaying | |
649 when it is about to cease to display that buffer. */ | |
650 static | |
651 unshow_buffer (w) | |
652 register struct window *w; | |
653 { | |
6517
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
654 Lisp_Object buf; |
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
655 |
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
656 buf = w->buffer; |
265 | 657 if (XBUFFER (buf) != XMARKER (w->pointm)->buffer) |
658 abort (); | |
659 | |
5990
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
660 #if 0 |
265 | 661 if (w == XWINDOW (selected_window) |
662 || ! EQ (buf, XWINDOW (selected_window)->buffer)) | |
663 /* Do this except when the selected window's buffer | |
664 is being removed from some other window. */ | |
5990
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
665 #endif |
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
666 /* last_window_start records the start position that this buffer |
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
667 had in the last window to be disconnected from it. |
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
668 Now that this statement is unconditional, |
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
669 it is possible for the buffer to be displayed in the |
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
670 selected window, while last_window_start reflects another |
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
671 window which was recently showing the same buffer. |
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
672 Some people might say that might be a good thing. Let's see. */ |
265 | 673 XBUFFER (buf)->last_window_start = marker_position (w->start); |
674 | |
675 /* Point in the selected window's buffer | |
676 is actually stored in that buffer, and the window's pointm isn't used. | |
677 So don't clobber point in that buffer. */ | |
678 if (! EQ (buf, XWINDOW (selected_window)->buffer)) | |
679 BUF_PT (XBUFFER (buf)) | |
680 = clip_to_bounds (BUF_BEGV (XBUFFER (buf)), | |
681 marker_position (w->pointm), | |
682 BUF_ZV (XBUFFER (buf))); | |
683 } | |
684 | |
685 /* Put replacement into the window structure in place of old. */ | |
686 static | |
687 replace_window (old, replacement) | |
688 Lisp_Object old, replacement; | |
689 { | |
690 register Lisp_Object tem; | |
691 register struct window *o = XWINDOW (old), *p = XWINDOW (replacement); | |
692 | |
769 | 693 /* If OLD is its frame's root_window, then replacement is the new |
694 root_window for that frame. */ | |
265 | 695 |
1525
f79a22ad87d0
* window.c (Fwindow_width, Fset_window_hscroll): Use accessors on
Jim Blandy <jimb@redhat.com>
parents:
1444
diff
changeset
|
696 if (EQ (old, FRAME_ROOT_WINDOW (XFRAME (o->frame)))) |
769 | 697 FRAME_ROOT_WINDOW (XFRAME (o->frame)) = replacement; |
265 | 698 |
699 p->left = o->left; | |
700 p->top = o->top; | |
701 p->width = o->width; | |
702 p->height = o->height; | |
703 | |
704 p->next = tem = o->next; | |
485 | 705 if (!NILP (tem)) |
265 | 706 XWINDOW (tem)->prev = replacement; |
707 | |
708 p->prev = tem = o->prev; | |
485 | 709 if (!NILP (tem)) |
265 | 710 XWINDOW (tem)->next = replacement; |
711 | |
712 p->parent = tem = o->parent; | |
485 | 713 if (!NILP (tem)) |
265 | 714 { |
715 if (EQ (XWINDOW (tem)->vchild, old)) | |
716 XWINDOW (tem)->vchild = replacement; | |
717 if (EQ (XWINDOW (tem)->hchild, old)) | |
718 XWINDOW (tem)->hchild = replacement; | |
719 } | |
720 | |
721 /*** Here, if replacement is a vertical combination | |
722 and so is its new parent, we should make replacement's | |
723 children be children of that parent instead. ***/ | |
724 } | |
725 | |
726 DEFUN ("delete-window", Fdelete_window, Sdelete_window, 0, 1, "", | |
727 "Remove WINDOW from the display. Default is selected window.") | |
728 (window) | |
729 register Lisp_Object window; | |
730 { | |
731 register Lisp_Object tem, parent, sib; | |
732 register struct window *p; | |
733 register struct window *par; | |
734 | |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
735 /* Because this function is called by other C code on non-leaf |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
736 windows, the CHECK_LIVE_WINDOW macro would choke inappropriately, |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
737 so we can't decode_window here. */ |
485 | 738 if (NILP (window)) |
265 | 739 window = selected_window; |
740 else | |
741 CHECK_WINDOW (window, 0); | |
742 p = XWINDOW (window); | |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
743 |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
744 /* It's okay to delete an already-deleted window. */ |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
745 if (NILP (p->buffer) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
746 && NILP (p->hchild) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
747 && NILP (p->vchild)) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
748 return Qnil; |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
749 |
265 | 750 parent = p->parent; |
485 | 751 if (NILP (parent)) |
265 | 752 error ("Attempt to delete minibuffer or sole ordinary window"); |
753 par = XWINDOW (parent); | |
754 | |
755 windows_or_buffers_changed++; | |
10666
e1dfb47b664e
(Fdelete_window, set_window_height, set_window_width)
Richard M. Stallman <rms@gnu.org>
parents:
10461
diff
changeset
|
756 FRAME_WINDOW_SIZES_CHANGED (XFRAME (WINDOW_FRAME (p))) = 1; |
265 | 757 |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
758 /* Are we trying to delete any frame's selected window? */ |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
759 { |
3723
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
760 Lisp_Object frame, pwindow; |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
761 |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
762 /* See if the frame's selected window is either WINDOW |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
763 or any subwindow of it, by finding all that window's parents |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
764 and comparing each one with WINDOW. */ |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
765 frame = WINDOW_FRAME (XWINDOW (window)); |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
766 pwindow = FRAME_SELECTED_WINDOW (XFRAME (frame)); |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
767 |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
768 while (!NILP (pwindow)) |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
769 { |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
770 if (EQ (window, pwindow)) |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
771 break; |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
772 pwindow = XWINDOW (pwindow)->parent; |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
773 } |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
774 |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
775 if (EQ (window, pwindow)) |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
776 { |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
777 Lisp_Object alternative; |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
778 alternative = Fnext_window (window, Qlambda, Qnil); |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
779 |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
780 /* If we're about to delete the selected window on the |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
781 selected frame, then we should use Fselect_window to select |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
782 the new window. On the other hand, if we're about to |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
783 delete the selected window on any other frame, we shouldn't do |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
784 anything but set the frame's selected_window slot. */ |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
785 if (EQ (window, selected_window)) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
786 Fselect_window (alternative); |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
787 else |
3723
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
788 FRAME_SELECTED_WINDOW (XFRAME (frame)) = alternative; |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
789 } |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
790 } |
265 | 791 |
792 tem = p->buffer; | |
793 /* tem is null for dummy parent windows | |
794 (which have inferiors but not any contents themselves) */ | |
485 | 795 if (!NILP (tem)) |
265 | 796 { |
797 unshow_buffer (p); | |
798 unchain_marker (p->pointm); | |
799 unchain_marker (p->start); | |
800 } | |
801 | |
802 tem = p->next; | |
485 | 803 if (!NILP (tem)) |
265 | 804 XWINDOW (tem)->prev = p->prev; |
805 | |
806 tem = p->prev; | |
485 | 807 if (!NILP (tem)) |
265 | 808 XWINDOW (tem)->next = p->next; |
809 | |
810 if (EQ (window, par->hchild)) | |
811 par->hchild = p->next; | |
812 if (EQ (window, par->vchild)) | |
813 par->vchild = p->next; | |
814 | |
815 /* Find one of our siblings to give our space to. */ | |
816 sib = p->prev; | |
485 | 817 if (NILP (sib)) |
265 | 818 { |
819 /* If p gives its space to its next sibling, that sibling needs | |
820 to have its top/left side pulled back to where p's is. | |
821 set_window_{height,width} will re-position the sibling's | |
822 children. */ | |
823 sib = p->next; | |
1525
f79a22ad87d0
* window.c (Fwindow_width, Fset_window_hscroll): Use accessors on
Jim Blandy <jimb@redhat.com>
parents:
1444
diff
changeset
|
824 XWINDOW (sib)->top = p->top; |
f79a22ad87d0
* window.c (Fwindow_width, Fset_window_hscroll): Use accessors on
Jim Blandy <jimb@redhat.com>
parents:
1444
diff
changeset
|
825 XWINDOW (sib)->left = p->left; |
265 | 826 } |
827 | |
828 /* Stretch that sibling. */ | |
485 | 829 if (!NILP (par->vchild)) |
265 | 830 set_window_height (sib, |
831 XFASTINT (XWINDOW (sib)->height) + XFASTINT (p->height), | |
832 1); | |
485 | 833 if (!NILP (par->hchild)) |
265 | 834 set_window_width (sib, |
835 XFASTINT (XWINDOW (sib)->width) + XFASTINT (p->width), | |
836 1); | |
837 | |
838 /* If parent now has only one child, | |
839 put the child into the parent's place. */ | |
840 tem = par->hchild; | |
485 | 841 if (NILP (tem)) |
265 | 842 tem = par->vchild; |
485 | 843 if (NILP (XWINDOW (tem)->next)) |
265 | 844 replace_window (parent, tem); |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
845 |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
846 /* Since we may be deleting combination windows, we must make sure that |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
847 not only p but all its children have been marked as deleted. */ |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
848 if (! NILP (p->hchild)) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
849 delete_all_subwindows (XWINDOW (p->hchild)); |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
850 else if (! NILP (p->vchild)) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
851 delete_all_subwindows (XWINDOW (p->vchild)); |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
852 |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
853 /* Mark this window as deleted. */ |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
854 p->buffer = p->hchild = p->vchild = Qnil; |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
855 |
265 | 856 return Qnil; |
857 } | |
858 | |
432 | 859 |
769 | 860 extern Lisp_Object next_frame (), prev_frame (); |
432 | 861 |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
862 /* This comment supplies the doc string for `next-window', |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
863 for make-docfile to see. We cannot put this in the real DEFUN |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
864 due to limits in the Unix cpp. |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
865 |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
866 DEFUN ("next-window", Ffoo, Sfoo, 0, 3, 0, |
432 | 867 "Return next window after WINDOW in canonical ordering of windows.\n\ |
868 If omitted, WINDOW defaults to the selected window.\n\ | |
869 \n\ | |
870 Optional second arg MINIBUF t means count the minibuffer window even\n\ | |
871 if not active. MINIBUF nil or omitted means count the minibuffer iff\n\ | |
872 it is active. MINIBUF neither t nor nil means not to count the\n\ | |
873 minibuffer even if it is active.\n\ | |
874 \n\ | |
769 | 875 Several frames may share a single minibuffer; if the minibuffer\n\ |
876 counts, all windows on all frames that share that minibuffer count\n\ | |
8139 | 877 too. Therefore, `next-window' can be used to iterate through the\n\ |
769 | 878 set of windows even when the minibuffer is on another frame. If the\n\ |
879 minibuffer does not count, only windows from WINDOW's frame count.\n\ | |
432 | 880 \n\ |
769 | 881 Optional third arg ALL-FRAMES t means include windows on all frames.\n\ |
882 ALL-FRAMES nil or omitted means cycle within the frames as specified\n\ | |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
883 above. ALL-FRAMES = `visible' means include windows on all visible frames.\n\ |
8167
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
884 ALL-FRAMES = 0 means include windows on all visible and iconified frames.\n\ |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
885 Anything else means restrict to WINDOW's frame.\n\ |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
886 \n\ |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
887 If you use consistent values for MINIBUF and ALL-FRAMES, you can use\n\ |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
888 `next-window' to iterate through the entire cycle of acceptable\n\ |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
889 windows, eventually ending up back at the window you started with.\n\ |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
890 `previous-window' traverses the same cycle, in the reverse order.") |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
891 (window, minibuf, all_frames) */ |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
892 |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
893 DEFUN ("next-window", Fnext_window, Snext_window, 0, 3, 0, |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
894 0) |
769 | 895 (window, minibuf, all_frames) |
896 register Lisp_Object window, minibuf, all_frames; | |
265 | 897 { |
432 | 898 register Lisp_Object tem; |
899 Lisp_Object start_window; | |
265 | 900 |
485 | 901 if (NILP (window)) |
432 | 902 window = selected_window; |
903 else | |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
904 CHECK_LIVE_WINDOW (window, 0); |
432 | 905 |
906 start_window = window; | |
907 | |
908 /* minibuf == nil may or may not include minibuffers. | |
909 Decide if it does. */ | |
485 | 910 if (NILP (minibuf)) |
432 | 911 minibuf = (minibuf_level ? Qt : Qlambda); |
912 | |
6851
a4cfe12560d0
(Fnext_window, Fprevious_window, Fdisplay_buffer): Test MULTI_FRAME when
Karl Heuer <kwzh@gnu.org>
parents:
6692
diff
changeset
|
913 #ifdef MULTI_FRAME |
8323
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
914 /* all_frames == nil doesn't specify which frames to include. */ |
769 | 915 if (NILP (all_frames)) |
916 all_frames = (EQ (minibuf, Qt) | |
8323
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
917 ? (FRAME_MINIBUF_WINDOW |
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
918 (XFRAME |
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
919 (WINDOW_FRAME |
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
920 (XWINDOW (window))))) |
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
921 : Qnil); |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
922 else if (EQ (all_frames, Qvisible)) |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
923 ; |
8167
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
924 else if (XFASTINT (all_frames) == 0) |
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
925 ; |
769 | 926 else if (! EQ (all_frames, Qt)) |
927 all_frames = Qnil; | |
3621
0576930165ed
(Fscroll_left): Make argument optional.
Richard M. Stallman <rms@gnu.org>
parents:
3535
diff
changeset
|
928 /* Now all_frames is t meaning search all frames, |
0576930165ed
(Fscroll_left): Make argument optional.
Richard M. Stallman <rms@gnu.org>
parents:
3535
diff
changeset
|
929 nil meaning search just current frame, |
8167
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
930 visible meaning search just visible frames, |
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
931 0 meaning search visible and iconified frames, |
3621
0576930165ed
(Fscroll_left): Make argument optional.
Richard M. Stallman <rms@gnu.org>
parents:
3535
diff
changeset
|
932 or a window, meaning search the frame that window belongs to. */ |
6851
a4cfe12560d0
(Fnext_window, Fprevious_window, Fdisplay_buffer): Test MULTI_FRAME when
Karl Heuer <kwzh@gnu.org>
parents:
6692
diff
changeset
|
933 #endif |
432 | 934 |
265 | 935 /* Do this loop at least once, to get the next window, and perhaps |
936 again, if we hit the minibuffer and that is not acceptable. */ | |
937 do | |
938 { | |
939 /* Find a window that actually has a next one. This loop | |
940 climbs up the tree. */ | |
485 | 941 while (tem = XWINDOW (window)->next, NILP (tem)) |
942 if (tem = XWINDOW (window)->parent, !NILP (tem)) | |
265 | 943 window = tem; |
432 | 944 else |
265 | 945 { |
769 | 946 /* We've reached the end of this frame. |
947 Which other frames are acceptable? */ | |
948 tem = WINDOW_FRAME (XWINDOW (window)); | |
949 #ifdef MULTI_FRAME | |
950 if (! NILP (all_frames)) | |
8323
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
951 { |
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
952 Lisp_Object tem1; |
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
953 |
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
954 tem1 = tem; |
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
955 tem = next_frame (tem, all_frames); |
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
956 /* In the case where the minibuffer is active, |
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
957 and we include its frame as well as the selected one, |
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
958 next_frame may get stuck in that frame. |
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
959 If that happens, go back to the selected frame |
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
960 so we can complete the cycle. */ |
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
961 if (EQ (tem, tem1)) |
9282
f4fa46f6a032
(Fminibuffer_window, Fwindow_at, Fwindow_end, Fnext_window, Fprevious_window,
Karl Heuer <kwzh@gnu.org>
parents:
9243
diff
changeset
|
962 XSETFRAME (tem, selected_frame); |
8323
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
963 } |
432 | 964 #endif |
769 | 965 tem = FRAME_ROOT_WINDOW (XFRAME (tem)); |
432 | 966 |
265 | 967 break; |
968 } | |
969 | |
970 window = tem; | |
432 | 971 |
265 | 972 /* If we're in a combination window, find its first child and |
973 recurse on that. Otherwise, we've found the window we want. */ | |
974 while (1) | |
975 { | |
485 | 976 if (!NILP (XWINDOW (window)->hchild)) |
265 | 977 window = XWINDOW (window)->hchild; |
485 | 978 else if (!NILP (XWINDOW (window)->vchild)) |
265 | 979 window = XWINDOW (window)->vchild; |
980 else break; | |
981 } | |
982 } | |
432 | 983 /* Which windows are acceptible? |
984 Exit the loop and accept this window if | |
265 | 985 this isn't a minibuffer window, or |
432 | 986 we're accepting minibuffer windows, or |
987 we've come all the way around and we're back at the original window. */ | |
265 | 988 while (MINI_WINDOW_P (XWINDOW (window)) |
432 | 989 && ! EQ (minibuf, Qt) |
1525
f79a22ad87d0
* window.c (Fwindow_width, Fset_window_hscroll): Use accessors on
Jim Blandy <jimb@redhat.com>
parents:
1444
diff
changeset
|
990 && ! EQ (window, start_window)); |
265 | 991 |
992 return window; | |
993 } | |
994 | |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
995 /* This comment supplies the doc string for `previous-window', |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
996 for make-docfile to see. We cannot put this in the real DEFUN |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
997 due to limits in the Unix cpp. |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
998 |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
999 DEFUN ("previous-window", Ffoo, Sfoo, 0, 3, 0, |
432 | 1000 "Return the window preceeding WINDOW in canonical ordering of windows.\n\ |
1001 If omitted, WINDOW defaults to the selected window.\n\ | |
1002 \n\ | |
1003 Optional second arg MINIBUF t means count the minibuffer window even\n\ | |
1004 if not active. MINIBUF nil or omitted means count the minibuffer iff\n\ | |
1005 it is active. MINIBUF neither t nor nil means not to count the\n\ | |
1006 minibuffer even if it is active.\n\ | |
1007 \n\ | |
769 | 1008 Several frames may share a single minibuffer; if the minibuffer\n\ |
1009 counts, all windows on all frames that share that minibuffer count\n\ | |
8139 | 1010 too. Therefore, `previous-window' can be used to iterate through\n\ |
769 | 1011 the set of windows even when the minibuffer is on another frame. If\n\ |
8139 | 1012 the minibuffer does not count, only windows from WINDOW's frame count\n\ |
432 | 1013 \n\ |
769 | 1014 Optional third arg ALL-FRAMES t means include windows on all frames.\n\ |
1015 ALL-FRAMES nil or omitted means cycle within the frames as specified\n\ | |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1016 above. ALL-FRAMES = `visible' means include windows on all visible frames.\n\ |
8167
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
1017 ALL-FRAMES = 0 means include windows on all visible and iconified frames.\n\ |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1018 Anything else means restrict to WINDOW's frame.\n\ |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
1019 \n\ |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
1020 If you use consistent values for MINIBUF and ALL-FRAMES, you can use\n\ |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
1021 `previous-window' to iterate through the entire cycle of acceptable\n\ |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
1022 windows, eventually ending up back at the window you started with.\n\ |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
1023 `next-window' traverses the same cycle, in the reverse order.") |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1024 (window, minibuf, all_frames) */ |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1025 |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1026 |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1027 DEFUN ("previous-window", Fprevious_window, Sprevious_window, 0, 3, 0, |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1028 0) |
769 | 1029 (window, minibuf, all_frames) |
1030 register Lisp_Object window, minibuf, all_frames; | |
265 | 1031 { |
1032 register Lisp_Object tem; | |
432 | 1033 Lisp_Object start_window; |
265 | 1034 |
485 | 1035 if (NILP (window)) |
265 | 1036 window = selected_window; |
1037 else | |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1038 CHECK_LIVE_WINDOW (window, 0); |
265 | 1039 |
432 | 1040 start_window = window; |
265 | 1041 |
432 | 1042 /* minibuf == nil may or may not include minibuffers. |
1043 Decide if it does. */ | |
485 | 1044 if (NILP (minibuf)) |
432 | 1045 minibuf = (minibuf_level ? Qt : Qlambda); |
265 | 1046 |
6851
a4cfe12560d0
(Fnext_window, Fprevious_window, Fdisplay_buffer): Test MULTI_FRAME when
Karl Heuer <kwzh@gnu.org>
parents:
6692
diff
changeset
|
1047 #ifdef MULTI_FRAME |
769 | 1048 /* all_frames == nil doesn't specify which frames to include. |
1049 Decide which frames it includes. */ | |
1050 if (NILP (all_frames)) | |
1051 all_frames = (EQ (minibuf, Qt) | |
1052 ? (FRAME_MINIBUF_WINDOW | |
1053 (XFRAME | |
1054 (WINDOW_FRAME | |
432 | 1055 (XWINDOW (window))))) |
1056 : Qnil); | |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1057 else if (EQ (all_frames, Qvisible)) |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1058 ; |
8167
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
1059 else if (XFASTINT (all_frames) == 0) |
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
1060 ; |
769 | 1061 else if (! EQ (all_frames, Qt)) |
1062 all_frames = Qnil; | |
3621
0576930165ed
(Fscroll_left): Make argument optional.
Richard M. Stallman <rms@gnu.org>
parents:
3535
diff
changeset
|
1063 /* Now all_frames is t meaning search all frames, |
0576930165ed
(Fscroll_left): Make argument optional.
Richard M. Stallman <rms@gnu.org>
parents:
3535
diff
changeset
|
1064 nil meaning search just current frame, |
8167
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
1065 visible meaning search just visible frames, |
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
1066 0 meaning search visible and iconified frames, |
3621
0576930165ed
(Fscroll_left): Make argument optional.
Richard M. Stallman <rms@gnu.org>
parents:
3535
diff
changeset
|
1067 or a window, meaning search the frame that window belongs to. */ |
6851
a4cfe12560d0
(Fnext_window, Fprevious_window, Fdisplay_buffer): Test MULTI_FRAME when
Karl Heuer <kwzh@gnu.org>
parents:
6692
diff
changeset
|
1068 #endif |
265 | 1069 |
1070 /* Do this loop at least once, to get the previous window, and perhaps | |
1071 again, if we hit the minibuffer and that is not acceptable. */ | |
1072 do | |
1073 { | |
1074 /* Find a window that actually has a previous one. This loop | |
1075 climbs up the tree. */ | |
485 | 1076 while (tem = XWINDOW (window)->prev, NILP (tem)) |
1077 if (tem = XWINDOW (window)->parent, !NILP (tem)) | |
265 | 1078 window = tem; |
432 | 1079 else |
265 | 1080 { |
769 | 1081 /* We have found the top window on the frame. |
1082 Which frames are acceptable? */ | |
1083 tem = WINDOW_FRAME (XWINDOW (window)); | |
1084 #ifdef MULTI_FRAME | |
1085 if (! NILP (all_frames)) | |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
1086 /* It's actually important that we use prev_frame here, |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
1087 rather than next_frame. All the windows acceptable |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
1088 according to the given parameters should form a ring; |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
1089 Fnext_window and Fprevious_window should go back and |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
1090 forth around the ring. If we use next_frame here, |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
1091 then Fnext_window and Fprevious_window take different |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
1092 paths through the set of acceptable windows. |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
1093 window_loop assumes that these `ring' requirement are |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
1094 met. */ |
8323
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
1095 { |
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
1096 Lisp_Object tem1; |
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
1097 |
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
1098 tem1 = tem; |
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
1099 tem = prev_frame (tem, all_frames); |
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
1100 /* In the case where the minibuffer is active, |
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
1101 and we include its frame as well as the selected one, |
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
1102 next_frame may get stuck in that frame. |
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
1103 If that happens, go back to the selected frame |
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
1104 so we can complete the cycle. */ |
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
1105 if (EQ (tem, tem1)) |
9282
f4fa46f6a032
(Fminibuffer_window, Fwindow_at, Fwindow_end, Fnext_window, Fprevious_window,
Karl Heuer <kwzh@gnu.org>
parents:
9243
diff
changeset
|
1106 XSETFRAME (tem, selected_frame); |
8323
30755be9badb
(Fnext_window, Fprevious_window): Don't get stuck in a loop
Richard M. Stallman <rms@gnu.org>
parents:
8263
diff
changeset
|
1107 } |
265 | 1108 #endif |
3621
0576930165ed
(Fscroll_left): Make argument optional.
Richard M. Stallman <rms@gnu.org>
parents:
3535
diff
changeset
|
1109 /* If this frame has a minibuffer, find that window first, |
0576930165ed
(Fscroll_left): Make argument optional.
Richard M. Stallman <rms@gnu.org>
parents:
3535
diff
changeset
|
1110 because it is conceptually the last window in that frame. */ |
3678
01941fa99c91
* window.c (Fprevious_window): Use FRAME_HAS_MINIBUF_P to decide
Jim Blandy <jimb@redhat.com>
parents:
3645
diff
changeset
|
1111 if (FRAME_HAS_MINIBUF_P (XFRAME (tem))) |
01941fa99c91
* window.c (Fprevious_window): Use FRAME_HAS_MINIBUF_P to decide
Jim Blandy <jimb@redhat.com>
parents:
3645
diff
changeset
|
1112 tem = FRAME_MINIBUF_WINDOW (XFRAME (tem)); |
01941fa99c91
* window.c (Fprevious_window): Use FRAME_HAS_MINIBUF_P to decide
Jim Blandy <jimb@redhat.com>
parents:
3645
diff
changeset
|
1113 else |
3621
0576930165ed
(Fscroll_left): Make argument optional.
Richard M. Stallman <rms@gnu.org>
parents:
3535
diff
changeset
|
1114 tem = FRAME_ROOT_WINDOW (XFRAME (tem)); |
432 | 1115 |
265 | 1116 break; |
1117 } | |
1118 | |
1119 window = tem; | |
1120 /* If we're in a combination window, find its last child and | |
1121 recurse on that. Otherwise, we've found the window we want. */ | |
1122 while (1) | |
1123 { | |
485 | 1124 if (!NILP (XWINDOW (window)->hchild)) |
265 | 1125 window = XWINDOW (window)->hchild; |
485 | 1126 else if (!NILP (XWINDOW (window)->vchild)) |
265 | 1127 window = XWINDOW (window)->vchild; |
1128 else break; | |
485 | 1129 while (tem = XWINDOW (window)->next, !NILP (tem)) |
265 | 1130 window = tem; |
1131 } | |
1132 } | |
432 | 1133 /* Which windows are acceptable? |
1134 Exit the loop and accept this window if | |
265 | 1135 this isn't a minibuffer window, or |
432 | 1136 we're accepting minibuffer windows, or |
1137 we've come all the way around and we're back at the original window. */ | |
265 | 1138 while (MINI_WINDOW_P (XWINDOW (window)) |
432 | 1139 && !EQ (minibuf, Qt) |
1525
f79a22ad87d0
* window.c (Fwindow_width, Fset_window_hscroll): Use accessors on
Jim Blandy <jimb@redhat.com>
parents:
1444
diff
changeset
|
1140 && !EQ (window, start_window)); |
265 | 1141 |
1142 return window; | |
1143 } | |
1144 | |
338 | 1145 DEFUN ("other-window", Fother_window, Sother_window, 1, 2, "p", |
769 | 1146 "Select the ARG'th different window on this frame.\n\ |
1147 All windows on current frame are arranged in a cyclic order.\n\ | |
265 | 1148 This command selects the window ARG steps away in that order.\n\ |
1149 A negative ARG moves in the opposite order. If the optional second\n\ | |
769 | 1150 argument ALL_FRAMES is non-nil, cycle through all frames.") |
1151 (n, all_frames) | |
1152 register Lisp_Object n, all_frames; | |
265 | 1153 { |
1154 register int i; | |
1155 register Lisp_Object w; | |
1156 | |
1157 CHECK_NUMBER (n, 0); | |
1158 w = selected_window; | |
1159 i = XINT (n); | |
1160 | |
1161 while (i > 0) | |
1162 { | |
769 | 1163 w = Fnext_window (w, Qnil, all_frames); |
265 | 1164 i--; |
1165 } | |
1166 while (i < 0) | |
1167 { | |
769 | 1168 w = Fprevious_window (w, Qnil, all_frames); |
265 | 1169 i++; |
1170 } | |
1171 Fselect_window (w); | |
1172 return Qnil; | |
1173 } | |
1174 | |
1175 /* Look at all windows, performing an operation specified by TYPE | |
1176 with argument OBJ. | |
3785
3455cbb3339d
Don't let the 'B' interactive spec default to buffers viewed in
Jim Blandy <jimb@redhat.com>
parents:
3765
diff
changeset
|
1177 If FRAMES is Qt, look at all frames; |
3455cbb3339d
Don't let the 'B' interactive spec default to buffers viewed in
Jim Blandy <jimb@redhat.com>
parents:
3765
diff
changeset
|
1178 Qnil, look at just the selected frame; |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1179 Qvisible, look at visible frames; |
3785
3455cbb3339d
Don't let the 'B' interactive spec default to buffers viewed in
Jim Blandy <jimb@redhat.com>
parents:
3765
diff
changeset
|
1180 a frame, just look at windows on that frame. |
265 | 1181 If MINI is non-zero, perform the operation on minibuffer windows too. |
1182 */ | |
1183 | |
1184 enum window_loop | |
1185 { | |
1186 WINDOW_LOOP_UNUSED, | |
1187 GET_BUFFER_WINDOW, /* Arg is buffer */ | |
1188 GET_LRU_WINDOW, /* Arg is t for full-width windows only */ | |
1189 DELETE_OTHER_WINDOWS, /* Arg is window not to delete */ | |
1190 DELETE_BUFFER_WINDOWS, /* Arg is buffer */ | |
1191 GET_LARGEST_WINDOW, | |
4570
eee89de88c9d
(enum window_loop): Delete final comma.
Richard M. Stallman <rms@gnu.org>
parents:
4564
diff
changeset
|
1192 UNSHOW_BUFFER /* Arg is buffer */ |
265 | 1193 }; |
1194 | |
1195 static Lisp_Object | |
769 | 1196 window_loop (type, obj, mini, frames) |
265 | 1197 enum window_loop type; |
769 | 1198 register Lisp_Object obj, frames; |
265 | 1199 int mini; |
1200 { | |
1201 register Lisp_Object w; | |
1202 register Lisp_Object best_window; | |
1203 register Lisp_Object next_window; | |
983
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
1204 register Lisp_Object last_window; |
769 | 1205 FRAME_PTR frame; |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1206 Lisp_Object frame_arg; |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1207 frame_arg = Qt; |
265 | 1208 |
983
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
1209 #ifdef MULTI_FRAME |
769 | 1210 /* If we're only looping through windows on a particular frame, |
1211 frame points to that frame. If we're looping through windows | |
1212 on all frames, frame is 0. */ | |
1213 if (FRAMEP (frames)) | |
1214 frame = XFRAME (frames); | |
1215 else if (NILP (frames)) | |
1216 frame = selected_frame; | |
265 | 1217 else |
769 | 1218 frame = 0; |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1219 if (frame) |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1220 frame_arg = Qlambda; |
8167
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
1221 else if (XFASTINT (frames) == 0) |
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
1222 frame_arg = frames; |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1223 else if (EQ (frames, Qvisible)) |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1224 frame_arg = frames; |
983
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
1225 #else |
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
1226 frame = 0; |
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
1227 #endif |
265 | 1228 |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1229 /* frame_arg is Qlambda to stick to one frame, |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1230 Qvisible to consider all visible frames, |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1231 or Qt otherwise. */ |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1232 |
265 | 1233 /* Pick a window to start with. */ |
9105
984a4b1be1d1
(Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents:
9028
diff
changeset
|
1234 if (WINDOWP (obj)) |
983
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
1235 w = obj; |
769 | 1236 else if (frame) |
983
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
1237 w = FRAME_SELECTED_WINDOW (frame); |
265 | 1238 else |
983
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
1239 w = FRAME_SELECTED_WINDOW (selected_frame); |
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
1240 |
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
1241 /* Figure out the last window we're going to mess with. Since |
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
1242 Fnext_window, given the same options, is guaranteed to go in a |
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
1243 ring, we can just use Fprevious_window to find the last one. |
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
1244 |
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
1245 We can't just wait until we hit the first window again, because |
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
1246 it might be deleted. */ |
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
1247 |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1248 last_window = Fprevious_window (w, mini ? Qt : Qnil, frame_arg); |
983
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
1249 |
265 | 1250 best_window = Qnil; |
983
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
1251 for (;;) |
265 | 1252 { |
3785
3455cbb3339d
Don't let the 'B' interactive spec default to buffers viewed in
Jim Blandy <jimb@redhat.com>
parents:
3765
diff
changeset
|
1253 FRAME_PTR w_frame = XFRAME (WINDOW_FRAME (XWINDOW (w))); |
3455cbb3339d
Don't let the 'B' interactive spec default to buffers viewed in
Jim Blandy <jimb@redhat.com>
parents:
3765
diff
changeset
|
1254 |
265 | 1255 /* Pick the next window now, since some operations will delete |
1256 the current window. */ | |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1257 next_window = Fnext_window (w, mini ? Qt : Qnil, frame_arg); |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1258 |
6268
43853122823f
(window_loop): Delete MULTI_FRAME
Richard M. Stallman <rms@gnu.org>
parents:
6267
diff
changeset
|
1259 /* Note that we do not pay attention here to whether |
43853122823f
(window_loop): Delete MULTI_FRAME
Richard M. Stallman <rms@gnu.org>
parents:
6267
diff
changeset
|
1260 the frame is visible, since Fnext_window skips non-visible frames |
43853122823f
(window_loop): Delete MULTI_FRAME
Richard M. Stallman <rms@gnu.org>
parents:
6267
diff
changeset
|
1261 if that is desired, under the control of frame_arg. */ |
3785
3455cbb3339d
Don't let the 'B' interactive spec default to buffers viewed in
Jim Blandy <jimb@redhat.com>
parents:
3765
diff
changeset
|
1262 if (! MINI_WINDOW_P (XWINDOW (w)) |
265 | 1263 || (mini && minibuf_level > 0)) |
1264 switch (type) | |
1265 { | |
1266 case GET_BUFFER_WINDOW: | |
1267 if (XBUFFER (XWINDOW (w)->buffer) == XBUFFER (obj)) | |
1268 return w; | |
1269 break; | |
1270 | |
1271 case GET_LRU_WINDOW: | |
1272 /* t as arg means consider only full-width windows */ | |
732 | 1273 if (!NILP (obj) && XFASTINT (XWINDOW (w)->width) |
3164
40590cba332a
(window_loop, case GET_LRU_WINDOW): Get frame's width properly.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1274 != FRAME_WIDTH (XFRAME (WINDOW_FRAME (XWINDOW (w))))) |
265 | 1275 break; |
1276 /* Ignore dedicated windows and minibuffers. */ | |
1277 if (MINI_WINDOW_P (XWINDOW (w)) | |
485 | 1278 || !NILP (XWINDOW (w)->dedicated)) |
265 | 1279 break; |
485 | 1280 if (NILP (best_window) |
265 | 1281 || (XFASTINT (XWINDOW (best_window)->use_time) |
1282 > XFASTINT (XWINDOW (w)->use_time))) | |
1283 best_window = w; | |
1284 break; | |
1285 | |
1286 case DELETE_OTHER_WINDOWS: | |
1287 if (XWINDOW (w) != XWINDOW (obj)) | |
1288 Fdelete_window (w); | |
1289 break; | |
1290 | |
1291 case DELETE_BUFFER_WINDOWS: | |
1292 if (EQ (XWINDOW (w)->buffer, obj)) | |
1293 { | |
1294 /* If we're deleting the buffer displayed in the only window | |
769 | 1295 on the frame, find a new buffer to display there. */ |
485 | 1296 if (NILP (XWINDOW (w)->parent)) |
265 | 1297 { |
6517
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1298 Lisp_Object new_buffer; |
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1299 new_buffer = Fother_buffer (obj, Qnil); |
485 | 1300 if (NILP (new_buffer)) |
265 | 1301 new_buffer |
1302 = Fget_buffer_create (build_string ("*scratch*")); | |
1303 Fset_window_buffer (w, new_buffer); | |
5096
76f878905c65
(window_loop, case DELETE_BUFFER_WINDOWS):
Richard M. Stallman <rms@gnu.org>
parents:
4776
diff
changeset
|
1304 if (EQ (w, selected_window)) |
76f878905c65
(window_loop, case DELETE_BUFFER_WINDOWS):
Richard M. Stallman <rms@gnu.org>
parents:
4776
diff
changeset
|
1305 Fset_buffer (XWINDOW (w)->buffer); |
265 | 1306 } |
1307 else | |
1308 Fdelete_window (w); | |
1309 } | |
1310 break; | |
1311 | |
1312 case GET_LARGEST_WINDOW: | |
1313 /* Ignore dedicated windows and minibuffers. */ | |
1314 if (MINI_WINDOW_P (XWINDOW (w)) | |
485 | 1315 || !NILP (XWINDOW (w)->dedicated)) |
265 | 1316 break; |
1317 { | |
1318 struct window *best_window_ptr = XWINDOW (best_window); | |
1319 struct window *w_ptr = XWINDOW (w); | |
7618
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
1320 if (NILP (best_window) |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
1321 || (XFASTINT (w_ptr->height) * XFASTINT (w_ptr->width) |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
1322 > (XFASTINT (best_window_ptr->height) |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
1323 * XFASTINT (best_window_ptr->width)))) |
265 | 1324 best_window = w; |
1325 } | |
1326 break; | |
1327 | |
1328 case UNSHOW_BUFFER: | |
1329 if (EQ (XWINDOW (w)->buffer, obj)) | |
1330 { | |
1331 /* Find another buffer to show in this window. */ | |
6517
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1332 Lisp_Object another_buffer; |
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
1333 FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (w))); |
6517
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1334 another_buffer = Fother_buffer (obj, Qnil); |
485 | 1335 if (NILP (another_buffer)) |
265 | 1336 another_buffer |
1337 = Fget_buffer_create (build_string ("*scratch*")); | |
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
1338 #ifdef MULTI_FRAME |
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
1339 /* If this window is dedicated, and in a frame of its own, |
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
1340 kill the frame. */ |
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
1341 if (EQ (w, FRAME_ROOT_WINDOW (f)) |
7663
eb26954fb767
(window_loop): Fix test of dedicated flag in prev change.
Richard M. Stallman <rms@gnu.org>
parents:
7647
diff
changeset
|
1342 && !NILP (XWINDOW (w)->dedicated) |
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
1343 && other_visible_frames (f)) |
8536
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1344 { |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1345 /* Skip the other windows on this frame. |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1346 There might be one, the minibuffer! */ |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1347 if (! EQ (w, last_window)) |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1348 while (f == XFRAME (WINDOW_FRAME (XWINDOW (next_window)))) |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1349 { |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1350 /* As we go, check for the end of the loop. |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1351 We mustn't start going around a second time. */ |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1352 if (EQ (next_window, last_window)) |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1353 { |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1354 last_window = w; |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1355 break; |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1356 } |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1357 next_window = Fnext_window (next_window, |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1358 mini ? Qt : Qnil, |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1359 frame_arg); |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1360 } |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1361 /* Now we can safely delete the frame. */ |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1362 Fdelete_frame (WINDOW_FRAME (XWINDOW (w)), Qnil); |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
1363 } |
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
1364 else |
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
1365 #endif |
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
1366 { |
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
1367 /* Otherwise show a different buffer in the window. */ |
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
1368 XWINDOW (w)->dedicated = Qnil; |
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
1369 Fset_window_buffer (w, another_buffer); |
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
1370 if (EQ (w, selected_window)) |
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
1371 Fset_buffer (XWINDOW (w)->buffer); |
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
1372 } |
265 | 1373 } |
1374 break; | |
1375 } | |
983
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
1376 |
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
1377 if (EQ (w, last_window)) |
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
1378 break; |
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
1379 |
265 | 1380 w = next_window; |
1381 } | |
1382 | |
1383 return best_window; | |
1384 } | |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1385 |
265 | 1386 DEFUN ("get-lru-window", Fget_lru_window, Sget_lru_window, 0, 1, 0, |
1387 "Return the window least recently selected or used for display.\n\ | |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1388 If optional argument FRAME is `visible', search all visible frames.\n\ |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1389 If FRAME is 0, search all visible and iconified frames.\n\ |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1390 If FRAME is t, search all frames.\n\ |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1391 If FRAME is nil, search only the selected frame.\n\ |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1392 If FRAME is a frame, search only that frame.") |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1393 (frame) |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1394 Lisp_Object frame; |
265 | 1395 { |
1396 register Lisp_Object w; | |
1397 /* First try for a window that is full-width */ | |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1398 w = window_loop (GET_LRU_WINDOW, Qt, 0, frame); |
485 | 1399 if (!NILP (w) && !EQ (w, selected_window)) |
265 | 1400 return w; |
1401 /* If none of them, try the rest */ | |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1402 return window_loop (GET_LRU_WINDOW, Qnil, 0, frame); |
265 | 1403 } |
1404 | |
1405 DEFUN ("get-largest-window", Fget_largest_window, Sget_largest_window, 0, 1, 0, | |
1406 "Return the largest window in area.\n\ | |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1407 If optional argument FRAME is `visible', search all visible frames.\n\ |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1408 If FRAME is 0, search all visible and iconified frames.\n\ |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1409 If FRAME is t, search all frames.\n\ |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1410 If FRAME is nil, search only the selected frame.\n\ |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1411 If FRAME is a frame, search only that frame.") |
769 | 1412 (frame) |
1413 Lisp_Object frame; | |
265 | 1414 { |
1415 return window_loop (GET_LARGEST_WINDOW, Qnil, 0, | |
769 | 1416 frame); |
265 | 1417 } |
1418 | |
1419 DEFUN ("get-buffer-window", Fget_buffer_window, Sget_buffer_window, 1, 2, 0, | |
1420 "Return a window currently displaying BUFFER, or nil if none.\n\ | |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1421 If optional argument FRAME is `visible', search all visible frames.\n\ |
8167
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
1422 If optional argument FRAME is 0, search all visible and iconified frames.\n\ |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1423 If FRAME is t, search all frames.\n\ |
3803
c267c2431d92
Don't let the 'B' interactive spec default to buffers viewed in
Jim Blandy <jimb@redhat.com>
parents:
3785
diff
changeset
|
1424 If FRAME is nil, search only the selected frame.\n\ |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1425 If FRAME is a frame, search only that frame.") |
769 | 1426 (buffer, frame) |
1427 Lisp_Object buffer, frame; | |
265 | 1428 { |
1429 buffer = Fget_buffer (buffer); | |
9105
984a4b1be1d1
(Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents:
9028
diff
changeset
|
1430 if (BUFFERP (buffer)) |
769 | 1431 return window_loop (GET_BUFFER_WINDOW, buffer, 1, frame); |
265 | 1432 else |
1433 return Qnil; | |
1434 } | |
1435 | |
1436 DEFUN ("delete-other-windows", Fdelete_other_windows, Sdelete_other_windows, | |
1437 0, 1, "", | |
769 | 1438 "Make WINDOW (or the selected window) fill its frame.\n\ |
4564
9fc21d8d9441
(Frecenter): Preserve point in the buffer we change it in.
Richard M. Stallman <rms@gnu.org>
parents:
4347
diff
changeset
|
1439 Only the frame WINDOW is on is affected.\n\ |
9fc21d8d9441
(Frecenter): Preserve point in the buffer we change it in.
Richard M. Stallman <rms@gnu.org>
parents:
4347
diff
changeset
|
1440 This function tries to reduce display jumps\n\ |
9fc21d8d9441
(Frecenter): Preserve point in the buffer we change it in.
Richard M. Stallman <rms@gnu.org>
parents:
4347
diff
changeset
|
1441 by keeping the text previously visible in WINDOW\n\ |
9fc21d8d9441
(Frecenter): Preserve point in the buffer we change it in.
Richard M. Stallman <rms@gnu.org>
parents:
4347
diff
changeset
|
1442 in the same place on the frame. Doing this depends on\n\ |
9fc21d8d9441
(Frecenter): Preserve point in the buffer we change it in.
Richard M. Stallman <rms@gnu.org>
parents:
4347
diff
changeset
|
1443 the value of (window-start WINDOW), so if calling this function\n\ |
9fc21d8d9441
(Frecenter): Preserve point in the buffer we change it in.
Richard M. Stallman <rms@gnu.org>
parents:
4347
diff
changeset
|
1444 in a program gives strange scrolling, make sure the window-start\n\ |
9fc21d8d9441
(Frecenter): Preserve point in the buffer we change it in.
Richard M. Stallman <rms@gnu.org>
parents:
4347
diff
changeset
|
1445 value is reasonable when this function is called.") |
265 | 1446 (window) |
1447 Lisp_Object window; | |
1448 { | |
1449 struct window *w; | |
7348
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1450 int startpos; |
265 | 1451 int top; |
1452 | |
485 | 1453 if (NILP (window)) |
265 | 1454 window = selected_window; |
1455 else | |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1456 CHECK_LIVE_WINDOW (window, 0); |
265 | 1457 |
1458 w = XWINDOW (window); | |
9028
74119e5602eb
(Fdelete_other_windows): Nice error if WINDOW is minibuf.
Richard M. Stallman <rms@gnu.org>
parents:
8991
diff
changeset
|
1459 |
7348
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1460 startpos = marker_position (w->start); |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1461 top = XFASTINT (w->top) - FRAME_MENU_BAR_LINES (XFRAME (WINDOW_FRAME (w))); |
265 | 1462 |
9028
74119e5602eb
(Fdelete_other_windows): Nice error if WINDOW is minibuf.
Richard M. Stallman <rms@gnu.org>
parents:
8991
diff
changeset
|
1463 if (MINI_WINDOW_P (w) && top > 0) |
74119e5602eb
(Fdelete_other_windows): Nice error if WINDOW is minibuf.
Richard M. Stallman <rms@gnu.org>
parents:
8991
diff
changeset
|
1464 error ("Can't expand minibuffer to full frame"); |
74119e5602eb
(Fdelete_other_windows): Nice error if WINDOW is minibuf.
Richard M. Stallman <rms@gnu.org>
parents:
8991
diff
changeset
|
1465 |
2190
482c7827b968
(Fdelete_other_windows): Handle FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
1466 window_loop (DELETE_OTHER_WINDOWS, window, 0, WINDOW_FRAME (w)); |
265 | 1467 |
7348
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1468 /* Try to minimize scrolling, by setting the window start to the point |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1469 will cause the text at the old window start to be at the same place |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1470 on the frame. But don't try to do this if the window start is |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1471 outside the visible portion (as might happen when the display is |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1472 not current, due to typeahead). */ |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1473 if (startpos >= BUF_BEGV (XBUFFER (w->buffer)) |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1474 && startpos <= BUF_ZV (XBUFFER (w->buffer))) |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1475 { |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1476 struct position pos; |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1477 struct buffer *obuf = current_buffer; |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1478 |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1479 Fset_buffer (w->buffer); |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1480 /* This computation used to temporarily move point, but that can |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1481 have unwanted side effects due to text properties. */ |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1482 pos = *vmotion (startpos, -top, window_internal_width (w) - 1, |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1483 XINT (w->hscroll), window); |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1484 Fset_marker (w->start, make_number (pos.bufpos), w->buffer); |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1485 w->start_at_line_beg = ((pos.bufpos == BEGV |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1486 || FETCH_CHAR (pos.bufpos - 1) == '\n') ? Qt |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1487 : Qnil); |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1488 |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1489 set_buffer_internal (obuf); |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
1490 } |
265 | 1491 return Qnil; |
1492 } | |
1493 | |
1494 DEFUN ("delete-windows-on", Fdelete_windows_on, Sdelete_windows_on, | |
4776
fdca0d445357
(Fdelete_windows_on): Fix DEFUN to allow optional second arg to appear.
Brian Fox <bfox@gnu.org>
parents:
4696
diff
changeset
|
1495 1, 2, "bDelete windows on (buffer): ", |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1496 "Delete all windows showing BUFFER.\n\ |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1497 Optional second argument FRAME controls which frames are affected.\n\ |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1498 If nil or omitted, delete all windows showing BUFFER in any frame.\n\ |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1499 If t, delete only windows showing BUFFER in the selected frame.\n\ |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1500 If `visible', delete all windows showing BUFFER in any visible frame.\n\ |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1501 If a frame, delete only windows showing BUFFER in that frame.") |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1502 (buffer, frame) |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1503 Lisp_Object buffer, frame; |
265 | 1504 { |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1505 #ifdef MULTI_FRAME |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1506 /* FRAME uses t and nil to mean the opposite of what window_loop |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1507 expects. */ |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1508 if (! FRAMEP (frame)) |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1509 frame = NILP (frame) ? Qt : Qnil; |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1510 #else |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1511 frame = Qt; |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1512 #endif |
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1513 |
485 | 1514 if (!NILP (buffer)) |
265 | 1515 { |
1516 buffer = Fget_buffer (buffer); | |
1517 CHECK_BUFFER (buffer, 0); | |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1518 window_loop (DELETE_BUFFER_WINDOWS, buffer, 0, frame); |
265 | 1519 } |
1520 return Qnil; | |
1521 } | |
1522 | |
1523 DEFUN ("replace-buffer-in-windows", Freplace_buffer_in_windows, | |
1524 Sreplace_buffer_in_windows, | |
1525 1, 1, "bReplace buffer in windows: ", | |
1526 "Replace BUFFER with some other buffer in all windows showing it.") | |
1527 (buffer) | |
1528 Lisp_Object buffer; | |
1529 { | |
485 | 1530 if (!NILP (buffer)) |
265 | 1531 { |
1532 buffer = Fget_buffer (buffer); | |
1533 CHECK_BUFFER (buffer, 0); | |
1534 window_loop (UNSHOW_BUFFER, buffer, 0, Qt); | |
1535 } | |
1536 return Qnil; | |
1537 } | |
1538 | |
1539 /* Set the height of WINDOW and all its inferiors. */ | |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1540 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1541 /* The smallest acceptable dimensions for a window. Anything smaller |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1542 might crash Emacs. */ |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1543 #define MIN_SAFE_WINDOW_WIDTH (2) |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1544 #define MIN_SAFE_WINDOW_HEIGHT (2) |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1545 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1546 /* Make sure that window_min_height and window_min_width are |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1547 not too small; if they are, set them to safe minima. */ |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1548 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1549 static void |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1550 check_min_window_sizes () |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1551 { |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1552 /* Smaller values might permit a crash. */ |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1553 if (window_min_width < MIN_SAFE_WINDOW_WIDTH) |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1554 window_min_width = MIN_SAFE_WINDOW_WIDTH; |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1555 if (window_min_height < MIN_SAFE_WINDOW_HEIGHT) |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1556 window_min_height = MIN_SAFE_WINDOW_HEIGHT; |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1557 } |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1558 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1559 /* If *ROWS or *COLS are too small a size for FRAME, set them to the |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1560 minimum allowable size. */ |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1561 void |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1562 check_frame_size (frame, rows, cols) |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1563 FRAME_PTR frame; |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1564 int *rows, *cols; |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1565 { |
4347
d6b289b1a6dc
* window.c (check_frame_size): Include the menu bar height in the
Jim Blandy <jimb@redhat.com>
parents:
4292
diff
changeset
|
1566 /* For height, we have to see: |
d6b289b1a6dc
* window.c (check_frame_size): Include the menu bar height in the
Jim Blandy <jimb@redhat.com>
parents:
4292
diff
changeset
|
1567 whether the frame has a minibuffer, |
d6b289b1a6dc
* window.c (check_frame_size): Include the menu bar height in the
Jim Blandy <jimb@redhat.com>
parents:
4292
diff
changeset
|
1568 whether it wants a mode line, and |
d6b289b1a6dc
* window.c (check_frame_size): Include the menu bar height in the
Jim Blandy <jimb@redhat.com>
parents:
4292
diff
changeset
|
1569 whether it has a menu bar. */ |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1570 int min_height = |
3765
bde2da377085
* window.c (check_frame_size): Allow minibuffer-only frames to be
Jim Blandy <jimb@redhat.com>
parents:
3723
diff
changeset
|
1571 (FRAME_MINIBUF_ONLY_P (frame) ? MIN_SAFE_WINDOW_HEIGHT - 1 |
bde2da377085
* window.c (check_frame_size): Allow minibuffer-only frames to be
Jim Blandy <jimb@redhat.com>
parents:
3723
diff
changeset
|
1572 : (! FRAME_HAS_MINIBUF_P (frame)) ? MIN_SAFE_WINDOW_HEIGHT |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1573 : 2 * MIN_SAFE_WINDOW_HEIGHT - 1); |
4347
d6b289b1a6dc
* window.c (check_frame_size): Include the menu bar height in the
Jim Blandy <jimb@redhat.com>
parents:
4292
diff
changeset
|
1574 if (FRAME_MENU_BAR_LINES (frame) > 0) |
d6b289b1a6dc
* window.c (check_frame_size): Include the menu bar height in the
Jim Blandy <jimb@redhat.com>
parents:
4292
diff
changeset
|
1575 min_height += FRAME_MENU_BAR_LINES (frame); |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1576 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1577 if (*rows < min_height) |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1578 *rows = min_height; |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1579 if (*cols < MIN_SAFE_WINDOW_WIDTH) |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1580 *cols = MIN_SAFE_WINDOW_WIDTH; |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1581 } |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1582 |
265 | 1583 /* Normally the window is deleted if it gets too small. |
1584 nodelete nonzero means do not do this. | |
1585 (The caller should check later and do so if appropriate) */ | |
1586 | |
1587 set_window_height (window, height, nodelete) | |
1588 Lisp_Object window; | |
1589 int height; | |
1590 int nodelete; | |
1591 { | |
1592 register struct window *w = XWINDOW (window); | |
1593 register struct window *c; | |
1594 int oheight = XFASTINT (w->height); | |
1595 int top, pos, lastbot, opos, lastobot; | |
1596 Lisp_Object child; | |
1597 | |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1598 check_min_window_sizes (); |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
1599 |
265 | 1600 if (!nodelete |
485 | 1601 && ! NILP (w->parent) |
265 | 1602 && height < window_min_height) |
1603 { | |
1604 Fdelete_window (window); | |
1605 return; | |
1606 } | |
1607 | |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
1608 XSETFASTINT (w->last_modified, 0); |
265 | 1609 windows_or_buffers_changed++; |
10666
e1dfb47b664e
(Fdelete_window, set_window_height, set_window_width)
Richard M. Stallman <rms@gnu.org>
parents:
10461
diff
changeset
|
1610 FRAME_WINDOW_SIZES_CHANGED (XFRAME (WINDOW_FRAME (w))) = 1; |
e1dfb47b664e
(Fdelete_window, set_window_height, set_window_width)
Richard M. Stallman <rms@gnu.org>
parents:
10461
diff
changeset
|
1611 |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
1612 XSETFASTINT (w->height, height); |
485 | 1613 if (!NILP (w->hchild)) |
265 | 1614 { |
485 | 1615 for (child = w->hchild; !NILP (child); child = XWINDOW (child)->next) |
265 | 1616 { |
1617 XWINDOW (child)->top = w->top; | |
1618 set_window_height (child, height, nodelete); | |
1619 } | |
1620 } | |
485 | 1621 else if (!NILP (w->vchild)) |
265 | 1622 { |
1623 lastbot = top = XFASTINT (w->top); | |
1624 lastobot = 0; | |
485 | 1625 for (child = w->vchild; !NILP (child); child = c->next) |
265 | 1626 { |
1627 c = XWINDOW (child); | |
1628 | |
1629 opos = lastobot + XFASTINT (c->height); | |
1630 | |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
1631 XSETFASTINT (c->top, lastbot); |
265 | 1632 |
1633 pos = (((opos * height) << 1) + oheight) / (oheight << 1); | |
1634 | |
1635 /* Avoid confusion: inhibit deletion of child if becomes too small */ | |
1636 set_window_height (child, pos + top - lastbot, 1); | |
1637 | |
1638 /* Now advance child to next window, | |
1639 and set lastbot if child was not just deleted. */ | |
1640 lastbot = pos + top; | |
1641 lastobot = opos; | |
1642 } | |
1643 /* Now delete any children that became too small. */ | |
1644 if (!nodelete) | |
485 | 1645 for (child = w->vchild; !NILP (child); child = XWINDOW (child)->next) |
265 | 1646 { |
1647 set_window_height (child, XINT (XWINDOW (child)->height), 0); | |
1648 } | |
1649 } | |
1650 } | |
1651 | |
1652 /* Recursively set width of WINDOW and its inferiors. */ | |
1653 | |
1654 set_window_width (window, width, nodelete) | |
1655 Lisp_Object window; | |
1656 int width; | |
1657 int nodelete; | |
1658 { | |
1659 register struct window *w = XWINDOW (window); | |
1660 register struct window *c; | |
1661 int owidth = XFASTINT (w->width); | |
1662 int left, pos, lastright, opos, lastoright; | |
1663 Lisp_Object child; | |
1664 | |
6982
5137d3777e4a
(set_window_width): Don't delete root window for being too narrow.
Richard M. Stallman <rms@gnu.org>
parents:
6852
diff
changeset
|
1665 if (!nodelete && width < window_min_width && !NILP (w->parent)) |
265 | 1666 { |
1667 Fdelete_window (window); | |
1668 return; | |
1669 } | |
1670 | |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
1671 XSETFASTINT (w->last_modified, 0); |
265 | 1672 windows_or_buffers_changed++; |
10666
e1dfb47b664e
(Fdelete_window, set_window_height, set_window_width)
Richard M. Stallman <rms@gnu.org>
parents:
10461
diff
changeset
|
1673 FRAME_WINDOW_SIZES_CHANGED (XFRAME (WINDOW_FRAME (w))) = 1; |
e1dfb47b664e
(Fdelete_window, set_window_height, set_window_width)
Richard M. Stallman <rms@gnu.org>
parents:
10461
diff
changeset
|
1674 |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
1675 XSETFASTINT (w->width, width); |
485 | 1676 if (!NILP (w->vchild)) |
265 | 1677 { |
485 | 1678 for (child = w->vchild; !NILP (child); child = XWINDOW (child)->next) |
265 | 1679 { |
1680 XWINDOW (child)->left = w->left; | |
1681 set_window_width (child, width, nodelete); | |
1682 } | |
1683 } | |
485 | 1684 else if (!NILP (w->hchild)) |
265 | 1685 { |
1686 lastright = left = XFASTINT (w->left); | |
1687 lastoright = 0; | |
485 | 1688 for (child = w->hchild; !NILP (child); child = c->next) |
265 | 1689 { |
1690 c = XWINDOW (child); | |
1691 | |
1692 opos = lastoright + XFASTINT (c->width); | |
1693 | |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
1694 XSETFASTINT (c->left, lastright); |
265 | 1695 |
1696 pos = (((opos * width) << 1) + owidth) / (owidth << 1); | |
1697 | |
1698 /* Inhibit deletion for becoming too small */ | |
1699 set_window_width (child, pos + left - lastright, 1); | |
1700 | |
1701 /* Now advance child to next window, | |
1702 and set lastright if child was not just deleted. */ | |
1703 lastright = pos + left, lastoright = opos; | |
1704 } | |
1705 /* Delete children that became too small */ | |
1706 if (!nodelete) | |
485 | 1707 for (child = w->hchild; !NILP (child); child = XWINDOW (child)->next) |
265 | 1708 { |
1709 set_window_width (child, XINT (XWINDOW (child)->width), 0); | |
1710 } | |
1711 } | |
1712 } | |
1713 | |
362 | 1714 int window_select_count; |
265 | 1715 |
1716 DEFUN ("set-window-buffer", Fset_window_buffer, Sset_window_buffer, 2, 2, 0, | |
1717 "Make WINDOW display BUFFER as its contents.\n\ | |
1718 BUFFER can be a buffer or buffer name.") | |
1719 (window, buffer) | |
1720 register Lisp_Object window, buffer; | |
1721 { | |
1722 register Lisp_Object tem; | |
1723 register struct window *w = decode_window (window); | |
1724 | |
1725 buffer = Fget_buffer (buffer); | |
1726 CHECK_BUFFER (buffer, 1); | |
1727 | |
485 | 1728 if (NILP (XBUFFER (buffer)->name)) |
265 | 1729 error ("Attempt to display deleted buffer"); |
1730 | |
1731 tem = w->buffer; | |
485 | 1732 if (NILP (tem)) |
265 | 1733 error ("Window is deleted"); |
1734 else if (! EQ (tem, Qt)) /* w->buffer is t when the window | |
1735 is first being set up. */ | |
1736 { | |
485 | 1737 if (!NILP (w->dedicated) && !EQ (tem, buffer)) |
7545
0e1f3b9598bb
(Fset_window_buffer): Fix dedicated window error call.
Richard M. Stallman <rms@gnu.org>
parents:
7348
diff
changeset
|
1738 error ("Window is dedicated to `%s'", |
0e1f3b9598bb
(Fset_window_buffer): Fix dedicated window error call.
Richard M. Stallman <rms@gnu.org>
parents:
7348
diff
changeset
|
1739 XSTRING (XBUFFER (tem)->name)->data); |
265 | 1740 |
1741 unshow_buffer (w); | |
1742 } | |
1743 | |
1744 w->buffer = buffer; | |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
1745 XSETFASTINT (w->window_end_pos, 0); |
4292
990f6ee7f527
(Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents:
4145
diff
changeset
|
1746 w->window_end_valid = Qnil; |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
1747 XSETFASTINT(w->hscroll, 0); |
265 | 1748 Fset_marker (w->pointm, |
1749 make_number (BUF_PT (XBUFFER (buffer))), | |
1750 buffer); | |
1751 set_marker_restricted (w->start, | |
1752 make_number (XBUFFER (buffer)->last_window_start), | |
1753 buffer); | |
1754 w->start_at_line_beg = Qnil; | |
3354
0b71a5329961
(Fset_window_buffer): Set window's force_start to Qnil.
Richard M. Stallman <rms@gnu.org>
parents:
3164
diff
changeset
|
1755 w->force_start = Qnil; |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
1756 XSETFASTINT (w->last_modified, 0); |
265 | 1757 windows_or_buffers_changed++; |
1758 if (EQ (window, selected_window)) | |
1759 Fset_buffer (buffer); | |
1760 | |
1761 return Qnil; | |
1762 } | |
1763 | |
1764 DEFUN ("select-window", Fselect_window, Sselect_window, 1, 1, 0, | |
1765 "Select WINDOW. Most editing will apply to WINDOW's buffer.\n\ | |
1766 The main editor command loop selects the buffer of the selected window\n\ | |
1767 before each command.") | |
1768 (window) | |
1769 register Lisp_Object window; | |
1770 { | |
1771 register struct window *w; | |
1772 register struct window *ow = XWINDOW (selected_window); | |
1773 | |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1774 CHECK_LIVE_WINDOW (window, 0); |
265 | 1775 |
1776 w = XWINDOW (window); | |
1777 | |
485 | 1778 if (NILP (w->buffer)) |
265 | 1779 error ("Trying to select deleted window or non-leaf window"); |
1780 | |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
1781 XSETFASTINT (w->use_time, ++window_select_count); |
265 | 1782 if (EQ (window, selected_window)) |
1783 return window; | |
1784 | |
1785 Fset_marker (ow->pointm, make_number (BUF_PT (XBUFFER (ow->buffer))), | |
1786 ow->buffer); | |
1787 | |
1788 selected_window = window; | |
769 | 1789 #ifdef MULTI_FRAME |
1790 if (XFRAME (WINDOW_FRAME (w)) != selected_frame) | |
265 | 1791 { |
769 | 1792 XFRAME (WINDOW_FRAME (w))->selected_window = window; |
7080
4751ee5f263e
(Fselect_window): Use Fselect_frame.
Richard M. Stallman <rms@gnu.org>
parents:
7056
diff
changeset
|
1793 /* Use this rather than Fhandle_switch_frame |
4751ee5f263e
(Fselect_window): Use Fselect_frame.
Richard M. Stallman <rms@gnu.org>
parents:
7056
diff
changeset
|
1794 so that FRAME_FOCUS_FRAME is moved appropriately as we |
4751ee5f263e
(Fselect_window): Use Fselect_frame.
Richard M. Stallman <rms@gnu.org>
parents:
7056
diff
changeset
|
1795 move around in the state where a minibuffer in a separate |
4751ee5f263e
(Fselect_window): Use Fselect_frame.
Richard M. Stallman <rms@gnu.org>
parents:
7056
diff
changeset
|
1796 frame is active. */ |
4751ee5f263e
(Fselect_window): Use Fselect_frame.
Richard M. Stallman <rms@gnu.org>
parents:
7056
diff
changeset
|
1797 Fselect_frame (WINDOW_FRAME (w), Qnil); |
265 | 1798 } |
1799 else | |
769 | 1800 selected_frame->selected_window = window; |
265 | 1801 #endif |
1802 | |
1803 record_buffer (w->buffer); | |
1804 Fset_buffer (w->buffer); | |
1805 | |
1806 /* Go to the point recorded in the window. | |
1807 This is important when the buffer is in more | |
1808 than one window. It also matters when | |
1809 redisplay_window has altered point after scrolling, | |
1810 because it makes the change only in the window. */ | |
1811 { | |
1812 register int new_point = marker_position (w->pointm); | |
1813 if (new_point < BEGV) | |
1814 SET_PT (BEGV); | |
8245
b743577d12c2
(Fselect_window): Fix bug checking new_point is in range.
Richard M. Stallman <rms@gnu.org>
parents:
8191
diff
changeset
|
1815 else if (new_point > ZV) |
265 | 1816 SET_PT (ZV); |
1817 else | |
1818 SET_PT (new_point); | |
1819 } | |
1820 | |
1821 windows_or_buffers_changed++; | |
1822 return window; | |
1823 } | |
1824 | |
735 | 1825 DEFUN ("display-buffer", Fdisplay_buffer, Sdisplay_buffer, 1, 2, |
10043
62e8ccc5b3b9
(Fdisplay_buffer): Use `b' to read existing buffer name.
Richard M. Stallman <rms@gnu.org>
parents:
9974
diff
changeset
|
1826 "bDisplay buffer: \nP", |
265 | 1827 "Make BUFFER appear in some window but don't select it.\n\ |
1828 BUFFER can be a buffer or a buffer name.\n\ | |
1829 If BUFFER is shown already in some window, just use that one,\n\ | |
1830 unless the window is the selected window and the optional second\n\ | |
1805
7ba5cfe280eb
(Fdisplay_buffer): Doc fix.
Roland McGrath <roland@gnu.org>
parents:
1798
diff
changeset
|
1831 argument NOT-THIS-WINDOW is non-nil (interactively, with prefix arg).\n\ |
5232
823c0cf7bbc8
(Fdisplay_buffer): If pop_up_frames, pass t to Fget_buffer_window.
Richard M. Stallman <rms@gnu.org>
parents:
5096
diff
changeset
|
1832 If `pop-up-frames' is non-nil, make a new frame if no window shows BUFFER.\n\ |
265 | 1833 Returns the window displaying BUFFER.") |
1834 (buffer, not_this_window) | |
1835 register Lisp_Object buffer, not_this_window; | |
1836 { | |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
1837 register Lisp_Object window, tem; |
265 | 1838 |
1839 buffer = Fget_buffer (buffer); | |
1840 CHECK_BUFFER (buffer, 0); | |
1841 | |
485 | 1842 if (!NILP (Vdisplay_buffer_function)) |
265 | 1843 return call2 (Vdisplay_buffer_function, buffer, not_this_window); |
1844 | |
485 | 1845 if (NILP (not_this_window) |
265 | 1846 && XBUFFER (XWINDOW (selected_window)->buffer) == XBUFFER (buffer)) |
1847 return selected_window; | |
1848 | |
6851
a4cfe12560d0
(Fnext_window, Fprevious_window, Fdisplay_buffer): Test MULTI_FRAME when
Karl Heuer <kwzh@gnu.org>
parents:
6692
diff
changeset
|
1849 #ifdef MULTI_FRAME |
6262
930d259c1f95
(Fdisplay_buffer): If pop_up_frames != 0,
Richard M. Stallman <rms@gnu.org>
parents:
6247
diff
changeset
|
1850 /* If pop_up_frames, |
8167
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
1851 look for a window showing BUFFER on any visible or iconified frame. */ |
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
1852 window = Fget_buffer_window (buffer, pop_up_frames ? make_number (0) : Qnil); |
6851
a4cfe12560d0
(Fnext_window, Fprevious_window, Fdisplay_buffer): Test MULTI_FRAME when
Karl Heuer <kwzh@gnu.org>
parents:
6692
diff
changeset
|
1853 #else |
a4cfe12560d0
(Fnext_window, Fprevious_window, Fdisplay_buffer): Test MULTI_FRAME when
Karl Heuer <kwzh@gnu.org>
parents:
6692
diff
changeset
|
1854 window = Fget_buffer_window (buffer, Qnil); |
a4cfe12560d0
(Fnext_window, Fprevious_window, Fdisplay_buffer): Test MULTI_FRAME when
Karl Heuer <kwzh@gnu.org>
parents:
6692
diff
changeset
|
1855 #endif |
485 | 1856 if (!NILP (window) |
1857 && (NILP (not_this_window) || !EQ (window, selected_window))) | |
8167
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
1858 { |
8191
09b630d545fe
(Fdisplay_buffer): Add MULTI_FRAME conditional in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8167
diff
changeset
|
1859 #ifdef MULTI_FRAME |
8167
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
1860 if (FRAME_ICONIFIED_P (XFRAME (WINDOW_FRAME (XWINDOW (window))))) |
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
1861 Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window))); |
8191
09b630d545fe
(Fdisplay_buffer): Add MULTI_FRAME conditional in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8167
diff
changeset
|
1862 #endif |
8167
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
1863 return window; |
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
1864 } |
265 | 1865 |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
1866 /* Certain buffer names get special handling. */ |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
1867 if (! NILP (Vspecial_display_function)) |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
1868 { |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
1869 tem = Fmember (XBUFFER (buffer)->name, Vspecial_display_buffer_names); |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
1870 if (!NILP (tem)) |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
1871 return call1 (Vspecial_display_function, buffer); |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
1872 |
8991
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
1873 tem = Fassoc (XBUFFER (buffer)->name, Vspecial_display_buffer_names); |
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
1874 if (!NILP (tem)) |
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
1875 return call2 (Vspecial_display_function, buffer, XCONS (tem)->cdr); |
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
1876 |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
1877 for (tem = Vspecial_display_regexps; CONSP (tem); tem = XCONS (tem)->cdr) |
8991
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
1878 { |
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
1879 Lisp_Object car = XCONS (tem)->car; |
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
1880 if (STRINGP (car) |
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
1881 && fast_string_match (car, XBUFFER (buffer)->name) >= 0) |
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
1882 return call1 (Vspecial_display_function, buffer); |
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
1883 else if (CONSP (car) |
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
1884 && STRINGP (XCONS (car)->car) |
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
1885 && fast_string_match (XCONS (car)->car, |
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
1886 XBUFFER (buffer)->name) >= 0) |
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
1887 return call2 (Vspecial_display_function, |
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
1888 buffer, |
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
1889 XCONS (car)->cdr); |
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
1890 } |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
1891 } |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
1892 |
769 | 1893 #ifdef MULTI_FRAME |
1894 /* If there are no frames open that have more than a minibuffer, | |
1895 we need to create a new frame. */ | |
1896 if (pop_up_frames || last_nonminibuf_frame == 0) | |
265 | 1897 { |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
1898 window = Fframe_selected_window (call0 (Vpop_up_frame_function)); |
265 | 1899 Fset_window_buffer (window, buffer); |
1900 return window; | |
1901 } | |
769 | 1902 #endif /* MULTI_FRAME */ |
265 | 1903 |
358 | 1904 if (pop_up_windows |
769 | 1905 #ifdef MULTI_FRAME |
1906 || FRAME_MINIBUF_ONLY_P (selected_frame) | |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1907 /* If the current frame is a special display frame, |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1908 don't try to reuse its windows. */ |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1909 || !NILP (XWINDOW (FRAME_ROOT_WINDOW (selected_frame))->dedicated) |
358 | 1910 #endif |
1911 ) | |
1912 { | |
6517
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1913 Lisp_Object frames; |
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1914 |
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1915 frames = Qnil; |
769 | 1916 #ifdef MULTI_FRAME |
1917 if (FRAME_MINIBUF_ONLY_P (selected_frame)) | |
9282
f4fa46f6a032
(Fminibuffer_window, Fwindow_at, Fwindow_end, Fnext_window, Fprevious_window,
Karl Heuer <kwzh@gnu.org>
parents:
9243
diff
changeset
|
1918 XSETFRAME (frames, last_nonminibuf_frame); |
265 | 1919 #endif |
1920 /* Don't try to create a window if would get an error */ | |
1921 if (split_height_threshold < window_min_height << 1) | |
1922 split_height_threshold = window_min_height << 1; | |
1923 | |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1924 /* Note that both Fget_largest_window and Fget_lru_window |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1925 ignore minibuffers and dedicated windows. |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1926 This means they can return nil. */ |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1927 |
8366
3be9c6b57956
(Fdisplay_buffer): Add MULTI_FRAME cond in last change.
Richard M. Stallman <rms@gnu.org>
parents:
8323
diff
changeset
|
1928 #ifdef MULTI_FRAME |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1929 /* If the frame we would try to split cannot be split, |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1930 try other frames. */ |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1931 if (FRAME_NO_SPLIT_P (NILP (frames) ? selected_frame |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1932 : last_nonminibuf_frame)) |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1933 { |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1934 /* Try visible frames first. */ |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1935 window = Fget_largest_window (Qvisible); |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1936 /* If that didn't work, try iconified frames. */ |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1937 if (NILP (window)) |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1938 window = Fget_largest_window (make_number (0)); |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1939 if (NILP (window)) |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1940 window = Fget_largest_window (Qt); |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1941 } |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1942 else |
8366
3be9c6b57956
(Fdisplay_buffer): Add MULTI_FRAME cond in last change.
Richard M. Stallman <rms@gnu.org>
parents:
8323
diff
changeset
|
1943 #endif |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1944 window = Fget_largest_window (frames); |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1945 |
9567
cf4f4c8a3ef6
(Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents:
9324
diff
changeset
|
1946 /* If we got a tall enough full-width window that can be split, |
cf4f4c8a3ef6
(Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents:
9324
diff
changeset
|
1947 split it. */ |
485 | 1948 if (!NILP (window) |
9567
cf4f4c8a3ef6
(Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents:
9324
diff
changeset
|
1949 && ! FRAME_NO_SPLIT_P (XFRAME (XWINDOW (window)->frame)) |
265 | 1950 && window_height (window) >= split_height_threshold |
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
1951 && (XFASTINT (XWINDOW (window)->width) |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
1952 == FRAME_WIDTH (XFRAME (WINDOW_FRAME (XWINDOW (window)))))) |
265 | 1953 window = Fsplit_window (window, Qnil, Qnil); |
1954 else | |
1955 { | |
9614
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
1956 Lisp_Object upper, lower, other; |
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
1957 |
769 | 1958 window = Fget_lru_window (frames); |
9567
cf4f4c8a3ef6
(Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents:
9324
diff
changeset
|
1959 /* If the LRU window is selected, and big enough, |
cf4f4c8a3ef6
(Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents:
9324
diff
changeset
|
1960 and can be split, split it. */ |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1961 if (!NILP (window) |
9567
cf4f4c8a3ef6
(Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents:
9324
diff
changeset
|
1962 && ! FRAME_NO_SPLIT_P (XFRAME (XWINDOW (window)->frame)) |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1963 && (EQ (window, selected_window) |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1964 || EQ (XWINDOW (window)->parent, Qnil)) |
265 | 1965 && window_height (window) >= window_min_height << 1) |
1966 window = Fsplit_window (window, Qnil, Qnil); | |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1967 #ifdef MULTI_FRAME |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1968 /* If Fget_lru_window returned nil, try other approaches. */ |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1969 /* Try visible frames first. */ |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1970 if (NILP (window)) |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1971 window = Fget_largest_window (Qvisible); |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1972 /* If that didn't work, try iconified frames. */ |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1973 if (NILP (window)) |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1974 window = Fget_largest_window (make_number (0)); |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1975 /* Try invisible frames. */ |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1976 if (NILP (window)) |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1977 window = Fget_largest_window (Qt); |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1978 /* As a last resort, make a new frame. */ |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1979 if (NILP (window)) |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1980 window = Fframe_selected_window (call0 (Vpop_up_frame_function)); |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1981 #else |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1982 /* As a last resort, use a non minibuffer window. */ |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1983 if (NILP (window)) |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1984 window = Fframe_first_window (Fselected_frame ()); |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
1985 #endif |
9614
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
1986 /* If window appears above or below another, |
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
1987 even out their heights. */ |
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
1988 if (!NILP (XWINDOW (window)->prev)) |
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
1989 other = upper = XWINDOW (window)->prev, lower = window; |
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
1990 if (!NILP (XWINDOW (window)->next)) |
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
1991 other = lower = XWINDOW (window)->next, upper = window; |
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
1992 if (!NILP (other) |
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
1993 /* Check that OTHER and WINDOW are vertically arrayed. */ |
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
1994 && XWINDOW (other)->top != XWINDOW (window)->top |
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
1995 && XWINDOW (other)->height > XWINDOW (window)->height) |
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
1996 { |
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
1997 int total = XWINDOW (other)->height + XWINDOW (window)->height; |
9624
48854151266c
(Fdisplay_buffer): Make old_selected_window a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents:
9614
diff
changeset
|
1998 Lisp_Object old_selected_window; |
48854151266c
(Fdisplay_buffer): Make old_selected_window a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents:
9614
diff
changeset
|
1999 old_selected_window = selected_window; |
48854151266c
(Fdisplay_buffer): Make old_selected_window a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents:
9614
diff
changeset
|
2000 |
48854151266c
(Fdisplay_buffer): Make old_selected_window a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents:
9614
diff
changeset
|
2001 selected_window = upper; |
9614
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
2002 change_window_height (total / 2 - XWINDOW (upper)->height, 0); |
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
2003 selected_window = old_selected_window; |
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
2004 } |
265 | 2005 } |
2006 } | |
2007 else | |
2008 window = Fget_lru_window (Qnil); | |
2009 | |
2010 Fset_window_buffer (window, buffer); | |
2011 return window; | |
2012 } | |
2013 | |
2014 void | |
2015 temp_output_buffer_show (buf) | |
2016 register Lisp_Object buf; | |
2017 { | |
2018 register struct buffer *old = current_buffer; | |
2019 register Lisp_Object window; | |
2020 register struct window *w; | |
2021 | |
2022 Fset_buffer (buf); | |
10302
34556316a48a
(temp_output_buffer_show): Use BUF_SAVE_MODIFF.
Richard M. Stallman <rms@gnu.org>
parents:
10043
diff
changeset
|
2023 BUF_SAVE_MODIFF (XBUFFER (buf)) = MODIFF; |
265 | 2024 BEGV = BEG; |
2025 ZV = Z; | |
2026 SET_PT (BEG); | |
2027 clip_changed = 1; | |
2028 set_buffer_internal (old); | |
2029 | |
2030 if (!EQ (Vtemp_buffer_show_function, Qnil)) | |
2031 call1 (Vtemp_buffer_show_function, buf); | |
2032 else | |
2033 { | |
2034 window = Fdisplay_buffer (buf, Qnil); | |
2035 | |
769 | 2036 #ifdef MULTI_FRAME |
2037 if (XFRAME (XWINDOW (window)->frame) != selected_frame) | |
2038 Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window))); | |
2039 #endif /* MULTI_FRAME */ | |
265 | 2040 Vminibuf_scroll_window = window; |
2041 w = XWINDOW (window); | |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
2042 XSETFASTINT (w->hscroll, 0); |
265 | 2043 set_marker_restricted (w->start, make_number (1), buf); |
2044 set_marker_restricted (w->pointm, make_number (1), buf); | |
2045 } | |
10461
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
2046 |
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
2047 if (!NILP (Vrun_hooks)) |
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
2048 call1 (Vrun_hooks, Qtemp_buffer_show_hook); |
265 | 2049 } |
2050 | |
2051 static | |
2052 make_dummy_parent (window) | |
2053 Lisp_Object window; | |
2054 { | |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
2055 Lisp_Object new; |
265 | 2056 register struct window *o, *p; |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
2057 register struct Lisp_Vector *vec; |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
2058 int i; |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
2059 |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
2060 o = XWINDOW (window); |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
2061 vec = allocate_vectorlike ((EMACS_INT)VECSIZE (struct window)); |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
2062 for (i = 0; i < VECSIZE (struct window); ++i) |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
2063 vec->contents[i] = ((struct Lisp_Vector *)o)->contents[i]; |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
2064 vec->size = VECSIZE (struct window); |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
2065 p = (struct window *)vec; |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
2066 XSETWINDOW (new, p); |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
2067 |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
2068 XSETFASTINT (p->sequence_number, ++sequence_number); |
265 | 2069 |
2070 /* Put new into window structure in place of window */ | |
2071 replace_window (window, new); | |
2072 | |
2073 o->next = Qnil; | |
2074 o->prev = Qnil; | |
2075 o->vchild = Qnil; | |
2076 o->hchild = Qnil; | |
2077 o->parent = new; | |
2078 | |
2079 p->start = Qnil; | |
2080 p->pointm = Qnil; | |
2081 p->buffer = Qnil; | |
2082 } | |
2083 | |
2084 DEFUN ("split-window", Fsplit_window, Ssplit_window, 0, 3, "", | |
2085 "Split WINDOW, putting SIZE lines in the first of the pair.\n\ | |
2086 WINDOW defaults to selected one and SIZE to half its size.\n\ | |
2087 If optional third arg HOR-FLAG is non-nil, split side by side\n\ | |
2088 and put SIZE columns in the first of the pair.") | |
2089 (window, chsize, horflag) | |
2090 Lisp_Object window, chsize, horflag; | |
2091 { | |
2092 register Lisp_Object new; | |
2093 register struct window *o, *p; | |
2094 register int size; | |
2095 | |
485 | 2096 if (NILP (window)) |
265 | 2097 window = selected_window; |
2098 else | |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
2099 CHECK_LIVE_WINDOW (window, 0); |
265 | 2100 |
2101 o = XWINDOW (window); | |
2102 | |
485 | 2103 if (NILP (chsize)) |
265 | 2104 { |
485 | 2105 if (!NILP (horflag)) |
265 | 2106 /* Round odd size up, since this is for the left-hand window, |
2107 and it will lose a column for the separators. */ | |
2108 size = ((XFASTINT (o->width) + 1) & -2) >> 1; | |
2109 else | |
2110 size = XFASTINT (o->height) >> 1; | |
2111 } | |
2112 else | |
2113 { | |
2114 CHECK_NUMBER (chsize, 1); | |
2115 size = XINT (chsize); | |
2116 } | |
2117 | |
2118 if (MINI_WINDOW_P (o)) | |
2119 error ("Attempt to split minibuffer window"); | |
769 | 2120 else if (FRAME_NO_SPLIT_P (XFRAME (WINDOW_FRAME (o)))) |
2121 error ("Attempt to split unsplittable frame"); | |
265 | 2122 |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2123 check_min_window_sizes (); |
265 | 2124 |
485 | 2125 if (NILP (horflag)) |
265 | 2126 { |
2127 if (size < window_min_height | |
2128 || size + window_min_height > XFASTINT (o->height)) | |
2129 args_out_of_range_3 (window, chsize, horflag); | |
485 | 2130 if (NILP (o->parent) |
2131 || NILP (XWINDOW (o->parent)->vchild)) | |
265 | 2132 { |
2133 make_dummy_parent (window); | |
2134 new = o->parent; | |
2135 XWINDOW (new)->vchild = window; | |
2136 } | |
2137 } | |
2138 else | |
2139 { | |
2140 if (size < window_min_width | |
2141 || size + window_min_width > XFASTINT (o->width)) | |
2142 args_out_of_range_3 (window, chsize, horflag); | |
485 | 2143 if (NILP (o->parent) |
2144 || NILP (XWINDOW (o->parent)->hchild)) | |
265 | 2145 { |
2146 make_dummy_parent (window); | |
2147 new = o->parent; | |
2148 XWINDOW (new)->hchild = window; | |
2149 } | |
2150 } | |
2151 | |
2152 /* Now we know that window's parent is a vertical combination | |
2153 if we are dividing vertically, or a horizontal combination | |
2154 if we are making side-by-side windows */ | |
2155 | |
2156 windows_or_buffers_changed++; | |
10666
e1dfb47b664e
(Fdelete_window, set_window_height, set_window_width)
Richard M. Stallman <rms@gnu.org>
parents:
10461
diff
changeset
|
2157 FRAME_WINDOW_SIZES_CHANGED (XFRAME (WINDOW_FRAME (o))) = 1; |
265 | 2158 new = make_window (); |
2159 p = XWINDOW (new); | |
2160 | |
769 | 2161 p->frame = o->frame; |
265 | 2162 p->next = o->next; |
485 | 2163 if (!NILP (p->next)) |
265 | 2164 XWINDOW (p->next)->prev = new; |
2165 p->prev = window; | |
2166 o->next = new; | |
2167 p->parent = o->parent; | |
2168 p->buffer = Qt; | |
2169 | |
2170 Fset_window_buffer (new, o->buffer); | |
2171 | |
769 | 2172 /* Apportion the available frame space among the two new windows */ |
265 | 2173 |
485 | 2174 if (!NILP (horflag)) |
265 | 2175 { |
2176 p->height = o->height; | |
2177 p->top = o->top; | |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
2178 XSETFASTINT (p->width, XFASTINT (o->width) - size); |
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
2179 XSETFASTINT (o->width, size); |
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
2180 XSETFASTINT (p->left, XFASTINT (o->left) + size); |
265 | 2181 } |
2182 else | |
2183 { | |
2184 p->left = o->left; | |
2185 p->width = o->width; | |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
2186 XSETFASTINT (p->height, XFASTINT (o->height) - size); |
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
2187 XSETFASTINT (o->height, size); |
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
2188 XSETFASTINT (p->top, XFASTINT (o->top) + size); |
265 | 2189 } |
2190 | |
2191 return new; | |
2192 } | |
2193 | |
2194 DEFUN ("enlarge-window", Fenlarge_window, Senlarge_window, 1, 2, "p", | |
2195 "Make current window ARG lines bigger.\n\ | |
2196 From program, optional second arg non-nil means grow sideways ARG columns.") | |
2197 (n, side) | |
2198 register Lisp_Object n, side; | |
2199 { | |
2200 CHECK_NUMBER (n, 0); | |
485 | 2201 change_window_height (XINT (n), !NILP (side)); |
265 | 2202 return Qnil; |
2203 } | |
2204 | |
2205 DEFUN ("shrink-window", Fshrink_window, Sshrink_window, 1, 2, "p", | |
2206 "Make current window ARG lines smaller.\n\ | |
2207 From program, optional second arg non-nil means shrink sideways ARG columns.") | |
2208 (n, side) | |
2209 register Lisp_Object n, side; | |
2210 { | |
2211 CHECK_NUMBER (n, 0); | |
485 | 2212 change_window_height (-XINT (n), !NILP (side)); |
265 | 2213 return Qnil; |
2214 } | |
2215 | |
2216 int | |
2217 window_height (window) | |
2218 Lisp_Object window; | |
2219 { | |
2220 register struct window *p = XWINDOW (window); | |
2221 return XFASTINT (p->height); | |
2222 } | |
2223 | |
2224 int | |
2225 window_width (window) | |
2226 Lisp_Object window; | |
2227 { | |
2228 register struct window *p = XWINDOW (window); | |
2229 return XFASTINT (p->width); | |
2230 } | |
2231 | |
1049
25046e48ce9a
* window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents:
1016
diff
changeset
|
2232 #define MINSIZE(w) \ |
25046e48ce9a
* window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents:
1016
diff
changeset
|
2233 (widthflag \ |
25046e48ce9a
* window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents:
1016
diff
changeset
|
2234 ? window_min_width \ |
25046e48ce9a
* window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents:
1016
diff
changeset
|
2235 : (MINI_WINDOW_P (XWINDOW (w)) ? 1 : window_min_height)) |
265 | 2236 |
2237 #define CURBEG(w) \ | |
1049
25046e48ce9a
* window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents:
1016
diff
changeset
|
2238 *(widthflag ? (int *) &(XWINDOW (w)->left) : (int *) &(XWINDOW (w)->top)) |
265 | 2239 |
2240 #define CURSIZE(w) \ | |
1049
25046e48ce9a
* window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents:
1016
diff
changeset
|
2241 *(widthflag ? (int *) &(XWINDOW (w)->width) : (int *) &(XWINDOW (w)->height)) |
265 | 2242 |
2243 /* Unlike set_window_height, this function | |
2244 also changes the heights of the siblings so as to | |
2245 keep everything consistent. */ | |
2246 | |
2247 change_window_height (delta, widthflag) | |
2248 register int delta; | |
2249 int widthflag; | |
2250 { | |
2251 register Lisp_Object parent; | |
2252 Lisp_Object window; | |
2253 register struct window *p; | |
2254 int *sizep; | |
2255 int (*sizefun) () = widthflag ? window_width : window_height; | |
2256 register int (*setsizefun) () = (widthflag | |
2257 ? set_window_width | |
2258 : set_window_height); | |
2259 | |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2260 check_min_window_sizes (); |
265 | 2261 |
2262 window = selected_window; | |
2263 while (1) | |
2264 { | |
2265 p = XWINDOW (window); | |
2266 parent = p->parent; | |
485 | 2267 if (NILP (parent)) |
265 | 2268 { |
2269 if (widthflag) | |
2270 error ("No other window to side of this one"); | |
2271 break; | |
2272 } | |
485 | 2273 if (widthflag ? !NILP (XWINDOW (parent)->hchild) |
2274 : !NILP (XWINDOW (parent)->vchild)) | |
265 | 2275 break; |
2276 window = parent; | |
2277 } | |
2278 | |
1049
25046e48ce9a
* window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents:
1016
diff
changeset
|
2279 sizep = &CURSIZE (window); |
25046e48ce9a
* window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents:
1016
diff
changeset
|
2280 |
265 | 2281 { |
2282 register int maxdelta; | |
2283 | |
485 | 2284 maxdelta = (!NILP (parent) ? (*sizefun) (parent) - *sizep |
2285 : !NILP (p->next) ? (*sizefun) (p->next) - MINSIZE (p->next) | |
2286 : !NILP (p->prev) ? (*sizefun) (p->prev) - MINSIZE (p->prev) | |
769 | 2287 /* This is a frame with only one window, a minibuffer-only |
2288 or a minibufferless frame. */ | |
432 | 2289 : (delta = 0)); |
265 | 2290 |
2291 if (delta > maxdelta) | |
2292 /* This case traps trying to make the minibuffer | |
769 | 2293 the full frame, or make the only window aside from the |
2294 minibuffer the full frame. */ | |
265 | 2295 delta = maxdelta; |
7618
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
2296 } |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
2297 |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
2298 if (*sizep + delta < MINSIZE (window)) |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
2299 { |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
2300 Fdelete_window (window); |
432 | 2301 return; |
7618
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
2302 } |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
2303 |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
2304 if (delta == 0) |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
2305 return; |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
2306 |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
2307 if (!NILP (p->next) |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
2308 && (*sizefun) (p->next) - delta >= MINSIZE (p->next)) |
265 | 2309 { |
2310 (*setsizefun) (p->next, (*sizefun) (p->next) - delta, 0); | |
2311 (*setsizefun) (window, *sizep + delta, 0); | |
1049
25046e48ce9a
* window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents:
1016
diff
changeset
|
2312 CURBEG (p->next) += delta; |
265 | 2313 /* This does not change size of p->next, |
2314 but it propagates the new top edge to its children */ | |
2315 (*setsizefun) (p->next, (*sizefun) (p->next), 0); | |
2316 } | |
7618
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
2317 else if (!NILP (p->prev) |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
2318 && (*sizefun) (p->prev) - delta >= MINSIZE (p->prev)) |
265 | 2319 { |
2320 (*setsizefun) (p->prev, (*sizefun) (p->prev) - delta, 0); | |
1049
25046e48ce9a
* window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents:
1016
diff
changeset
|
2321 CURBEG (window) -= delta; |
265 | 2322 (*setsizefun) (window, *sizep + delta, 0); |
2323 } | |
2324 else | |
2325 { | |
2326 register int delta1; | |
2327 register int opht = (*sizefun) (parent); | |
2328 | |
2329 /* If trying to grow this window to or beyond size of the parent, | |
2330 make delta1 so big that, on shrinking back down, | |
2331 all the siblings end up with less than one line and are deleted. */ | |
2332 if (opht <= *sizep + delta) | |
2333 delta1 = opht * opht * 2; | |
2334 /* Otherwise, make delta1 just right so that if we add delta1 | |
2335 lines to this window and to the parent, and then shrink | |
2336 the parent back to its original size, the new proportional | |
2337 size of this window will increase by delta. */ | |
2338 else | |
2339 delta1 = (delta * opht * 100) / ((opht - *sizep - delta) * 100); | |
2340 | |
2341 /* Add delta1 lines or columns to this window, and to the parent, | |
2342 keeping things consistent while not affecting siblings. */ | |
1049
25046e48ce9a
* window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents:
1016
diff
changeset
|
2343 CURSIZE (parent) = opht + delta1; |
265 | 2344 (*setsizefun) (window, *sizep + delta1, 0); |
2345 | |
2346 /* Squeeze out delta1 lines or columns from our parent, | |
2347 shriking this window and siblings proportionately. | |
2348 This brings parent back to correct size. | |
2349 Delta1 was calculated so this makes this window the desired size, | |
2350 taking it all out of the siblings. */ | |
2351 (*setsizefun) (parent, opht, 0); | |
2352 } | |
2353 | |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
2354 XSETFASTINT (p->last_modified, 0); |
265 | 2355 } |
2356 #undef MINSIZE | |
2357 #undef CURBEG | |
2358 #undef CURSIZE | |
2359 | |
2360 | |
2361 /* Return number of lines of text (not counting mode line) in W. */ | |
2362 | |
2363 int | |
2364 window_internal_height (w) | |
2365 struct window *w; | |
2366 { | |
2367 int ht = XFASTINT (w->height); | |
2368 | |
2369 if (MINI_WINDOW_P (w)) | |
2370 return ht; | |
2371 | |
485 | 2372 if (!NILP (w->parent) || !NILP (w->vchild) || !NILP (w->hchild) |
2373 || !NILP (w->next) || !NILP (w->prev) | |
769 | 2374 || FRAME_WANTS_MODELINE_P (XFRAME (WINDOW_FRAME (w)))) |
265 | 2375 return ht - 1; |
2376 | |
2377 return ht; | |
2378 } | |
2379 | |
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2380 |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2381 /* Return the number of columns in W. |
1994
73ce9dd21093
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1931
diff
changeset
|
2382 Don't count columns occupied by scroll bars or the vertical bar |
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2383 separating W from the sibling to its right. */ |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2384 int |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2385 window_internal_width (w) |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2386 struct window *w; |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2387 { |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2388 FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2389 int left = XINT (w->left); |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2390 int width = XINT (w->width); |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2391 |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2392 /* If this window is flush against the right edge of the frame, its |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2393 internal width is its full width. */ |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2394 if (left + width >= FRAME_WIDTH (f)) |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2395 return width; |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2396 |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2397 /* If we are not flush right, then our rightmost columns are |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2398 occupied by some sort of separator. */ |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2399 |
1994
73ce9dd21093
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1931
diff
changeset
|
2400 /* Scroll bars occupy a few columns. */ |
73ce9dd21093
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1931
diff
changeset
|
2401 if (FRAME_HAS_VERTICAL_SCROLL_BARS (f)) |
8944
07b281d80445
(window_internal_width): Change VERTICAL_SCROLL_BAR_WIDTH to
Karl Heuer <kwzh@gnu.org>
parents:
8939
diff
changeset
|
2402 return width - FRAME_SCROLL_BAR_COLS (f); |
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2403 |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2404 /* The column of `|' characters separating side-by-side windows |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2405 occupies one column only. */ |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2406 return width - 1; |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2407 } |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2408 |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
2409 |
265 | 2410 /* Scroll contents of window WINDOW up N lines. */ |
2411 | |
2412 void | |
522 | 2413 window_scroll (window, n, noerror) |
265 | 2414 Lisp_Object window; |
2415 int n; | |
522 | 2416 int noerror; |
265 | 2417 { |
2418 register struct window *w = XWINDOW (window); | |
7347 | 2419 register int opoint = PT; |
265 | 2420 register int pos; |
2421 register int ht = window_internal_height (w); | |
2422 register Lisp_Object tem; | |
2423 int lose; | |
2424 Lisp_Object bolp, nmoved; | |
2425 | |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
2426 XSETFASTINT (tem, PT); |
265 | 2427 tem = Fpos_visible_in_window_p (tem, window); |
2428 | |
485 | 2429 if (NILP (tem)) |
265 | 2430 { |
6341
dfc758dd2b08
(window_scroll, Fmove_to_window_line): Avoid dividing negative numbers,
Karl Heuer <kwzh@gnu.org>
parents:
6326
diff
changeset
|
2431 Fvertical_motion (make_number (- (ht / 2)), window); |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
2432 XSETFASTINT (tem, PT); |
265 | 2433 Fset_marker (w->start, tem, w->buffer); |
2434 w->force_start = Qt; | |
2435 } | |
2436 | |
2437 SET_PT (marker_position (w->start)); | |
7347 | 2438 lose = n < 0 && PT == BEGV; |
6326
5e662ad3f594
(Fdelete_other_windows): Pass new arg to Fvertical_motion.
Richard M. Stallman <rms@gnu.org>
parents:
6269
diff
changeset
|
2439 Fvertical_motion (make_number (n), window); |
7347 | 2440 pos = PT; |
265 | 2441 bolp = Fbolp (); |
2442 SET_PT (opoint); | |
2443 | |
2444 if (lose) | |
522 | 2445 { |
2446 if (noerror) | |
2447 return; | |
2448 else | |
2449 Fsignal (Qbeginning_of_buffer, Qnil); | |
2450 } | |
265 | 2451 |
2452 if (pos < ZV) | |
2453 { | |
2454 set_marker_restricted (w->start, make_number (pos), w->buffer); | |
2455 w->start_at_line_beg = bolp; | |
2456 w->update_mode_line = Qt; | |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
2457 XSETFASTINT (w->last_modified, 0); |
265 | 2458 if (pos > opoint) |
2459 SET_PT (pos); | |
2460 if (n < 0) | |
2461 { | |
2462 SET_PT (pos); | |
6326
5e662ad3f594
(Fdelete_other_windows): Pass new arg to Fvertical_motion.
Richard M. Stallman <rms@gnu.org>
parents:
6269
diff
changeset
|
2463 tem = Fvertical_motion (make_number (ht), window); |
7347 | 2464 if (PT > opoint || XFASTINT (tem) < ht) |
265 | 2465 SET_PT (opoint); |
2466 else | |
6326
5e662ad3f594
(Fdelete_other_windows): Pass new arg to Fvertical_motion.
Richard M. Stallman <rms@gnu.org>
parents:
6269
diff
changeset
|
2467 Fvertical_motion (make_number (-1), window); |
265 | 2468 } |
2469 } | |
2470 else | |
522 | 2471 { |
2472 if (noerror) | |
2473 return; | |
2474 else | |
2475 Fsignal (Qend_of_buffer, Qnil); | |
2476 } | |
265 | 2477 } |
2478 | |
2479 /* This is the guts of Fscroll_up and Fscroll_down. */ | |
2480 | |
2481 static void | |
2482 scroll_command (n, direction) | |
2483 register Lisp_Object n; | |
2484 int direction; | |
2485 { | |
2486 register int defalt; | |
2487 int count = specpdl_ptr - specpdl; | |
2488 | |
548 | 2489 /* If selected window's buffer isn't current, make it current for the moment. |
2490 But don't screw up if window_scroll gets an error. */ | |
265 | 2491 if (XBUFFER (XWINDOW (selected_window)->buffer) != current_buffer) |
548 | 2492 { |
2493 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
2494 Fset_buffer (XWINDOW (selected_window)->buffer); | |
2495 } | |
265 | 2496 |
2497 defalt = (window_internal_height (XWINDOW (selected_window)) | |
2498 - next_screen_context_lines); | |
2499 defalt = direction * (defalt < 1 ? 1 : defalt); | |
2500 | |
485 | 2501 if (NILP (n)) |
522 | 2502 window_scroll (selected_window, defalt, 0); |
265 | 2503 else if (EQ (n, Qminus)) |
522 | 2504 window_scroll (selected_window, - defalt, 0); |
265 | 2505 else |
2506 { | |
2507 n = Fprefix_numeric_value (n); | |
522 | 2508 window_scroll (selected_window, XINT (n) * direction, 0); |
265 | 2509 } |
548 | 2510 |
2511 unbind_to (count, Qnil); | |
265 | 2512 } |
2513 | |
2514 DEFUN ("scroll-up", Fscroll_up, Sscroll_up, 0, 1, "P", | |
2515 "Scroll text of current window upward ARG lines; or near full screen if no ARG.\n\ | |
2516 A near full screen is `next-screen-context-lines' less than a full screen.\n\ | |
6487
e1b0356ae3c9
(Fscroll_up, Fscroll_down, Fscroll_other_window): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
6341
diff
changeset
|
2517 Negative ARG means scroll downward.\n\ |
265 | 2518 When calling from a program, supply a number as argument or nil.") |
2519 (n) | |
2520 Lisp_Object n; | |
2521 { | |
2522 scroll_command (n, 1); | |
2523 return Qnil; | |
2524 } | |
2525 | |
2526 DEFUN ("scroll-down", Fscroll_down, Sscroll_down, 0, 1, "P", | |
2527 "Scroll text of current window downward ARG lines; or near full screen if no ARG.\n\ | |
2528 A near full screen is `next-screen-context-lines' less than a full screen.\n\ | |
6487
e1b0356ae3c9
(Fscroll_up, Fscroll_down, Fscroll_other_window): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
6341
diff
changeset
|
2529 Negative ARG means scroll upward.\n\ |
265 | 2530 When calling from a program, supply a number as argument or nil.") |
2531 (n) | |
2532 Lisp_Object n; | |
2533 { | |
2534 scroll_command (n, -1); | |
2535 return Qnil; | |
2536 } | |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2537 |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2538 DEFUN ("other-window-for-scrolling", Fother_window_for_scrolling, Sother_window_for_scrolling, 0, 0, 0, |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2539 "Return the other window for \"other window scroll\" commands.\n\ |
6232
d695df82e96a
(Fscroll_other_window): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
6099
diff
changeset
|
2540 If in the minibuffer, `minibuffer-scroll-window' if non-nil\n\ |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2541 specifies the window.\n\ |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2542 If `other-window-scroll-buffer' is non-nil, a window\n\ |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2543 showing that buffer is used.") |
8059
59baddaf62a0
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8053
diff
changeset
|
2544 () |
265 | 2545 { |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2546 Lisp_Object window; |
265 | 2547 |
2548 if (MINI_WINDOW_P (XWINDOW (selected_window)) | |
485 | 2549 && !NILP (Vminibuf_scroll_window)) |
265 | 2550 window = Vminibuf_scroll_window; |
2551 /* If buffer is specified, scroll that buffer. */ | |
485 | 2552 else if (!NILP (Vother_window_scroll_buffer)) |
265 | 2553 { |
2554 window = Fget_buffer_window (Vother_window_scroll_buffer, Qnil); | |
485 | 2555 if (NILP (window)) |
265 | 2556 window = Fdisplay_buffer (Vother_window_scroll_buffer, Qt); |
2557 } | |
2558 else | |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
2559 { |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
2560 /* Nothing specified; look for a neighboring window on the same |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
2561 frame. */ |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
2562 window = Fnext_window (selected_window, Qnil, Qnil); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
2563 |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
2564 if (EQ (window, selected_window)) |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
2565 /* That didn't get us anywhere; look for a window on another |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
2566 visible frame. */ |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
2567 do |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
2568 window = Fnext_window (window, Qnil, Qt); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
2569 while (! FRAME_VISIBLE_P (XFRAME (WINDOW_FRAME (XWINDOW (window)))) |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
2570 && ! EQ (window, selected_window)); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
2571 } |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
2572 |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
2573 CHECK_LIVE_WINDOW (window, 0); |
265 | 2574 |
2575 if (EQ (window, selected_window)) | |
2576 error ("There is no other window"); | |
2577 | |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2578 return window; |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2579 } |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2580 |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2581 DEFUN ("scroll-other-window", Fscroll_other_window, Sscroll_other_window, 0, 1, "P", |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2582 "Scroll next window upward ARG lines; or near full screen if no ARG.\n\ |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2583 The next window is the one below the current one; or the one at the top\n\ |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2584 if the current one is at the bottom. Negative ARG means scroll downward.\n\ |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2585 When calling from a program, supply a number as argument or nil.\n\ |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2586 \n\ |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2587 If in the minibuffer, `minibuffer-scroll-window' if non-nil\n\ |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2588 specifies the window to scroll.\n\ |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2589 If `other-window-scroll-buffer' is non-nil, scroll the window\n\ |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2590 showing that buffer, popping the buffer up if necessary.") |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2591 (n) |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2592 register Lisp_Object n; |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2593 { |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2594 register Lisp_Object window; |
10373
c5c1ffa3755e
(Fscroll_other_window): On small windows, scroll by 1 line.
Karl Heuer <kwzh@gnu.org>
parents:
10302
diff
changeset
|
2595 register int defalt; |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2596 register struct window *w; |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2597 register int count = specpdl_ptr - specpdl; |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2598 |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2599 window = Fother_window_for_scrolling (); |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
2600 |
265 | 2601 w = XWINDOW (window); |
10373
c5c1ffa3755e
(Fscroll_other_window): On small windows, scroll by 1 line.
Karl Heuer <kwzh@gnu.org>
parents:
10302
diff
changeset
|
2602 defalt = window_internal_height (w) - next_screen_context_lines; |
c5c1ffa3755e
(Fscroll_other_window): On small windows, scroll by 1 line.
Karl Heuer <kwzh@gnu.org>
parents:
10302
diff
changeset
|
2603 if (defalt < 1) defalt = 1; |
265 | 2604 |
2605 /* Don't screw up if window_scroll gets an error. */ | |
2606 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
2607 | |
2608 Fset_buffer (w->buffer); | |
2609 SET_PT (marker_position (w->pointm)); | |
2610 | |
485 | 2611 if (NILP (n)) |
10373
c5c1ffa3755e
(Fscroll_other_window): On small windows, scroll by 1 line.
Karl Heuer <kwzh@gnu.org>
parents:
10302
diff
changeset
|
2612 window_scroll (window, defalt, 1); |
265 | 2613 else if (EQ (n, Qminus)) |
10373
c5c1ffa3755e
(Fscroll_other_window): On small windows, scroll by 1 line.
Karl Heuer <kwzh@gnu.org>
parents:
10302
diff
changeset
|
2614 window_scroll (window, -defalt, 1); |
265 | 2615 else |
2616 { | |
9105
984a4b1be1d1
(Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents:
9028
diff
changeset
|
2617 if (CONSP (n)) |
265 | 2618 n = Fcar (n); |
2619 CHECK_NUMBER (n, 0); | |
522 | 2620 window_scroll (window, XINT (n), 1); |
265 | 2621 } |
2622 | |
7347 | 2623 Fset_marker (w->pointm, make_number (PT), Qnil); |
1931
129d8225f748
* keyboard.c (recursive_edit_1, command_loop_1): Pass the proper
Jim Blandy <jimb@redhat.com>
parents:
1829
diff
changeset
|
2624 unbind_to (count, Qnil); |
265 | 2625 |
2626 return Qnil; | |
2627 } | |
2628 | |
3621
0576930165ed
(Fscroll_left): Make argument optional.
Richard M. Stallman <rms@gnu.org>
parents:
3535
diff
changeset
|
2629 DEFUN ("scroll-left", Fscroll_left, Sscroll_left, 0, 1, "P", |
265 | 2630 "Scroll selected window display ARG columns left.\n\ |
2631 Default for ARG is window width minus 2.") | |
2632 (arg) | |
2633 register Lisp_Object arg; | |
2634 { | |
2635 | |
485 | 2636 if (NILP (arg)) |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
2637 XSETFASTINT (arg, window_internal_width (XWINDOW (selected_window)) - 2); |
265 | 2638 else |
2639 arg = Fprefix_numeric_value (arg); | |
2640 | |
2641 return | |
2642 Fset_window_hscroll (selected_window, | |
2643 make_number (XINT (XWINDOW (selected_window)->hscroll) | |
2644 + XINT (arg))); | |
2645 } | |
2646 | |
3621
0576930165ed
(Fscroll_left): Make argument optional.
Richard M. Stallman <rms@gnu.org>
parents:
3535
diff
changeset
|
2647 DEFUN ("scroll-right", Fscroll_right, Sscroll_right, 0, 1, "P", |
265 | 2648 "Scroll selected window display ARG columns right.\n\ |
2649 Default for ARG is window width minus 2.") | |
2650 (arg) | |
2651 register Lisp_Object arg; | |
2652 { | |
485 | 2653 if (NILP (arg)) |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
2654 XSETFASTINT (arg, window_internal_width (XWINDOW (selected_window)) - 2); |
265 | 2655 else |
2656 arg = Fprefix_numeric_value (arg); | |
2657 | |
2658 return | |
2659 Fset_window_hscroll (selected_window, | |
2660 make_number (XINT (XWINDOW (selected_window)->hscroll) | |
2661 - XINT (arg))); | |
2662 } | |
2663 | |
2664 DEFUN ("recenter", Frecenter, Srecenter, 0, 1, "P", | |
769 | 2665 "Center point in window and redisplay frame. With ARG, put point on line ARG.\n\ |
265 | 2666 The desired position of point is always relative to the current window.\n\ |
769 | 2667 Just C-u as prefix means put point in the center of the window.\n\ |
2668 No arg (i.e., it is nil) erases the entire frame and then\n\ | |
2669 redraws with point in the center of the current window.") | |
265 | 2670 (n) |
2671 register Lisp_Object n; | |
2672 { | |
2673 register struct window *w = XWINDOW (selected_window); | |
2674 register int ht = window_internal_height (w); | |
9243
c35d0ed03819
(Frecenter): Don't trigger point-motion hooks.
Karl Heuer <kwzh@gnu.org>
parents:
9114
diff
changeset
|
2675 struct position pos; |
6326
5e662ad3f594
(Fdelete_other_windows): Pass new arg to Fvertical_motion.
Richard M. Stallman <rms@gnu.org>
parents:
6269
diff
changeset
|
2676 Lisp_Object window; |
265 | 2677 |
485 | 2678 if (NILP (n)) |
265 | 2679 { |
769 | 2680 extern int frame_garbaged; |
265 | 2681 |
769 | 2682 SET_FRAME_GARBAGED (XFRAME (WINDOW_FRAME (w))); |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
2683 XSETFASTINT (n, ht / 2); |
265 | 2684 } |
9105
984a4b1be1d1
(Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents:
9028
diff
changeset
|
2685 else if (CONSP (n)) /* Just C-u. */ |
265 | 2686 { |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
2687 XSETFASTINT (n, ht / 2); |
265 | 2688 } |
2689 else | |
2690 { | |
2691 n = Fprefix_numeric_value (n); | |
2692 CHECK_NUMBER (n, 0); | |
2693 } | |
2694 | |
2695 if (XINT (n) < 0) | |
2696 XSETINT (n, XINT (n) + ht); | |
2697 | |
9282
f4fa46f6a032
(Fminibuffer_window, Fwindow_at, Fwindow_end, Fnext_window, Fprevious_window,
Karl Heuer <kwzh@gnu.org>
parents:
9243
diff
changeset
|
2698 XSETWINDOW (window, w); |
9243
c35d0ed03819
(Frecenter): Don't trigger point-motion hooks.
Karl Heuer <kwzh@gnu.org>
parents:
9114
diff
changeset
|
2699 pos = *vmotion (point, - XINT (n), window_internal_width (w) - 1, |
c35d0ed03819
(Frecenter): Don't trigger point-motion hooks.
Karl Heuer <kwzh@gnu.org>
parents:
9114
diff
changeset
|
2700 XINT (w->hscroll), window); |
c35d0ed03819
(Frecenter): Don't trigger point-motion hooks.
Karl Heuer <kwzh@gnu.org>
parents:
9114
diff
changeset
|
2701 |
c35d0ed03819
(Frecenter): Don't trigger point-motion hooks.
Karl Heuer <kwzh@gnu.org>
parents:
9114
diff
changeset
|
2702 Fset_marker (w->start, make_number (pos.bufpos), w->buffer); |
c35d0ed03819
(Frecenter): Don't trigger point-motion hooks.
Karl Heuer <kwzh@gnu.org>
parents:
9114
diff
changeset
|
2703 w->start_at_line_beg = ((pos.bufpos == BEGV |
c35d0ed03819
(Frecenter): Don't trigger point-motion hooks.
Karl Heuer <kwzh@gnu.org>
parents:
9114
diff
changeset
|
2704 || FETCH_CHAR (pos.bufpos - 1) == '\n') |
c35d0ed03819
(Frecenter): Don't trigger point-motion hooks.
Karl Heuer <kwzh@gnu.org>
parents:
9114
diff
changeset
|
2705 ? Qt : Qnil); |
265 | 2706 w->force_start = Qt; |
2707 | |
2708 return Qnil; | |
2709 } | |
2710 | |
2711 DEFUN ("move-to-window-line", Fmove_to_window_line, Smove_to_window_line, | |
2712 1, 1, "P", | |
2713 "Position point relative to window.\n\ | |
8411
9a68cba600fc
(Fmove_to_window_line): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8366
diff
changeset
|
2714 With no argument, position point at center of window.\n\ |
769 | 2715 An argument specifies frame line; zero means top of window,\n\ |
265 | 2716 negative means relative to bottom of window.") |
2717 (arg) | |
2718 register Lisp_Object arg; | |
2719 { | |
2720 register struct window *w = XWINDOW (selected_window); | |
2721 register int height = window_internal_height (w); | |
2722 register int start; | |
6326
5e662ad3f594
(Fdelete_other_windows): Pass new arg to Fvertical_motion.
Richard M. Stallman <rms@gnu.org>
parents:
6269
diff
changeset
|
2723 Lisp_Object window; |
265 | 2724 |
485 | 2725 if (NILP (arg)) |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
2726 XSETFASTINT (arg, height / 2); |
265 | 2727 else |
2728 { | |
2729 arg = Fprefix_numeric_value (arg); | |
2730 if (XINT (arg) < 0) | |
2731 XSETINT (arg, XINT (arg) + height); | |
2732 } | |
2733 | |
2734 start = marker_position (w->start); | |
9282
f4fa46f6a032
(Fminibuffer_window, Fwindow_at, Fwindow_end, Fnext_window, Fprevious_window,
Karl Heuer <kwzh@gnu.org>
parents:
9243
diff
changeset
|
2735 XSETWINDOW (window, w); |
265 | 2736 if (start < BEGV || start > ZV) |
2737 { | |
6341
dfc758dd2b08
(window_scroll, Fmove_to_window_line): Avoid dividing negative numbers,
Karl Heuer <kwzh@gnu.org>
parents:
6326
diff
changeset
|
2738 Fvertical_motion (make_number (- (height / 2)), window); |
7347 | 2739 Fset_marker (w->start, make_number (PT), w->buffer); |
265 | 2740 w->start_at_line_beg = Fbolp (); |
2741 w->force_start = Qt; | |
2742 } | |
2743 else | |
2744 SET_PT (start); | |
2745 | |
6326
5e662ad3f594
(Fdelete_other_windows): Pass new arg to Fvertical_motion.
Richard M. Stallman <rms@gnu.org>
parents:
6269
diff
changeset
|
2746 return Fvertical_motion (arg, window); |
265 | 2747 } |
2748 | |
2749 struct save_window_data | |
2750 { | |
2751 int size_from_Lisp_Vector_struct; | |
2752 struct Lisp_Vector *next_from_Lisp_Vector_struct; | |
6099
19eaf70457d4
(Fset_window_configuration): Allow for menu-bar-lines to have changed since
Karl Heuer <kwzh@gnu.org>
parents:
5990
diff
changeset
|
2753 Lisp_Object frame_width, frame_height, frame_menu_bar_lines; |
1325
f03e559aac3e
* window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents:
1280
diff
changeset
|
2754 Lisp_Object selected_frame; |
265 | 2755 Lisp_Object current_window; |
2756 Lisp_Object current_buffer; | |
2757 Lisp_Object minibuf_scroll_window; | |
2758 Lisp_Object root_window; | |
1325
f03e559aac3e
* window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents:
1280
diff
changeset
|
2759 Lisp_Object focus_frame; |
8931
c64388cd7346
(struct saved_window_data): New slots min_width, min_height.
Richard M. Stallman <rms@gnu.org>
parents:
8536
diff
changeset
|
2760 /* Record the values of window-min-width and window-min-height |
c64388cd7346
(struct saved_window_data): New slots min_width, min_height.
Richard M. Stallman <rms@gnu.org>
parents:
8536
diff
changeset
|
2761 so that window sizes remain consistent with them. */ |
c64388cd7346
(struct saved_window_data): New slots min_width, min_height.
Richard M. Stallman <rms@gnu.org>
parents:
8536
diff
changeset
|
2762 Lisp_Object min_width, min_height; |
265 | 2763 /* A vector, interpreted as a struct saved_window */ |
2764 Lisp_Object saved_windows; | |
2765 }; | |
1326
709532b86646
* window.c (SAVE_WINDOW_DATA_SIZE): Define this using sizeof,
Jim Blandy <jimb@redhat.com>
parents:
1325
diff
changeset
|
2766 |
265 | 2767 /* This is saved as a Lisp_Vector */ |
2768 struct saved_window | |
2769 { | |
2770 /* these first two must agree with struct Lisp_Vector in lisp.h */ | |
2771 int size_from_Lisp_Vector_struct; | |
2772 struct Lisp_Vector *next_from_Lisp_Vector_struct; | |
2773 | |
2774 Lisp_Object window; | |
2775 Lisp_Object buffer, start, pointm, mark; | |
2776 Lisp_Object left, top, width, height, hscroll; | |
2777 Lisp_Object parent, prev; | |
2778 Lisp_Object start_at_line_beg; | |
2779 Lisp_Object display_table; | |
2780 }; | |
2781 #define SAVED_WINDOW_VECTOR_SIZE 14 /* Arg to Fmake_vector */ | |
2782 | |
2783 #define SAVED_WINDOW_N(swv,n) \ | |
2784 ((struct saved_window *) (XVECTOR ((swv)->contents[(n)]))) | |
2785 | |
2786 DEFUN ("window-configuration-p", Fwindow_configuration_p, Swindow_configuration_p, 1, 1, 0, | |
2787 "T if OBJECT is a window-configration object.") | |
2788 (obj) | |
2789 Lisp_Object obj; | |
2790 { | |
9105
984a4b1be1d1
(Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents:
9028
diff
changeset
|
2791 if (WINDOW_CONFIGURATIONP (obj)) |
265 | 2792 return Qt; |
2793 return Qnil; | |
2794 } | |
2795 | |
2796 | |
2297
bb88d48c290f
(Fselect_window): Use Fhandle_switch_frame.
Richard M. Stallman <rms@gnu.org>
parents:
2210
diff
changeset
|
2797 DEFUN ("set-window-configuration", Fset_window_configuration, |
bb88d48c290f
(Fselect_window): Use Fhandle_switch_frame.
Richard M. Stallman <rms@gnu.org>
parents:
2210
diff
changeset
|
2798 Sset_window_configuration, 1, 1, 0, |
265 | 2799 "Set the configuration of windows and buffers as specified by CONFIGURATION.\n\ |
2800 CONFIGURATION must be a value previously returned\n\ | |
2801 by `current-window-configuration' (which see).") | |
1016
817b0ce337d7
* window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents:
983
diff
changeset
|
2802 (configuration) |
817b0ce337d7
* window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents:
983
diff
changeset
|
2803 Lisp_Object configuration; |
265 | 2804 { |
2805 register struct save_window_data *data; | |
2806 struct Lisp_Vector *saved_windows; | |
2807 Lisp_Object new_current_buffer; | |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2808 Lisp_Object frame; |
769 | 2809 FRAME_PTR f; |
265 | 2810 |
9105
984a4b1be1d1
(Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents:
9028
diff
changeset
|
2811 while (!WINDOW_CONFIGURATIONP (configuration)) |
265 | 2812 { |
1016
817b0ce337d7
* window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents:
983
diff
changeset
|
2813 configuration = wrong_type_argument (intern ("window-configuration-p"), |
817b0ce337d7
* window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents:
983
diff
changeset
|
2814 configuration); |
265 | 2815 } |
2816 | |
1016
817b0ce337d7
* window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents:
983
diff
changeset
|
2817 data = (struct save_window_data *) XVECTOR (configuration); |
265 | 2818 saved_windows = XVECTOR (data->saved_windows); |
2819 | |
2820 new_current_buffer = data->current_buffer; | |
485 | 2821 if (NILP (XBUFFER (new_current_buffer)->name)) |
265 | 2822 new_current_buffer = Qnil; |
2823 | |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2824 frame = XWINDOW (SAVED_WINDOW_N (saved_windows, 0)->window)->frame; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2825 f = XFRAME (frame); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2826 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2827 /* If f is a dead frame, don't bother rebuilding its window tree. |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2828 However, there is other stuff we should still try to do below. */ |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2829 if (FRAME_LIVE_P (f)) |
265 | 2830 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2831 register struct window *w; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2832 register struct saved_window *p; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2833 int k; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2834 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2835 /* If the frame has been resized since this window configuration was |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2836 made, we change the frame to the size specified in the |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2837 configuration, restore the configuration, and then resize it |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2838 back. We keep track of the prevailing height in these variables. */ |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2839 int previous_frame_height = FRAME_HEIGHT (f); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2840 int previous_frame_width = FRAME_WIDTH (f); |
6099
19eaf70457d4
(Fset_window_configuration): Allow for menu-bar-lines to have changed since
Karl Heuer <kwzh@gnu.org>
parents:
5990
diff
changeset
|
2841 int previous_frame_menu_bar_lines = FRAME_MENU_BAR_LINES (f); |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2842 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2843 if (XFASTINT (data->frame_height) != previous_frame_height |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2844 || XFASTINT (data->frame_width) != previous_frame_width) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2845 change_frame_size (f, data->frame_height, data->frame_width, 0, 0); |
6852
5cc78dd8efc3
(Fset_window_configuration): Only call X fns if HAVE_X_WINDOWS.
Karl Heuer <kwzh@gnu.org>
parents:
6851
diff
changeset
|
2846 #ifdef HAVE_X_WINDOWS |
6099
19eaf70457d4
(Fset_window_configuration): Allow for menu-bar-lines to have changed since
Karl Heuer <kwzh@gnu.org>
parents:
5990
diff
changeset
|
2847 if (XFASTINT (data->frame_menu_bar_lines) |
19eaf70457d4
(Fset_window_configuration): Allow for menu-bar-lines to have changed since
Karl Heuer <kwzh@gnu.org>
parents:
5990
diff
changeset
|
2848 != previous_frame_menu_bar_lines) |
19eaf70457d4
(Fset_window_configuration): Allow for menu-bar-lines to have changed since
Karl Heuer <kwzh@gnu.org>
parents:
5990
diff
changeset
|
2849 x_set_menu_bar_lines (f, data->frame_menu_bar_lines, 0); |
6852
5cc78dd8efc3
(Fset_window_configuration): Only call X fns if HAVE_X_WINDOWS.
Karl Heuer <kwzh@gnu.org>
parents:
6851
diff
changeset
|
2850 #endif |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2851 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2852 windows_or_buffers_changed++; |
10666
e1dfb47b664e
(Fdelete_window, set_window_height, set_window_width)
Richard M. Stallman <rms@gnu.org>
parents:
10461
diff
changeset
|
2853 FRAME_WINDOW_SIZES_CHANGED (f) = 1; |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2854 |
8931
c64388cd7346
(struct saved_window_data): New slots min_width, min_height.
Richard M. Stallman <rms@gnu.org>
parents:
8536
diff
changeset
|
2855 /* Temporarily avoid any problems with windows that are smaller |
c64388cd7346
(struct saved_window_data): New slots min_width, min_height.
Richard M. Stallman <rms@gnu.org>
parents:
8536
diff
changeset
|
2856 than they are supposed to be. */ |
c64388cd7346
(struct saved_window_data): New slots min_width, min_height.
Richard M. Stallman <rms@gnu.org>
parents:
8536
diff
changeset
|
2857 window_min_height = 1; |
c64388cd7346
(struct saved_window_data): New slots min_width, min_height.
Richard M. Stallman <rms@gnu.org>
parents:
8536
diff
changeset
|
2858 window_min_width = 1; |
c64388cd7346
(struct saved_window_data): New slots min_width, min_height.
Richard M. Stallman <rms@gnu.org>
parents:
8536
diff
changeset
|
2859 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2860 /* Kludge Alert! |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2861 Mark all windows now on frame as "deleted". |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2862 Restoring the new configuration "undeletes" any that are in it. |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2863 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2864 Save their current buffers in their height fields, since we may |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2865 need it later, if a buffer saved in the configuration is now |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2866 dead. */ |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2867 delete_all_subwindows (XWINDOW (FRAME_ROOT_WINDOW (f))); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2868 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2869 for (k = 0; k < saved_windows->size; k++) |
265 | 2870 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2871 p = SAVED_WINDOW_N (saved_windows, k); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2872 w = XWINDOW (p->window); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2873 w->next = Qnil; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2874 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2875 if (!NILP (p->parent)) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2876 w->parent = SAVED_WINDOW_N (saved_windows, |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2877 XFASTINT (p->parent))->window; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2878 else |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2879 w->parent = Qnil; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2880 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2881 if (!NILP (p->prev)) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2882 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2883 w->prev = SAVED_WINDOW_N (saved_windows, |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2884 XFASTINT (p->prev))->window; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2885 XWINDOW (w->prev)->next = p->window; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2886 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2887 else |
265 | 2888 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2889 w->prev = Qnil; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2890 if (!NILP (w->parent)) |
265 | 2891 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2892 if (EQ (p->width, XWINDOW (w->parent)->width)) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2893 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2894 XWINDOW (w->parent)->vchild = p->window; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2895 XWINDOW (w->parent)->hchild = Qnil; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2896 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2897 else |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2898 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2899 XWINDOW (w->parent)->hchild = p->window; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2900 XWINDOW (w->parent)->vchild = Qnil; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2901 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2902 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2903 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2904 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2905 /* If we squirreled away the buffer in the window's height, |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2906 restore it now. */ |
9105
984a4b1be1d1
(Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents:
9028
diff
changeset
|
2907 if (BUFFERP (w->height)) |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2908 w->buffer = w->height; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2909 w->left = p->left; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2910 w->top = p->top; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2911 w->width = p->width; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2912 w->height = p->height; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2913 w->hscroll = p->hscroll; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2914 w->display_table = p->display_table; |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
2915 XSETFASTINT (w->last_modified, 0); |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2916 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2917 /* Reinstall the saved buffer and pointers into it. */ |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2918 if (NILP (p->buffer)) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2919 w->buffer = p->buffer; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2920 else |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2921 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2922 if (!NILP (XBUFFER (p->buffer)->name)) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2923 /* If saved buffer is alive, install it. */ |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2924 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2925 w->buffer = p->buffer; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2926 w->start_at_line_beg = p->start_at_line_beg; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2927 set_marker_restricted (w->start, |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2928 Fmarker_position (p->start), |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2929 w->buffer); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2930 set_marker_restricted (w->pointm, |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2931 Fmarker_position (p->pointm), |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2932 w->buffer); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2933 Fset_marker (XBUFFER (w->buffer)->mark, |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2934 Fmarker_position (p->mark), w->buffer); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2935 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2936 /* As documented in Fcurrent_window_configuration, don't |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2937 save the location of point in the buffer which was current |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2938 when the window configuration was recorded. */ |
7618
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
2939 if (!EQ (p->buffer, new_current_buffer) |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
2940 && XBUFFER (p->buffer) == current_buffer) |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2941 Fgoto_char (w->pointm); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2942 } |
3535
581c09f72dbd
(Fset_window_configuration): If a window is supposed
Richard M. Stallman <rms@gnu.org>
parents:
3354
diff
changeset
|
2943 else if (NILP (w->buffer) || NILP (XBUFFER (w->buffer)->name)) |
581c09f72dbd
(Fset_window_configuration): If a window is supposed
Richard M. Stallman <rms@gnu.org>
parents:
3354
diff
changeset
|
2944 /* Else unless window has a live buffer, get one. */ |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2945 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2946 w->buffer = Fcdr (Fcar (Vbuffer_alist)); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2947 /* This will set the markers to beginning of visible |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2948 range. */ |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2949 set_marker_restricted (w->start, make_number (0), w->buffer); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2950 set_marker_restricted (w->pointm, make_number (0),w->buffer); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2951 w->start_at_line_beg = Qt; |
265 | 2952 } |
2953 else | |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2954 /* Keeping window's old buffer; make sure the markers |
3535
581c09f72dbd
(Fset_window_configuration): If a window is supposed
Richard M. Stallman <rms@gnu.org>
parents:
3354
diff
changeset
|
2955 are real. */ |
265 | 2956 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2957 /* Set window markers at start of visible range. */ |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2958 if (XMARKER (w->start)->buffer == 0) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2959 set_marker_restricted (w->start, make_number (0), |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2960 w->buffer); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2961 if (XMARKER (w->pointm)->buffer == 0) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2962 set_marker_restricted (w->pointm, |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2963 (make_number |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2964 (BUF_PT (XBUFFER (w->buffer)))), |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2965 w->buffer); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2966 w->start_at_line_beg = Qt; |
265 | 2967 } |
2968 } | |
2969 } | |
1237
3929b2135e58
* window.c (delete_all_subwindows): Save the window's buffer in
Jim Blandy <jimb@redhat.com>
parents:
1123
diff
changeset
|
2970 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2971 FRAME_ROOT_WINDOW (f) = data->root_window; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2972 Fselect_window (data->current_window); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2973 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2974 #ifdef MULTI_FRAME |
1716
95db936d47c0
* keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents:
1685
diff
changeset
|
2975 if (NILP (data->focus_frame) |
9105
984a4b1be1d1
(Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents:
9028
diff
changeset
|
2976 || (FRAMEP (data->focus_frame) |
1716
95db936d47c0
* keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents:
1685
diff
changeset
|
2977 && FRAME_LIVE_P (XFRAME (data->focus_frame)))) |
95db936d47c0
* keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents:
1685
diff
changeset
|
2978 Fredirect_frame_focus (frame, data->focus_frame); |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2979 #endif |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2980 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2981 #if 0 /* I don't understand why this is needed, and it causes problems |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2982 when the frame's old selected window has been deleted. */ |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2983 #ifdef MULTI_FRAME |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2984 if (f != selected_frame && ! FRAME_TERMCAP_P (f)) |
2297
bb88d48c290f
(Fselect_window): Use Fhandle_switch_frame.
Richard M. Stallman <rms@gnu.org>
parents:
2210
diff
changeset
|
2985 Fhandle_switch_frame (WINDOW_FRAME (XWINDOW (data->root_window)), Qnil); |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2986 #endif |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2987 #endif |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2988 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2989 /* Set the screen height to the value it had before this function. */ |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2990 if (previous_frame_height != FRAME_HEIGHT (f) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2991 || previous_frame_width != FRAME_WIDTH (f)) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2992 change_frame_size (f, previous_frame_height, previous_frame_width, |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
2993 0, 0); |
6852
5cc78dd8efc3
(Fset_window_configuration): Only call X fns if HAVE_X_WINDOWS.
Karl Heuer <kwzh@gnu.org>
parents:
6851
diff
changeset
|
2994 #ifdef HAVE_X_WINDOWS |
6099
19eaf70457d4
(Fset_window_configuration): Allow for menu-bar-lines to have changed since
Karl Heuer <kwzh@gnu.org>
parents:
5990
diff
changeset
|
2995 if (previous_frame_menu_bar_lines != FRAME_MENU_BAR_LINES (f)) |
19eaf70457d4
(Fset_window_configuration): Allow for menu-bar-lines to have changed since
Karl Heuer <kwzh@gnu.org>
parents:
5990
diff
changeset
|
2996 x_set_menu_bar_lines (f, previous_frame_menu_bar_lines, 0); |
6852
5cc78dd8efc3
(Fset_window_configuration): Only call X fns if HAVE_X_WINDOWS.
Karl Heuer <kwzh@gnu.org>
parents:
6851
diff
changeset
|
2997 #endif |
265 | 2998 } |
2999 | |
8931
c64388cd7346
(struct saved_window_data): New slots min_width, min_height.
Richard M. Stallman <rms@gnu.org>
parents:
8536
diff
changeset
|
3000 /* Restore the minimum heights recorded in the configuration. */ |
c64388cd7346
(struct saved_window_data): New slots min_width, min_height.
Richard M. Stallman <rms@gnu.org>
parents:
8536
diff
changeset
|
3001 window_min_height = XINT (data->min_height); |
c64388cd7346
(struct saved_window_data): New slots min_width, min_height.
Richard M. Stallman <rms@gnu.org>
parents:
8536
diff
changeset
|
3002 window_min_width = XINT (data->min_width); |
c64388cd7346
(struct saved_window_data): New slots min_width, min_height.
Richard M. Stallman <rms@gnu.org>
parents:
8536
diff
changeset
|
3003 |
1572
04c1b4719e60
* window.c (Fset_window_configuration): Protect call to
Jim Blandy <jimb@redhat.com>
parents:
1525
diff
changeset
|
3004 #ifdef MULTI_FRAME |
1325
f03e559aac3e
* window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents:
1280
diff
changeset
|
3005 /* Fselect_window will have made f the selected frame, so we |
2297
bb88d48c290f
(Fselect_window): Use Fhandle_switch_frame.
Richard M. Stallman <rms@gnu.org>
parents:
2210
diff
changeset
|
3006 reselect the proper frame here. Fhandle_switch_frame will change the |
1325
f03e559aac3e
* window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents:
1280
diff
changeset
|
3007 selected window too, but that doesn't make the call to |
f03e559aac3e
* window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents:
1280
diff
changeset
|
3008 Fselect_window above totally superfluous; it still sets f's |
f03e559aac3e
* window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents:
1280
diff
changeset
|
3009 selected window. */ |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
3010 if (FRAME_LIVE_P (XFRAME (data->selected_frame))) |
2297
bb88d48c290f
(Fselect_window): Use Fhandle_switch_frame.
Richard M. Stallman <rms@gnu.org>
parents:
2210
diff
changeset
|
3011 Fhandle_switch_frame (data->selected_frame, Qnil); |
1572
04c1b4719e60
* window.c (Fset_window_configuration): Protect call to
Jim Blandy <jimb@redhat.com>
parents:
1525
diff
changeset
|
3012 #endif |
1325
f03e559aac3e
* window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents:
1280
diff
changeset
|
3013 |
f03e559aac3e
* window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents:
1280
diff
changeset
|
3014 if (!NILP (new_current_buffer)) |
f03e559aac3e
* window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents:
1280
diff
changeset
|
3015 Fset_buffer (new_current_buffer); |
f03e559aac3e
* window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents:
1280
diff
changeset
|
3016 |
265 | 3017 Vminibuf_scroll_window = data->minibuf_scroll_window; |
3018 return (Qnil); | |
3019 } | |
3020 | |
769 | 3021 /* Mark all windows now on frame as deleted |
265 | 3022 by setting their buffers to nil. */ |
3023 | |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
3024 void |
265 | 3025 delete_all_subwindows (w) |
3026 register struct window *w; | |
3027 { | |
485 | 3028 if (!NILP (w->next)) |
265 | 3029 delete_all_subwindows (XWINDOW (w->next)); |
485 | 3030 if (!NILP (w->vchild)) |
265 | 3031 delete_all_subwindows (XWINDOW (w->vchild)); |
485 | 3032 if (!NILP (w->hchild)) |
265 | 3033 delete_all_subwindows (XWINDOW (w->hchild)); |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
3034 |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
3035 w->height = w->buffer; /* See Fset_window_configuration for excuse. */ |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
3036 |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
3037 /* We set all three of these fields to nil, to make sure that we can |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
3038 distinguish this dead window from any live window. Live leaf |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
3039 windows will have buffer set, and combination windows will have |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
3040 vchild or hchild set. */ |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
3041 w->buffer = Qnil; |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
3042 w->vchild = Qnil; |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
3043 w->hchild = Qnil; |
265 | 3044 } |
3045 | |
3046 static int | |
3047 count_windows (window) | |
3048 register struct window *window; | |
3049 { | |
3050 register int count = 1; | |
485 | 3051 if (!NILP (window->next)) |
265 | 3052 count += count_windows (XWINDOW (window->next)); |
485 | 3053 if (!NILP (window->vchild)) |
265 | 3054 count += count_windows (XWINDOW (window->vchild)); |
485 | 3055 if (!NILP (window->hchild)) |
265 | 3056 count += count_windows (XWINDOW (window->hchild)); |
3057 return count; | |
3058 } | |
3059 | |
3060 static int | |
3061 save_window_save (window, vector, i) | |
3062 Lisp_Object window; | |
3063 struct Lisp_Vector *vector; | |
3064 int i; | |
3065 { | |
3066 register struct saved_window *p; | |
3067 register struct window *w; | |
3068 register Lisp_Object tem; | |
3069 | |
485 | 3070 for (;!NILP (window); window = w->next) |
265 | 3071 { |
3072 p = SAVED_WINDOW_N (vector, i); | |
3073 w = XWINDOW (window); | |
3074 | |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
3075 XSETFASTINT (w->temslot, i++); |
265 | 3076 p->window = window; |
3077 p->buffer = w->buffer; | |
3078 p->left = w->left; | |
3079 p->top = w->top; | |
3080 p->width = w->width; | |
3081 p->height = w->height; | |
3082 p->hscroll = w->hscroll; | |
3083 p->display_table = w->display_table; | |
485 | 3084 if (!NILP (w->buffer)) |
265 | 3085 { |
3086 /* Save w's value of point in the window configuration. | |
3087 If w is the selected window, then get the value of point | |
3088 from the buffer; pointm is garbage in the selected window. */ | |
3089 if (EQ (window, selected_window)) | |
3090 { | |
3091 p->pointm = Fmake_marker (); | |
3092 Fset_marker (p->pointm, BUF_PT (XBUFFER (w->buffer)), | |
3093 w->buffer); | |
3094 } | |
3095 else | |
3096 p->pointm = Fcopy_marker (w->pointm); | |
3097 | |
3098 p->start = Fcopy_marker (w->start); | |
3099 p->start_at_line_beg = w->start_at_line_beg; | |
3100 | |
3101 tem = XBUFFER (w->buffer)->mark; | |
3102 p->mark = Fcopy_marker (tem); | |
3103 } | |
3104 else | |
3105 { | |
3106 p->pointm = Qnil; | |
3107 p->start = Qnil; | |
3108 p->mark = Qnil; | |
3109 p->start_at_line_beg = Qnil; | |
3110 } | |
3111 | |
485 | 3112 if (NILP (w->parent)) |
265 | 3113 p->parent = Qnil; |
3114 else | |
3115 p->parent = XWINDOW (w->parent)->temslot; | |
3116 | |
485 | 3117 if (NILP (w->prev)) |
265 | 3118 p->prev = Qnil; |
3119 else | |
3120 p->prev = XWINDOW (w->prev)->temslot; | |
3121 | |
485 | 3122 if (!NILP (w->vchild)) |
265 | 3123 i = save_window_save (w->vchild, vector, i); |
485 | 3124 if (!NILP (w->hchild)) |
265 | 3125 i = save_window_save (w->hchild, vector, i); |
3126 } | |
3127 | |
3128 return i; | |
3129 } | |
3130 | |
3131 DEFUN ("current-window-configuration", | |
358 | 3132 Fcurrent_window_configuration, Scurrent_window_configuration, 0, 1, 0, |
769 | 3133 "Return an object representing the current window configuration of FRAME.\n\ |
3134 If FRAME is nil or omitted, use the selected frame.\n\ | |
265 | 3135 This describes the number of windows, their sizes and current buffers,\n\ |
3136 and for each displayed buffer, where display starts, and the positions of\n\ | |
3137 point and mark. An exception is made for point in the current buffer:\n\ | |
1325
f03e559aac3e
* window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents:
1280
diff
changeset
|
3138 its value is -not- saved.\n\ |
f03e559aac3e
* window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents:
1280
diff
changeset
|
3139 This also records the currently selected frame, and FRAME's focus\n\ |
f03e559aac3e
* window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents:
1280
diff
changeset
|
3140 redirection (see `redirect-frame-focus').") |
769 | 3141 (frame) |
3142 Lisp_Object frame; | |
265 | 3143 { |
3144 register Lisp_Object tem; | |
3145 register int n_windows; | |
3146 register struct save_window_data *data; | |
9974
5cda62e4222a
(Fcurrent_window_configuration): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9970
diff
changeset
|
3147 register struct Lisp_Vector *vec; |
265 | 3148 register int i; |
769 | 3149 FRAME_PTR f; |
265 | 3150 |
769 | 3151 if (NILP (frame)) |
3152 f = selected_frame; | |
358 | 3153 else |
3154 { | |
769 | 3155 CHECK_LIVE_FRAME (frame, 0); |
3156 f = XFRAME (frame); | |
358 | 3157 } |
3158 | |
769 | 3159 n_windows = count_windows (XWINDOW (FRAME_ROOT_WINDOW (f))); |
9974
5cda62e4222a
(Fcurrent_window_configuration): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9970
diff
changeset
|
3160 vec = allocate_vectorlike (VECSIZE (struct save_window_data)); |
5cda62e4222a
(Fcurrent_window_configuration): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9970
diff
changeset
|
3161 for (i = 0; i < VECSIZE (struct save_window_data); i++) |
5cda62e4222a
(Fcurrent_window_configuration): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9970
diff
changeset
|
3162 vec->contents[i] = Qnil; |
5cda62e4222a
(Fcurrent_window_configuration): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9970
diff
changeset
|
3163 vec->size = VECSIZE (struct save_window_data); |
5cda62e4222a
(Fcurrent_window_configuration): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9970
diff
changeset
|
3164 data = (struct save_window_data *)vec; |
5cda62e4222a
(Fcurrent_window_configuration): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9970
diff
changeset
|
3165 |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
3166 XSETFASTINT (data->frame_width, FRAME_WIDTH (f)); |
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
3167 XSETFASTINT (data->frame_height, FRAME_HEIGHT (f)); |
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
3168 XSETFASTINT (data->frame_menu_bar_lines, FRAME_MENU_BAR_LINES (f)); |
1572
04c1b4719e60
* window.c (Fset_window_configuration): Protect call to
Jim Blandy <jimb@redhat.com>
parents:
1525
diff
changeset
|
3169 #ifdef MULTI_FRAME |
9282
f4fa46f6a032
(Fminibuffer_window, Fwindow_at, Fwindow_end, Fnext_window, Fprevious_window,
Karl Heuer <kwzh@gnu.org>
parents:
9243
diff
changeset
|
3170 XSETFRAME (data->selected_frame, selected_frame); |
1572
04c1b4719e60
* window.c (Fset_window_configuration): Protect call to
Jim Blandy <jimb@redhat.com>
parents:
1525
diff
changeset
|
3171 #endif |
769 | 3172 data->current_window = FRAME_SELECTED_WINDOW (f); |
9282
f4fa46f6a032
(Fminibuffer_window, Fwindow_at, Fwindow_end, Fnext_window, Fprevious_window,
Karl Heuer <kwzh@gnu.org>
parents:
9243
diff
changeset
|
3173 XSETBUFFER (data->current_buffer, current_buffer); |
265 | 3174 data->minibuf_scroll_window = Vminibuf_scroll_window; |
769 | 3175 data->root_window = FRAME_ROOT_WINDOW (f); |
1325
f03e559aac3e
* window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents:
1280
diff
changeset
|
3176 data->focus_frame = FRAME_FOCUS_FRAME (f); |
9282
f4fa46f6a032
(Fminibuffer_window, Fwindow_at, Fwindow_end, Fnext_window, Fprevious_window,
Karl Heuer <kwzh@gnu.org>
parents:
9243
diff
changeset
|
3177 XSETINT (data->min_height, window_min_height); |
f4fa46f6a032
(Fminibuffer_window, Fwindow_at, Fwindow_end, Fnext_window, Fprevious_window,
Karl Heuer <kwzh@gnu.org>
parents:
9243
diff
changeset
|
3178 XSETINT (data->min_width, window_min_width); |
265 | 3179 tem = Fmake_vector (make_number (n_windows), Qnil); |
3180 data->saved_windows = tem; | |
3181 for (i = 0; i < n_windows; i++) | |
3182 XVECTOR (tem)->contents[i] | |
3183 = Fmake_vector (make_number (SAVED_WINDOW_VECTOR_SIZE), Qnil); | |
769 | 3184 save_window_save (FRAME_ROOT_WINDOW (f), |
265 | 3185 XVECTOR (tem), 0); |
9282
f4fa46f6a032
(Fminibuffer_window, Fwindow_at, Fwindow_end, Fnext_window, Fprevious_window,
Karl Heuer <kwzh@gnu.org>
parents:
9243
diff
changeset
|
3186 XSETWINDOW_CONFIGURATION (tem, data); |
265 | 3187 return (tem); |
3188 } | |
3189 | |
3190 DEFUN ("save-window-excursion", Fsave_window_excursion, Ssave_window_excursion, | |
3191 0, UNEVALLED, 0, | |
3192 "Execute body, preserving window sizes and contents.\n\ | |
8059
59baddaf62a0
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8053
diff
changeset
|
3193 Restore which buffer appears in which window, where display starts,\n\ |
59baddaf62a0
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8053
diff
changeset
|
3194 and the value of point and mark for each window.\n\ |
59baddaf62a0
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8053
diff
changeset
|
3195 Also restore which buffer is current.\n\ |
59baddaf62a0
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8053
diff
changeset
|
3196 But do not preserve point in the current buffer.\n\ |
265 | 3197 Does not restore the value of point in current buffer.") |
3198 (args) | |
3199 Lisp_Object args; | |
3200 { | |
3201 register Lisp_Object val; | |
3202 register int count = specpdl_ptr - specpdl; | |
3203 | |
3204 record_unwind_protect (Fset_window_configuration, | |
358 | 3205 Fcurrent_window_configuration (Qnil)); |
265 | 3206 val = Fprogn (args); |
3207 return unbind_to (count, val); | |
3208 } | |
3209 | |
3210 init_window_once () | |
3211 { | |
769 | 3212 #ifdef MULTI_FRAME |
3213 selected_frame = make_terminal_frame (); | |
3214 minibuf_window = selected_frame->minibuffer_window; | |
3215 selected_window = selected_frame->selected_window; | |
3216 last_nonminibuf_frame = selected_frame; | |
3217 #else /* not MULTI_FRAME */ | |
265 | 3218 extern Lisp_Object get_minibuffer (); |
3219 | |
9572 | 3220 selected_frame = last_nonminibuf_frame = &the_only_frame; |
3221 | |
983
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
3222 minibuf_window = make_window (); |
769 | 3223 FRAME_ROOT_WINDOW (selected_frame) = make_window (); |
265 | 3224 |
769 | 3225 XWINDOW (FRAME_ROOT_WINDOW (selected_frame))->next = minibuf_window; |
3226 XWINDOW (minibuf_window)->prev = FRAME_ROOT_WINDOW (selected_frame); | |
983
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
3227 XWINDOW (minibuf_window)->mini_p = Qt; |
265 | 3228 |
3229 /* These values 9 and 10 are arbitrary, | |
3230 just so that there is "something there." | |
3231 Correct values are put in in init_xdisp */ | |
3232 | |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
3233 XSETFASTINT (XWINDOW (FRAME_ROOT_WINDOW (selected_frame))->width, 10); |
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
3234 XSETFASTINT (XWINDOW (minibuf_window)->width, 10); |
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
3235 |
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
3236 XSETFASTINT (XWINDOW (FRAME_ROOT_WINDOW (selected_frame))->height, 9); |
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
3237 XSETFASTINT (XWINDOW (minibuf_window)->top, 9); |
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
3238 XSETFASTINT (XWINDOW (minibuf_window)->height, 1); |
265 | 3239 |
3240 /* Prevent error in Fset_window_buffer. */ | |
769 | 3241 XWINDOW (FRAME_ROOT_WINDOW (selected_frame))->buffer = Qt; |
265 | 3242 XWINDOW (minibuf_window)->buffer = Qt; |
3243 | |
3244 /* Now set them up for real. */ | |
769 | 3245 Fset_window_buffer (FRAME_ROOT_WINDOW (selected_frame), |
732 | 3246 Fcurrent_buffer ()); |
265 | 3247 Fset_window_buffer (minibuf_window, get_minibuffer (0)); |
3248 | |
769 | 3249 selected_window = FRAME_ROOT_WINDOW (selected_frame); |
362 | 3250 /* Make sure this window seems more recently used than |
3251 a newly-created, never-selected window. Increment | |
3252 window_select_count so the first selection ever will get | |
3253 something newer than this. */ | |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
3254 XSETFASTINT (XWINDOW (selected_window)->use_time, ++window_select_count); |
769 | 3255 #endif /* not MULTI_FRAME */ |
265 | 3256 } |
3257 | |
3258 syms_of_window () | |
3259 { | |
3260 Qwindowp = intern ("windowp"); | |
3261 staticpro (&Qwindowp); | |
3262 | |
2210
22d78dbb3cc7
Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents:
2190
diff
changeset
|
3263 Qwindow_live_p = intern ("window-live-p"); |
22d78dbb3cc7
Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents:
2190
diff
changeset
|
3264 staticpro (&Qwindow_live_p); |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
3265 |
10461
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
3266 Qtemp_buffer_show_hook = intern ("Qtemp-buffer-show-hook"); |
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
3267 staticpro (&Qtemp_buffer_show_hook); |
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
3268 |
1016
817b0ce337d7
* window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents:
983
diff
changeset
|
3269 #ifndef MULTI_FRAME |
265 | 3270 /* Make sure all windows get marked */ |
3271 staticpro (&minibuf_window); | |
1016
817b0ce337d7
* window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents:
983
diff
changeset
|
3272 #endif |
265 | 3273 |
3274 DEFVAR_LISP ("temp-buffer-show-function", &Vtemp_buffer_show_function, | |
3275 "Non-nil means call as function to display a help buffer.\n\ | |
9696
20d9e38be33f
(Vtemp_buffer_show_function): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9624
diff
changeset
|
3276 The function is called with one argument, the buffer to be displayed.\n\ |
265 | 3277 Used by `with-output-to-temp-buffer'."); |
3278 Vtemp_buffer_show_function = Qnil; | |
3279 | |
3280 DEFVAR_LISP ("display-buffer-function", &Vdisplay_buffer_function, | |
3281 "If non-nil, function to call to handle `display-buffer'.\n\ | |
3282 It will receive two args, the buffer and a flag which if non-nil means\n\ | |
3283 that the currently selected window is not acceptable.\n\ | |
3284 Commands such as `switch-to-buffer-other-window' and `find-file-other-window'\n\ | |
3285 work using this function."); | |
3286 Vdisplay_buffer_function = Qnil; | |
3287 | |
3288 DEFVAR_LISP ("minibuffer-scroll-window", &Vminibuf_scroll_window, | |
3289 "Non-nil means it is the window that C-M-v in minibuffer should scroll."); | |
3290 Vminibuf_scroll_window = Qnil; | |
3291 | |
3292 DEFVAR_LISP ("other-window-scroll-buffer", &Vother_window_scroll_buffer, | |
3293 "If non-nil, this is a buffer and \\[scroll-other-window] should scroll its window."); | |
3294 Vother_window_scroll_buffer = Qnil; | |
3295 | |
769 | 3296 DEFVAR_BOOL ("pop-up-frames", &pop_up_frames, |
780 | 3297 "*Non-nil means `display-buffer' should make a separate frame."); |
769 | 3298 pop_up_frames = 0; |
265 | 3299 |
769 | 3300 DEFVAR_LISP ("pop-up-frame-function", &Vpop_up_frame_function, |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3301 "Function to call to handle automatic new frame creation.\n\ |
769 | 3302 It is called with no arguments and should return a newly created frame.\n\ |
265 | 3303 \n\ |
769 | 3304 A typical value might be `(lambda () (new-frame pop-up-frame-alist))'\n\ |
3305 where `pop-up-frame-alist' would hold the default frame parameters."); | |
3306 Vpop_up_frame_function = Qnil; | |
265 | 3307 |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3308 DEFVAR_LISP ("special-display-buffer-names", &Vspecial_display_buffer_names, |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3309 "*List of buffer names that should have their own special frames.\n\ |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3310 Displaying a buffer whose name is in this list makes a special frame for it\n\ |
8991
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
3311 using `special-display-function'.\n\ |
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
3312 Instead of a buffer name, the list entries can be cons cells. In that\n\ |
9702
50dd719378b4
(syms_of_window): Fix missing \n\'s.
Karl Heuer <kwzh@gnu.org>
parents:
9696
diff
changeset
|
3313 case the car should be a buffer name, and the cdr data to be passed as a\n\ |
8991
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
3314 second argument to `special-display-function'.\n\ |
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
3315 See also `special-display-regexps'."); |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3316 Vspecial_display_buffer_names = Qnil; |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3317 |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3318 DEFVAR_LISP ("special-display-regexps", &Vspecial_display_regexps, |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3319 "*List of regexps saying which buffers should have their own special frames.\n\ |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3320 If a buffer name matches one of these regexps, it gets its own frame.\n\ |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3321 Displaying a buffer whose name is in this list makes a special frame for it\n\ |
8991
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
3322 using `special-display-function'.\n\ |
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
3323 Instead of a buffer name, the list entries can be cons cells. In that\n\ |
9702
50dd719378b4
(syms_of_window): Fix missing \n\'s.
Karl Heuer <kwzh@gnu.org>
parents:
9696
diff
changeset
|
3324 case the car should be the regexp, and the cdr data to be passed as a\n\ |
8991
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
3325 second argument to `special-display-function'.\n\ |
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
3326 See also `special-display-buffer-names'."); |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3327 Vspecial_display_regexps = Qnil; |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3328 |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3329 DEFVAR_LISP ("special-display-function", &Vspecial_display_function, |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3330 "Function to call to make a new frame for a special buffer.\n\ |
8991
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
3331 It is called with two arguments, the buffer and optional buffer specific\n\ |
2a9359b721da
(display-buffer, special-display-buffer-names)
Richard M. Stallman <rms@gnu.org>
parents:
8944
diff
changeset
|
3332 data, and should return a window displaying that buffer.\n\ |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3333 The default value makes a separate frame for the buffer,\n\ |
9114
9853955949cf
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9105
diff
changeset
|
3334 using `special-display-frame-alist' to specify the frame parameters.\n\ |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3335 \n\ |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3336 A buffer is special if its is listed in `special-display-buffer-names'\n\ |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3337 or matches a regexp in `special-display-regexps'."); |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3338 Vspecial_display_function = Qnil; |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3339 |
265 | 3340 DEFVAR_BOOL ("pop-up-windows", &pop_up_windows, |
3341 "*Non-nil means display-buffer should make new windows."); | |
3342 pop_up_windows = 1; | |
3343 | |
3344 DEFVAR_INT ("next-screen-context-lines", &next_screen_context_lines, | |
3345 "*Number of lines of continuity when scrolling by screenfuls."); | |
3346 next_screen_context_lines = 2; | |
3347 | |
3348 DEFVAR_INT ("split-height-threshold", &split_height_threshold, | |
3349 "*display-buffer would prefer to split the largest window if this large.\n\ | |
3350 If there is only one window, it is split regardless of this value."); | |
3351 split_height_threshold = 500; | |
3352 | |
3353 DEFVAR_INT ("window-min-height", &window_min_height, | |
3354 "*Delete any window less than this tall (including its mode line)."); | |
3355 window_min_height = 4; | |
3356 | |
3357 DEFVAR_INT ("window-min-width", &window_min_width, | |
3358 "*Delete any window less than this wide."); | |
3359 window_min_width = 10; | |
3360 | |
3361 defsubr (&Sselected_window); | |
3362 defsubr (&Sminibuffer_window); | |
3363 defsubr (&Swindow_minibuffer_p); | |
3364 defsubr (&Swindowp); | |
2210
22d78dbb3cc7
Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents:
2190
diff
changeset
|
3365 defsubr (&Swindow_live_p); |
265 | 3366 defsubr (&Spos_visible_in_window_p); |
3367 defsubr (&Swindow_buffer); | |
3368 defsubr (&Swindow_height); | |
3369 defsubr (&Swindow_width); | |
3370 defsubr (&Swindow_hscroll); | |
3371 defsubr (&Sset_window_hscroll); | |
3372 defsubr (&Swindow_edges); | |
432 | 3373 defsubr (&Scoordinates_in_window_p); |
3374 defsubr (&Swindow_at); | |
265 | 3375 defsubr (&Swindow_point); |
3376 defsubr (&Swindow_start); | |
3377 defsubr (&Swindow_end); | |
3378 defsubr (&Sset_window_point); | |
3379 defsubr (&Sset_window_start); | |
3380 defsubr (&Swindow_dedicated_p); | |
722
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
3381 defsubr (&Sset_window_dedicated_p); |
265 | 3382 defsubr (&Swindow_display_table); |
3383 defsubr (&Sset_window_display_table); | |
3384 defsubr (&Snext_window); | |
3385 defsubr (&Sprevious_window); | |
3386 defsubr (&Sother_window); | |
3387 defsubr (&Sget_lru_window); | |
3388 defsubr (&Sget_largest_window); | |
3389 defsubr (&Sget_buffer_window); | |
3390 defsubr (&Sdelete_other_windows); | |
3391 defsubr (&Sdelete_windows_on); | |
3392 defsubr (&Sreplace_buffer_in_windows); | |
3393 defsubr (&Sdelete_window); | |
3394 defsubr (&Sset_window_buffer); | |
3395 defsubr (&Sselect_window); | |
3396 defsubr (&Sdisplay_buffer); | |
3397 defsubr (&Ssplit_window); | |
3398 defsubr (&Senlarge_window); | |
3399 defsubr (&Sshrink_window); | |
3400 defsubr (&Sscroll_up); | |
3401 defsubr (&Sscroll_down); | |
3402 defsubr (&Sscroll_left); | |
3403 defsubr (&Sscroll_right); | |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
3404 defsubr (&Sother_window_for_scrolling); |
265 | 3405 defsubr (&Sscroll_other_window); |
3406 defsubr (&Srecenter); | |
3407 defsubr (&Smove_to_window_line); | |
3408 defsubr (&Swindow_configuration_p); | |
3409 defsubr (&Sset_window_configuration); | |
3410 defsubr (&Scurrent_window_configuration); | |
3411 defsubr (&Ssave_window_excursion); | |
3412 } | |
3413 | |
3414 keys_of_window () | |
3415 { | |
3416 initial_define_key (control_x_map, '1', "delete-other-windows"); | |
3417 initial_define_key (control_x_map, '2', "split-window"); | |
3418 initial_define_key (control_x_map, '0', "delete-window"); | |
3419 initial_define_key (control_x_map, 'o', "other-window"); | |
3420 initial_define_key (control_x_map, '^', "enlarge-window"); | |
3421 initial_define_key (control_x_map, '<', "scroll-left"); | |
3422 initial_define_key (control_x_map, '>', "scroll-right"); | |
3423 | |
3424 initial_define_key (global_map, Ctl ('V'), "scroll-up"); | |
3425 initial_define_key (meta_map, Ctl ('V'), "scroll-other-window"); | |
3426 initial_define_key (meta_map, 'v', "scroll-down"); | |
3427 | |
3428 initial_define_key (global_map, Ctl('L'), "recenter"); | |
3429 initial_define_key (meta_map, 'r', "move-to-window-line"); | |
3430 } |