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