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