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