Mercurial > emacs
annotate src/window.c @ 62277:bac64e3149d8
(auto-mode-alist, interpreter-mode-alist): Set up the new variants of makefile-mode.
author | Daniel Pfeiffer <occitan@esperanto.org> |
---|---|
date | Fri, 13 May 2005 07:56:28 +0000 |
parents | dd7b3da13b8f |
children | 5283bd0173e6 effe22690419 08185296b491 |
rev | line source |
---|---|
265 | 1 /* Window creation, deletion and examination for GNU Emacs. |
2 Does not include redisplay. | |
61511
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
3 Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 2000, |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
4 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. |
265 | 5 |
6 This file is part of GNU Emacs. | |
7 | |
8 GNU Emacs is free software; you can redistribute it and/or modify | |
9 it under the terms of the GNU General Public License as published by | |
708 | 10 the Free Software Foundation; either version 2, or (at your option) |
265 | 11 any later version. |
12 | |
13 GNU Emacs is distributed in the hope that it will be useful, | |
14 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
16 GNU General Public License for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
19 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
|
20 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
|
21 Boston, MA 02111-1307, USA. */ |
265 | 22 |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4570
diff
changeset
|
23 #include <config.h> |
265 | 24 #include "lisp.h" |
25 #include "buffer.h" | |
31117
f390b90e3495
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30777
diff
changeset
|
26 #include "keyboard.h" |
39748
42b7a798ff79
Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
27 #include "keymap.h" |
769 | 28 #include "frame.h" |
265 | 29 #include "window.h" |
30 #include "commands.h" | |
31 #include "indent.h" | |
32 #include "termchar.h" | |
33 #include "disptab.h" | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
34 #include "dispextern.h" |
18657 | 35 #include "blockinput.h" |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
36 #include "intervals.h" |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
37 |
21825
697991d2a2c4
Conditionally include xterm.h using HAVE_X_WINDOWS.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21533
diff
changeset
|
38 #ifdef HAVE_X_WINDOWS |
21514 | 39 #include "xterm.h" |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
40 #endif /* HAVE_X_WINDOWS */ |
27633
ab6c81c6edf8
[WINDOWSNT]: Include w32term.h.
Andrew Innes <andrewi@gnu.org>
parents:
27553
diff
changeset
|
41 #ifdef WINDOWSNT |
ab6c81c6edf8
[WINDOWSNT]: Include w32term.h.
Andrew Innes <andrewi@gnu.org>
parents:
27553
diff
changeset
|
42 #include "w32term.h" |
ab6c81c6edf8
[WINDOWSNT]: Include w32term.h.
Andrew Innes <andrewi@gnu.org>
parents:
27553
diff
changeset
|
43 #endif |
27956
8d38dbe58989
[MSDOS]: Include msdos.h (for the definition of FRAME_INTERNAL_BORDER_WIDTH).
Eli Zaretskii <eliz@gnu.org>
parents:
27869
diff
changeset
|
44 #ifdef MSDOS |
8d38dbe58989
[MSDOS]: Include msdos.h (for the definition of FRAME_INTERNAL_BORDER_WIDTH).
Eli Zaretskii <eliz@gnu.org>
parents:
27869
diff
changeset
|
45 #include "msdos.h" |
8d38dbe58989
[MSDOS]: Include msdos.h (for the definition of FRAME_INTERNAL_BORDER_WIDTH).
Eli Zaretskii <eliz@gnu.org>
parents:
27869
diff
changeset
|
46 #endif |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44744
diff
changeset
|
47 #ifdef MAC_OS |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32710
diff
changeset
|
48 #include "macterm.h" |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32710
diff
changeset
|
49 #endif |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
50 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
51 |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
52 Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_configuration_p; |
41736
d583dac59ea4
(Qleft_fringe, Qright_fringe): Remove. Now in frame.c.
Jason Rumney <jasonr@gnu.org>
parents:
41719
diff
changeset
|
53 Lisp_Object Qwindow_size_fixed; |
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
54 extern Lisp_Object Qleft_margin, Qright_margin; |
265 | 55 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
56 static int displayed_window_lines P_ ((struct window *)); |
20351 | 57 static struct window *decode_window P_ ((Lisp_Object)); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
58 static int count_windows P_ ((struct window *)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
59 static int get_leaf_windows P_ ((struct window *, struct window **, int)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
60 static void window_scroll P_ ((Lisp_Object, int, int, int)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
61 static void window_scroll_pixel_based P_ ((Lisp_Object, int, int, int)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
62 static void window_scroll_line_based P_ ((Lisp_Object, int, int, int)); |
25268 | 63 static int window_min_size_1 P_ ((struct window *, int)); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
64 static int window_min_size P_ ((struct window *, int, int, int *)); |
25268 | 65 static void size_window P_ ((Lisp_Object, int, int, int)); |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
66 static int freeze_window_start P_ ((struct window *, void *)); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
67 static int window_fixed_size_p P_ ((struct window *, int, int)); |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
68 static void enlarge_window P_ ((Lisp_Object, int, int, int)); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
69 static Lisp_Object window_list P_ ((void)); |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
70 static int add_window_to_list P_ ((struct window *, void *)); |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
71 static int candidate_window_p P_ ((Lisp_Object, Lisp_Object, Lisp_Object, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
72 Lisp_Object)); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
73 static Lisp_Object next_window P_ ((Lisp_Object, Lisp_Object, |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
74 Lisp_Object, int)); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
75 static void decode_next_window_args P_ ((Lisp_Object *, Lisp_Object *, |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
76 Lisp_Object *)); |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
77 static int foreach_window_1 P_ ((struct window *, |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
78 int (* fn) (struct window *, void *), |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
79 void *)); |
33619
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
80 static Lisp_Object window_list_1 P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); |
22187
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
81 |
265 | 82 /* This is the window in which the terminal's cursor should |
83 be left when nothing is being done with it. This must | |
84 always be a leaf window, and its buffer is selected by | |
85 the top level editing loop at the end of each command. | |
86 | |
87 This value is always the same as | |
769 | 88 FRAME_SELECTED_WINDOW (selected_frame). */ |
265 | 89 |
90 Lisp_Object selected_window; | |
91 | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
92 /* A list of all windows for use by next_window and Fwindow_list. |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
93 Functions creating or deleting windows should invalidate this cache |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
94 by setting it to nil. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
95 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
96 Lisp_Object Vwindow_list; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
97 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
98 /* The mini-buffer window of the selected frame. |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
99 Note that you cannot test for mini-bufferness of an arbitrary window |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
100 by comparing against this; but you can test for mini-bufferness of |
265 | 101 the selected window. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
102 |
265 | 103 Lisp_Object minibuf_window; |
104 | |
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
105 /* Non-nil means it is the window whose mode line should be |
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
106 shown as the selected window when the minibuffer is selected. */ |
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
107 |
43594
23cddac4d0b7
(minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents:
43571
diff
changeset
|
108 Lisp_Object minibuf_selected_window; |
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
109 |
265 | 110 /* Non-nil means it is the window for C-M-v to scroll |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
111 when the mini-buffer is selected. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
112 |
265 | 113 Lisp_Object Vminibuf_scroll_window; |
114 | |
115 /* Non-nil means this is the buffer whose window C-M-v should scroll. */ | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
116 |
265 | 117 Lisp_Object Vother_window_scroll_buffer; |
118 | |
119 /* Non-nil means it's function to call to display temp buffers. */ | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
120 |
265 | 121 Lisp_Object Vtemp_buffer_show_function; |
122 | |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
123 /* Non-zero means line and page scrolling on tall lines (with images) |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
124 does partial scrolling by modifying window-vscroll. */ |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
125 |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
126 int auto_window_vscroll_p; |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
127 |
43281
a4ea76de57c9
(Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents:
43241
diff
changeset
|
128 /* Non-zero means to use mode-line-inactive face in all windows but the |
a4ea76de57c9
(Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents:
43241
diff
changeset
|
129 selected-window and the minibuffer-scroll-window when the |
a4ea76de57c9
(Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents:
43241
diff
changeset
|
130 minibuffer is active. */ |
a4ea76de57c9
(Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents:
43241
diff
changeset
|
131 int mode_line_in_non_selected_windows; |
43241
5558e7582f1f
(Vmode_line_in_non_selected_windows): New variable.
Kim F. Storm <storm@cua.dk>
parents:
42875
diff
changeset
|
132 |
265 | 133 /* If a window gets smaller than either of these, it is removed. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
134 |
43713
f92c4d87863a
Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43624
diff
changeset
|
135 EMACS_INT window_min_height; |
f92c4d87863a
Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43624
diff
changeset
|
136 EMACS_INT window_min_width; |
265 | 137 |
138 /* Nonzero implies Fdisplay_buffer should create windows. */ | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
139 |
265 | 140 int pop_up_windows; |
141 | |
769 | 142 /* Nonzero implies make new frames for Fdisplay_buffer. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
143 |
769 | 144 int pop_up_frames; |
265 | 145 |
30560
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
146 /* Nonzero means reuse existing frames for displaying buffers. */ |
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
147 |
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
148 int display_buffer_reuse_frames; |
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
149 |
265 | 150 /* Non-nil means use this function instead of default */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
151 |
769 | 152 Lisp_Object Vpop_up_frame_function; |
265 | 153 |
154 /* Function to call to handle Fdisplay_buffer. */ | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
155 |
265 | 156 Lisp_Object Vdisplay_buffer_function; |
157 | |
34261
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
158 /* Non-nil means that Fdisplay_buffer should even the heights of windows. */ |
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
159 |
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
160 Lisp_Object Veven_window_heights; |
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
161 |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
162 /* List of buffer *names* for buffers that should have their own frames. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
163 |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
164 Lisp_Object Vspecial_display_buffer_names; |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
165 |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
166 /* List of regexps for buffer names that should have their own frames. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
167 |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
168 Lisp_Object Vspecial_display_regexps; |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
169 |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
170 /* Function to pop up a special frame. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
171 |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
172 Lisp_Object Vspecial_display_function; |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
173 |
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
174 /* List of buffer *names* for buffers to appear in selected window. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
175 |
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
176 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
|
177 |
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
178 /* List of regexps for buffer names to appear in selected window. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
179 |
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
180 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
|
181 |
10461
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
182 /* Hook run at end of temp_output_buffer_show. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
183 |
10461
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
184 Lisp_Object Qtemp_buffer_show_hook; |
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
185 |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
186 /* Fdisplay_buffer always splits the largest window |
265 | 187 if that window is more than this high. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
188 |
43713
f92c4d87863a
Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43624
diff
changeset
|
189 EMACS_INT split_height_threshold; |
265 | 190 |
191 /* Number of lines of continuity in scrolling by screenfuls. */ | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
192 |
43713
f92c4d87863a
Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43624
diff
changeset
|
193 EMACS_INT next_screen_context_lines; |
265 | 194 |
195 /* Incremented for each window created. */ | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
196 |
265 | 197 static int sequence_number; |
198 | |
14445
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
199 /* Nonzero after init_window_once has finished. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
200 |
14445
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
201 static int window_initialized; |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
202 |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
203 /* Hook to run when window config changes. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
204 |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
205 Lisp_Object Qwindow_configuration_change_hook; |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
206 Lisp_Object Vwindow_configuration_change_hook; |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
207 |
58083 | 208 /* Non-nil means scroll commands try to put point |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
209 at the same screen height as previously. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
210 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
211 Lisp_Object Vscroll_preserve_screen_position; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
212 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
213 #if 0 /* This isn't used anywhere. */ |
17962
8621a73a8890
(syms_of_window): Initialize inhibit_frame_unsplittable.
Richard M. Stallman <rms@gnu.org>
parents:
17955
diff
changeset
|
214 /* Nonzero means we can split a frame even if it is "unsplittable". */ |
17955
3140e48262f9
frame-override-unsplittable/inhibit-frame-unsplittable name change.
Simon Marshall <simon@gnu.org>
parents:
17952
diff
changeset
|
215 static int inhibit_frame_unsplittable; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
216 #endif /* 0 */ |
17540
eb82c4de9dea
(frame_allow_splitting): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17365
diff
changeset
|
217 |
43713
f92c4d87863a
Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43624
diff
changeset
|
218 extern EMACS_INT scroll_margin; |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
219 |
14149
0d67df27dc2a
(Fset_window_buffer): Call the window-scroll-functions.
Richard M. Stallman <rms@gnu.org>
parents:
14089
diff
changeset
|
220 extern Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions; |
265 | 221 |
222 DEFUN ("windowp", Fwindowp, Swindowp, 1, 1, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
223 doc: /* Returns t if OBJECT is a window. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
224 (object) |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
225 Lisp_Object object; |
265 | 226 { |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
227 return WINDOWP (object) ? Qt : Qnil; |
265 | 228 } |
229 | |
2210
22d78dbb3cc7
Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents:
2190
diff
changeset
|
230 DEFUN ("window-live-p", Fwindow_live_p, Swindow_live_p, 1, 1, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
231 doc: /* Returns t if OBJECT is a window which is currently visible. */) |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
232 (object) |
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
233 Lisp_Object object; |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
234 { |
35398
ef34ddc12a7d
* window.c (Fwindow_live_p): Use WINDOW_LIVE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
35396
diff
changeset
|
235 return WINDOW_LIVE_P (object) ? Qt : Qnil; |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
236 } |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
237 |
265 | 238 Lisp_Object |
239 make_window () | |
240 { | |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
241 Lisp_Object val; |
265 | 242 register struct window *p; |
36432
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
243 |
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
244 p = allocate_window (); |
58265
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
245 ++sequence_number; |
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
246 XSETFASTINT (p->sequence_number, sequence_number); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
247 XSETFASTINT (p->left_col, 0); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
248 XSETFASTINT (p->top_line, 0); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
249 XSETFASTINT (p->total_lines, 0); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
250 XSETFASTINT (p->total_cols, 0); |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
251 XSETFASTINT (p->hscroll, 0); |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
252 XSETFASTINT (p->min_hscroll, 0); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
253 p->orig_top_line = p->orig_total_lines = Qnil; |
265 | 254 p->start = Fmake_marker (); |
255 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
|
256 XSETFASTINT (p->use_time, 0); |
769 | 257 p->frame = Qnil; |
265 | 258 p->display_table = Qnil; |
259 p->dedicated = Qnil; | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
260 p->pseudo_window_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
261 bzero (&p->cursor, sizeof (p->cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
262 bzero (&p->last_cursor, sizeof (p->last_cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
263 bzero (&p->phys_cursor, sizeof (p->phys_cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
264 p->desired_matrix = p->current_matrix = 0; |
56497
8f77d7fac4d6
(make_window): Initialize nrows_scale_factor and
Kim F. Storm <storm@cua.dk>
parents:
56487
diff
changeset
|
265 p->nrows_scale_factor = p->ncols_scale_factor = 1; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
266 p->phys_cursor_type = -1; |
43620
8a5d6239662c
(make_window, replace_window): Initialize phys_cursor_width.
Kim F. Storm <storm@cua.dk>
parents:
43597
diff
changeset
|
267 p->phys_cursor_width = -1; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
268 p->must_be_updated_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
269 XSETFASTINT (p->window_end_vpos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
270 XSETFASTINT (p->window_end_pos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
271 p->window_end_valid = Qnil; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
272 p->vscroll = 0; |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
273 XSETWINDOW (val, p); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
274 XSETFASTINT (p->last_point, 0); |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
275 p->frozen_window_start_p = 0; |
44744
8c52c2bf3b3f
(make_window): Initialize height_fixed_p,
Richard M. Stallman <rms@gnu.org>
parents:
44649
diff
changeset
|
276 p->height_fixed_p = 0; |
8c52c2bf3b3f
(make_window): Initialize height_fixed_p,
Richard M. Stallman <rms@gnu.org>
parents:
44649
diff
changeset
|
277 p->last_cursor_off_p = p->cursor_off_p = 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
278 p->left_margin_cols = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
279 p->right_margin_cols = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
280 p->left_fringe_width = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
281 p->right_fringe_width = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
282 p->fringes_outside_margins = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
283 p->scroll_bar_width = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
284 p->vertical_scroll_bar_type = Qt; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
285 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
286 Vwindow_list = Qnil; |
265 | 287 return val; |
288 } | |
289 | |
290 DEFUN ("selected-window", Fselected_window, Sselected_window, 0, 0, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
291 doc: /* Return the window that the cursor now appears in and commands apply to. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
292 () |
265 | 293 { |
294 return selected_window; | |
295 } | |
296 | |
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
297 DEFUN ("minibuffer-window", Fminibuffer_window, Sminibuffer_window, 0, 1, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
298 doc: /* Return the window used now for minibuffers. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
299 If the optional argument FRAME is specified, return the minibuffer window |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
300 used by that frame. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
301 (frame) |
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
302 Lisp_Object frame; |
265 | 303 { |
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
304 if (NILP (frame)) |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
305 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
306 CHECK_LIVE_FRAME (frame); |
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
307 return FRAME_MINIBUF_WINDOW (XFRAME (frame)); |
265 | 308 } |
309 | |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
310 DEFUN ("window-minibuffer-p", Fwindow_minibuffer_p, Swindow_minibuffer_p, 0, 1, 0, |
53703
7e4022bbad27
(Fwindow_minibuffer_p): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53492
diff
changeset
|
311 doc: /* Returns non-nil if WINDOW is a minibuffer window. |
7e4022bbad27
(Fwindow_minibuffer_p): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53492
diff
changeset
|
312 WINDOW defaults to the selected window. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
313 (window) |
265 | 314 Lisp_Object window; |
315 { | |
316 struct window *w = decode_window (window); | |
32871
361743be1fa8
(pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
32824
diff
changeset
|
317 return MINI_WINDOW_P (w) ? Qt : Qnil; |
32710
cd7dca826a03
(pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents:
32426
diff
changeset
|
318 } |
cd7dca826a03
(pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents:
32426
diff
changeset
|
319 |
cd7dca826a03
(pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents:
32426
diff
changeset
|
320 |
265 | 321 DEFUN ("pos-visible-in-window-p", Fpos_visible_in_window_p, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
322 Spos_visible_in_window_p, 0, 3, 0, |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
323 doc: /* Return non-nil if position POS is currently on the frame in WINDOW. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
324 Return nil if that position is scrolled vertically out of view. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
325 If a character is only partially visible, nil is returned, unless the |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
326 optional argument PARTIALLY is non-nil. |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
327 If POS is only out of view because of horizontal scrolling, return non-nil. |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
328 POS defaults to point in WINDOW; WINDOW defaults to the selected window. |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
329 |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
330 If POS is visible, return t if PARTIALLY is nil; if PARTIALLY is non-nil, |
59700
c401b93db575
* window.c (Fpos_visible_in_window_p): Simplify return value for
Kim F. Storm <storm@cua.dk>
parents:
59695
diff
changeset
|
331 return value is a list (X Y PARTIAL) where X and Y are the pixel coordinates |
c401b93db575
* window.c (Fpos_visible_in_window_p): Simplify return value for
Kim F. Storm <storm@cua.dk>
parents:
59695
diff
changeset
|
332 relative to the top left corner of the window. PARTIAL is nil if the character |
c401b93db575
* window.c (Fpos_visible_in_window_p): Simplify return value for
Kim F. Storm <storm@cua.dk>
parents:
59695
diff
changeset
|
333 after POS is fully visible; otherwise it is a cons (RTOP . RBOT) where RTOP |
c401b93db575
* window.c (Fpos_visible_in_window_p): Simplify return value for
Kim F. Storm <storm@cua.dk>
parents:
59695
diff
changeset
|
334 and RBOT are the number of pixels invisible at the top and bottom of the row. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
335 (pos, window, partially) |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
336 Lisp_Object pos, window, partially; |
265 | 337 { |
338 register struct window *w; | |
339 register int posint; | |
340 register struct buffer *buf; | |
25300
096b78b6cc2e
(Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
25268
diff
changeset
|
341 struct text_pos top; |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
342 Lisp_Object in_window = Qnil; |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
343 int rtop, rbot, fully_p = 1; |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
344 int x, y; |
265 | 345 |
32937 | 346 w = decode_window (window); |
347 buf = XBUFFER (w->buffer); | |
348 SET_TEXT_POS_FROM_MARKER (top, w->start); | |
349 | |
350 if (!NILP (pos)) | |
265 | 351 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
352 CHECK_NUMBER_COERCE_MARKER (pos); |
265 | 353 posint = XINT (pos); |
354 } | |
32937 | 355 else if (w == XWINDOW (selected_window)) |
356 posint = PT; | |
357 else | |
358 posint = XMARKER (w->pointm)->charpos; | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
359 |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
360 /* If position is above window start or outside buffer boundaries, |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
361 or if window start is out of range, position is not visible. */ |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
362 if (posint >= CHARPOS (top) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
363 && posint <= BUF_ZV (buf) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
364 && CHARPOS (top) >= BUF_BEGV (buf) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
365 && CHARPOS (top) <= BUF_ZV (buf) |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
366 && pos_visible_p (w, posint, &x, &y, &rtop, &rbot, NILP (partially)) |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
367 && (fully_p = !rtop && !rbot, (!NILP (partially) || fully_p))) |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
368 in_window = Qt; |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
369 |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
370 if (!NILP (in_window) && !NILP (partially)) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
371 in_window = Fcons (make_number (x), |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
372 Fcons (make_number (y), |
59700
c401b93db575
* window.c (Fpos_visible_in_window_p): Simplify return value for
Kim F. Storm <storm@cua.dk>
parents:
59695
diff
changeset
|
373 Fcons ((fully_p ? Qnil |
c401b93db575
* window.c (Fpos_visible_in_window_p): Simplify return value for
Kim F. Storm <storm@cua.dk>
parents:
59695
diff
changeset
|
374 : Fcons (make_number (rtop), |
c401b93db575
* window.c (Fpos_visible_in_window_p): Simplify return value for
Kim F. Storm <storm@cua.dk>
parents:
59695
diff
changeset
|
375 make_number (rbot))), |
c401b93db575
* window.c (Fpos_visible_in_window_p): Simplify return value for
Kim F. Storm <storm@cua.dk>
parents:
59695
diff
changeset
|
376 Qnil))); |
25300
096b78b6cc2e
(Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
25268
diff
changeset
|
377 return in_window; |
265 | 378 } |
32871
361743be1fa8
(pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
32824
diff
changeset
|
379 |
265 | 380 |
381 static struct window * | |
382 decode_window (window) | |
383 register Lisp_Object window; | |
384 { | |
485 | 385 if (NILP (window)) |
265 | 386 return XWINDOW (selected_window); |
387 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
388 CHECK_LIVE_WINDOW (window); |
265 | 389 return XWINDOW (window); |
390 } | |
391 | |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
392 static struct window * |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
393 decode_any_window (window) |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
394 register Lisp_Object window; |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
395 { |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
396 if (NILP (window)) |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
397 return XWINDOW (selected_window); |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
398 |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
399 CHECK_WINDOW (window); |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
400 return XWINDOW (window); |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
401 } |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
402 |
265 | 403 DEFUN ("window-buffer", Fwindow_buffer, Swindow_buffer, 0, 1, 0, |
56393
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
404 doc: /* Return the buffer that WINDOW is displaying. |
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
405 WINDOW defaults to the selected window. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
406 (window) |
265 | 407 Lisp_Object window; |
408 { | |
409 return decode_window (window)->buffer; | |
410 } | |
411 | |
412 DEFUN ("window-height", Fwindow_height, Swindow_height, 0, 1, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
413 doc: /* Return the number of lines in WINDOW (including its mode line). */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
414 (window) |
265 | 415 Lisp_Object window; |
416 { | |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
417 return decode_any_window (window)->total_lines; |
265 | 418 } |
419 | |
420 DEFUN ("window-width", Fwindow_width, Swindow_width, 0, 1, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
421 doc: /* Return the number of display columns in WINDOW. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
422 This is the width that is usable columns available for text in WINDOW. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
423 If you want to find out how many columns WINDOW takes up, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
424 use (let ((edges (window-edges))) (- (nth 2 edges) (nth 0 edges))). */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
425 (window) |
265 | 426 Lisp_Object window; |
427 { | |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
428 return make_number (window_box_text_cols (decode_any_window (window))); |
265 | 429 } |
430 | |
431 DEFUN ("window-hscroll", Fwindow_hscroll, Swindow_hscroll, 0, 1, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
432 doc: /* Return the number of columns by which WINDOW is scrolled from left margin. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
433 (window) |
265 | 434 Lisp_Object window; |
435 { | |
436 return decode_window (window)->hscroll; | |
437 } | |
438 | |
439 DEFUN ("set-window-hscroll", Fset_window_hscroll, Sset_window_hscroll, 2, 2, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
440 doc: /* Set number of columns WINDOW is scrolled from left margin to NCOL. |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
441 Return NCOL. NCOL should be zero or positive. |
45645
6e2471fb2c1c
(Fset_window_hscroll): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
45584
diff
changeset
|
442 |
6e2471fb2c1c
(Fset_window_hscroll): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
45584
diff
changeset
|
443 Note that if `automatic-hscrolling' is non-nil, you cannot scroll the |
6e2471fb2c1c
(Fset_window_hscroll): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
45584
diff
changeset
|
444 window so that the location of point becomes invisible. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
445 (window, ncol) |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
446 Lisp_Object window, ncol; |
265 | 447 { |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
448 struct window *w = decode_window (window); |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
449 int hscroll; |
265 | 450 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
451 CHECK_NUMBER (ncol); |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
452 hscroll = max (0, XINT (ncol)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
453 |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
454 /* Prevent redisplay shortcuts when changing the hscroll. */ |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
455 if (XINT (w->hscroll) != hscroll) |
25375 | 456 XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
457 |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
458 w->hscroll = make_number (hscroll); |
265 | 459 return ncol; |
460 } | |
461 | |
13457
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
462 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
|
463 Swindow_redisplay_end_trigger, 0, 1, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
464 doc: /* Return WINDOW's redisplay end trigger value. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
465 See `set-window-redisplay-end-trigger' for more information. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
466 (window) |
13457
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
467 Lisp_Object window; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
468 { |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
469 return decode_window (window)->redisplay_end_trigger; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
470 } |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
471 |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
472 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
|
473 Sset_window_redisplay_end_trigger, 2, 2, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
474 doc: /* Set WINDOW's redisplay end trigger value to VALUE. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
475 VALUE should be a buffer position (typically a marker) or nil. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
476 If it is a buffer position, then if redisplay in WINDOW reaches a position |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
477 beyond VALUE, the functions in `redisplay-end-trigger-functions' are called |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
478 with two arguments: WINDOW, and the end trigger value. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
479 Afterwards the end-trigger value is reset to nil. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
480 (window, value) |
13457
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
481 register Lisp_Object window, value; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
482 { |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
483 register struct window *w; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
484 |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
485 w = decode_window (window); |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
486 w->redisplay_end_trigger = value; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
487 return value; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
488 } |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
489 |
265 | 490 DEFUN ("window-edges", Fwindow_edges, Swindow_edges, 0, 1, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
491 doc: /* Return a list of the edge coordinates of WINDOW. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
492 \(LEFT TOP RIGHT BOTTOM), all relative to 0, 0 at top left corner of frame. |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
493 RIGHT is one more than the rightmost column occupied by WINDOW, |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
494 and BOTTOM is one more than the bottommost row occupied by WINDOW. |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
495 The edges include the space used by the window's scroll bar, |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
496 display margins, fringes, header line, and mode line, if it has them. |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
497 To get the edges of the actual text area, use `window-inside-edges'. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
498 (window) |
265 | 499 Lisp_Object window; |
500 { | |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
501 register struct window *w = decode_any_window (window); |
265 | 502 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
503 return Fcons (make_number (WINDOW_LEFT_EDGE_COL (w)), |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
504 Fcons (make_number (WINDOW_TOP_EDGE_LINE (w)), |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
505 Fcons (make_number (WINDOW_RIGHT_EDGE_COL (w)), |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
506 Fcons (make_number (WINDOW_BOTTOM_EDGE_LINE (w)), |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
507 Qnil)))); |
265 | 508 } |
509 | |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
510 DEFUN ("window-pixel-edges", Fwindow_pixel_edges, Swindow_pixel_edges, 0, 1, 0, |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
511 doc: /* Return a list of the edge pixel coordinates of WINDOW. |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
512 \(LEFT TOP RIGHT BOTTOM), all relative to 0, 0 at top left corner of frame. |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
513 RIGHT is one more than the rightmost x position occupied by WINDOW, |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
514 and BOTTOM is one more than the bottommost y position occupied by WINDOW. |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
515 The pixel edges include the space used by the window's scroll bar, |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
516 display margins, fringes, header line, and mode line, if it has them. |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
517 To get the edges of the actual text area, use `window-inside-pixel-edges'. */) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
518 (window) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
519 Lisp_Object window; |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
520 { |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
521 register struct window *w = decode_any_window (window); |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
522 |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
523 return Fcons (make_number (WINDOW_LEFT_EDGE_X (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
524 Fcons (make_number (WINDOW_TOP_EDGE_Y (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
525 Fcons (make_number (WINDOW_RIGHT_EDGE_X (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
526 Fcons (make_number (WINDOW_BOTTOM_EDGE_Y (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
527 Qnil)))); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
528 } |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
529 |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
530 DEFUN ("window-inside-edges", Fwindow_inside_edges, Swindow_inside_edges, 0, 1, 0, |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
531 doc: /* Return a list of the edge coordinates of WINDOW. |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
532 \(LEFT TOP RIGHT BOTTOM), all relative to 0, 0 at top left corner of frame. |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
533 RIGHT is one more than the rightmost column used by text in WINDOW, |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
534 and BOTTOM is one more than the bottommost row used by text in WINDOW. |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
535 The inside edges do not include the space used by the window's scroll bar, |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
536 display margins, fringes, header line, and/or mode line. */) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
537 (window) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
538 Lisp_Object window; |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
539 { |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
540 register struct window *w = decode_any_window (window); |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
541 |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
542 return list4 (make_number (WINDOW_BOX_LEFT_EDGE_COL (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
543 + WINDOW_LEFT_MARGIN_COLS (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
544 + WINDOW_LEFT_FRINGE_COLS (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
545 make_number (WINDOW_TOP_EDGE_LINE (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
546 + WINDOW_HEADER_LINE_LINES (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
547 make_number (WINDOW_RIGHT_EDGE_COL (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
548 - WINDOW_RIGHT_MARGIN_COLS (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
549 - WINDOW_RIGHT_FRINGE_COLS (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
550 make_number (WINDOW_BOTTOM_EDGE_LINE (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
551 - WINDOW_MODE_LINE_LINES (w))); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
552 } |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
553 |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
554 DEFUN ("window-inside-pixel-edges", Fwindow_inside_pixel_edges, Swindow_inside_pixel_edges, 0, 1, 0, |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
555 doc: /* Return a list of the edge pixel coordinates of WINDOW. |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
556 \(LEFT TOP RIGHT BOTTOM), all relative to 0, 0 at top left corner of frame. |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
557 RIGHT is one more than the rightmost x position used by text in WINDOW, |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
558 and BOTTOM is one more than the bottommost y position used by text in WINDOW. |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
559 The inside edges do not include the space used by the window's scroll bar, |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
560 display margins, fringes, header line, and/or mode line. */) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
561 (window) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
562 Lisp_Object window; |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
563 { |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
564 register struct window *w = decode_any_window (window); |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
565 |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
566 return list4 (make_number (WINDOW_BOX_LEFT_EDGE_X (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
567 + WINDOW_LEFT_MARGIN_WIDTH (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
568 + WINDOW_LEFT_FRINGE_WIDTH (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
569 make_number (WINDOW_TOP_EDGE_Y (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
570 + WINDOW_HEADER_LINE_HEIGHT (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
571 make_number (WINDOW_RIGHT_EDGE_X (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
572 - WINDOW_RIGHT_MARGIN_WIDTH (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
573 - WINDOW_RIGHT_FRINGE_WIDTH (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
574 make_number (WINDOW_BOTTOM_EDGE_Y (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
575 - WINDOW_MODE_LINE_HEIGHT (w))); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
576 } |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
577 |
25315
79bb4978ab2e
(Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents:
25300
diff
changeset
|
578 /* Test if the character at column *X, row *Y is within window W. |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
579 If it is not, return ON_NOTHING; |
432 | 580 if it is in the window's text area, |
581 set *x and *y to its location relative to the upper left corner | |
582 of the window, and | |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
583 return ON_TEXT; |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
584 if it is on the window's modeline, return ON_MODE_LINE; |
432 | 585 if it is on the border between the window and its right sibling, |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
586 return ON_VERTICAL_BORDER. |
56542
6d2d9477f39e
(coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents:
56540
diff
changeset
|
587 if it is on a scroll bar, |
6d2d9477f39e
(coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents:
56540
diff
changeset
|
588 return ON_SCROLL_BAR. |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
589 if it is on the window's top line, return ON_HEADER_LINE; |
41127 | 590 if it is in left or right fringe of the window, |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
591 return ON_LEFT_FRINGE or ON_RIGHT_FRINGE, and convert *X and *Y |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
592 to window-relative coordinates; |
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
593 if it is in the marginal area to the left/right of the window, |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
594 return ON_LEFT_MARGIN or ON_RIGHT_MARGIN, and convert *X and *Y |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
595 to window-relative coordinates. |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
596 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
597 X and Y are frame relative pixel coordinates. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
598 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
599 static enum window_part |
432 | 600 coordinates_in_window (w, x, y) |
601 register struct window *w; | |
602 register int *x, *y; | |
603 { | |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
604 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
605 int left_x, right_x, top_y, bottom_y; |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
606 enum window_part part; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
607 int ux = FRAME_COLUMN_WIDTH (f); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
608 int x0 = WINDOW_LEFT_EDGE_X (w); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
609 int x1 = WINDOW_RIGHT_EDGE_X (w); |
36127
f03dfbb443ce
(coordinates_in_window): Increase width of area
Gerd Moellmann <gerd@gnu.org>
parents:
36068
diff
changeset
|
610 /* The width of the area where the vertical line can be dragged. |
f03dfbb443ce
(coordinates_in_window): Increase width of area
Gerd Moellmann <gerd@gnu.org>
parents:
36068
diff
changeset
|
611 (Between mode lines for instance. */ |
f03dfbb443ce
(coordinates_in_window): Increase width of area
Gerd Moellmann <gerd@gnu.org>
parents:
36068
diff
changeset
|
612 int grabbable_width = ux; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
613 int lmargin_width, rmargin_width, text_left, text_right; |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
614 |
28918
e42cd428f056
(coordinates_in_window): Subtract 1 when computing right_x.
Eli Zaretskii <eliz@gnu.org>
parents:
28726
diff
changeset
|
615 /* In what's below, we subtract 1 when computing right_x because we |
e42cd428f056
(coordinates_in_window): Subtract 1 when computing right_x.
Eli Zaretskii <eliz@gnu.org>
parents:
28726
diff
changeset
|
616 want the rightmost pixel, which is given by left_pixel+width-1. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
617 if (w->pseudo_window_p) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
618 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
619 left_x = 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
620 right_x = WINDOW_TOTAL_WIDTH (w) - 1; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
621 top_y = WINDOW_TOP_EDGE_Y (w); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
622 bottom_y = WINDOW_BOTTOM_EDGE_Y (w); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
623 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
624 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
625 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
626 left_x = WINDOW_BOX_LEFT_EDGE_X (w); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
627 right_x = WINDOW_BOX_RIGHT_EDGE_X (w) - 1; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
628 top_y = WINDOW_TOP_EDGE_Y (w); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
629 bottom_y = WINDOW_BOTTOM_EDGE_Y (w); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
630 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
631 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
632 /* Outside any interesting row? */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
633 if (*y < top_y || *y >= bottom_y) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
634 return ON_NOTHING; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
635 |
33957
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
636 /* On the mode line or header line? If it's near the start of |
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
637 the mode or header line of window that's has a horizontal |
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
638 sibling, say it's on the vertical line. That's to be able |
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
639 to resize windows horizontally in case we're using toolkit |
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
640 scroll bars. */ |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
641 |
33957
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
642 if (WINDOW_WANTS_MODELINE_P (w) |
53129
070325c3884d
(coordinates_in_window): Remove redundant tests.
Kim F. Storm <storm@cua.dk>
parents:
52853
diff
changeset
|
643 && *y >= bottom_y - CURRENT_MODE_LINE_HEIGHT (w)) |
33957
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
644 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
645 part = ON_MODE_LINE; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
646 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
647 header_vertical_border_check: |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
648 /* We're somewhere on the mode line. We consider the place |
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
649 between mode lines of horizontally adjacent mode lines |
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
650 as the vertical border. If scroll bars on the left, |
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
651 return the right window. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
652 if (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
653 || WINDOW_RIGHTMOST_P (w)) |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
654 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
655 if (!WINDOW_LEFTMOST_P (w) && abs (*x - x0) < grabbable_width) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
656 return ON_VERTICAL_BORDER; |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
657 } |
51223
c1daf1c22f97
(Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents:
51207
diff
changeset
|
658 else |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
659 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
660 if (abs (*x - x1) < grabbable_width) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
661 return ON_VERTICAL_BORDER; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
662 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
663 |
57309
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
664 if (*x < x0 || *x >= x1) |
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
665 return ON_NOTHING; |
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
666 |
51477
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
667 /* Convert X and Y to window relative coordinates. |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
668 Mode line starts at left edge of window. */ |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
669 *x -= x0; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
670 *y -= top_y; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
671 return part; |
33957
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
672 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
673 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
674 if (WINDOW_WANTS_HEADER_LINE_P (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
675 && *y < top_y + CURRENT_HEADER_LINE_HEIGHT (w)) |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
676 { |
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
677 part = ON_HEADER_LINE; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
678 goto header_vertical_border_check; |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
679 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
680 |
57309
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
681 if (*x < x0 || *x >= x1) |
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
682 return ON_NOTHING; |
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
683 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
684 /* Outside any interesting column? */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
685 if (*x < left_x || *x > right_x) |
56542
6d2d9477f39e
(coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents:
56540
diff
changeset
|
686 return ON_SCROLL_BAR; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
687 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
688 lmargin_width = window_box_width (w, LEFT_MARGIN_AREA); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
689 rmargin_width = window_box_width (w, RIGHT_MARGIN_AREA); |
51223
c1daf1c22f97
(Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents:
51207
diff
changeset
|
690 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
691 text_left = window_box_left (w, TEXT_AREA); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
692 text_right = text_left + window_box_width (w, TEXT_AREA); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
693 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
694 if (FRAME_WINDOW_P (f)) |
25315
79bb4978ab2e
(Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents:
25300
diff
changeset
|
695 { |
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
696 if (!w->pseudo_window_p |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
697 && !WINDOW_HAS_VERTICAL_SCROLL_BAR (w) |
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
698 && !WINDOW_RIGHTMOST_P (w) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
699 && (abs (*x - right_x) < grabbable_width)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
700 return ON_VERTICAL_BORDER; |
25315
79bb4978ab2e
(Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents:
25300
diff
changeset
|
701 } |
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
702 else |
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
703 { |
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
704 /* Need to say "*x > right_x" rather than >=, since on character |
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
705 terminals, the vertical line's x coordinate is right_x. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
706 if (!w->pseudo_window_p |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
707 && !WINDOW_RIGHTMOST_P (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
708 && *x > right_x - ux) |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
709 { |
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
710 /* On the border on the right side of the window? Assume that |
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
711 this area begins at RIGHT_X minus a canonical char width. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
712 return ON_VERTICAL_BORDER; |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
713 } |
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
714 } |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
715 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
716 if (*x < text_left) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
717 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
718 if (lmargin_width > 0 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
719 && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
720 ? (*x >= left_x + WINDOW_LEFT_FRINGE_WIDTH (w)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
721 : (*x < left_x + lmargin_width))) |
51477
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
722 { |
53129
070325c3884d
(coordinates_in_window): Remove redundant tests.
Kim F. Storm <storm@cua.dk>
parents:
52853
diff
changeset
|
723 *x -= left_x; |
51477
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
724 if (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)) |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
725 *x -= WINDOW_LEFT_FRINGE_WIDTH (w); |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
726 *y -= top_y; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
727 return ON_LEFT_MARGIN; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
728 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
729 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
730 /* Convert X and Y to window-relative pixel coordinates. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
731 *x -= left_x; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
732 *y -= top_y; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
733 return ON_LEFT_FRINGE; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
734 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
735 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
736 if (*x >= text_right) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
737 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
738 if (rmargin_width > 0 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
739 && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
740 ? (*x < right_x - WINDOW_RIGHT_FRINGE_WIDTH (w)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
741 : (*x >= right_x - rmargin_width))) |
51477
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
742 { |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
743 *x -= right_x; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
744 if (!WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)) |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
745 *x -= WINDOW_RIGHT_FRINGE_WIDTH (w); |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
746 *y -= top_y; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
747 return ON_RIGHT_MARGIN; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
748 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
749 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
750 /* Convert X and Y to window-relative pixel coordinates. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
751 *x -= left_x + WINDOW_LEFT_FRINGE_WIDTH (w); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
752 *y -= top_y; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
753 return ON_RIGHT_FRINGE; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
754 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
755 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
756 /* Everything special ruled out - must be on text area */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
757 *x -= left_x + WINDOW_LEFT_FRINGE_WIDTH (w); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
758 *y -= top_y; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
759 return ON_TEXT; |
432 | 760 } |
761 | |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
762 |
432 | 763 DEFUN ("coordinates-in-window-p", Fcoordinates_in_window_p, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
764 Scoordinates_in_window_p, 2, 2, 0, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
765 doc: /* Return non-nil if COORDINATES are in WINDOW. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
766 COORDINATES is a cons of the form (X . Y), X and Y being distances |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
767 measured in characters from the upper-left corner of the frame. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
768 \(0 . 0) denotes the character in the upper left corner of the |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
769 frame. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
770 If COORDINATES are in the text portion of WINDOW, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
771 the coordinates relative to the window are returned. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
772 If they are in the mode line of WINDOW, `mode-line' is returned. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
773 If they are in the top mode line of WINDOW, `header-line' is returned. |
41127 | 774 If they are in the left fringe of WINDOW, `left-fringe' is returned. |
775 If they are in the right fringe of WINDOW, `right-fringe' is returned. | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
776 If they are on the border between WINDOW and its right sibling, |
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
777 `vertical-line' is returned. |
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
778 If they are in the windows's left or right marginal areas, `left-margin'\n\ |
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
779 or `right-margin' is returned. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
780 (coordinates, window) |
432 | 781 register Lisp_Object coordinates, window; |
782 { | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
783 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
784 struct frame *f; |
432 | 785 int x, y; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
786 Lisp_Object lx, ly; |
432 | 787 |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
788 CHECK_WINDOW (window); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
789 w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
790 f = XFRAME (w->frame); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
791 CHECK_CONS (coordinates); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
792 lx = Fcar (coordinates); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
793 ly = Fcdr (coordinates); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
794 CHECK_NUMBER_OR_FLOAT (lx); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
795 CHECK_NUMBER_OR_FLOAT (ly); |
56540
b1738412da70
(Fcoordinates_in_window_p): Take account of FRAME_INTERNAL_BORDER_WIDTH.
Richard M. Stallman <rms@gnu.org>
parents:
56524
diff
changeset
|
796 x = FRAME_PIXEL_X_FROM_CANON_X (f, lx) + FRAME_INTERNAL_BORDER_WIDTH (f); |
b1738412da70
(Fcoordinates_in_window_p): Take account of FRAME_INTERNAL_BORDER_WIDTH.
Richard M. Stallman <rms@gnu.org>
parents:
56524
diff
changeset
|
797 y = FRAME_PIXEL_Y_FROM_CANON_Y (f, ly) + FRAME_INTERNAL_BORDER_WIDTH (f); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
798 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
799 switch (coordinates_in_window (w, &x, &y)) |
432 | 800 { |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
801 case ON_NOTHING: |
432 | 802 return Qnil; |
803 | |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
804 case ON_TEXT: |
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
805 /* X and Y are now window relative pixel coordinates. Convert |
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
806 them to canonical char units before returning them. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
807 return Fcons (FRAME_CANON_X_FROM_PIXEL_X (f, x), |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
808 FRAME_CANON_Y_FROM_PIXEL_Y (f, y)); |
432 | 809 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
810 case ON_MODE_LINE: |
432 | 811 return Qmode_line; |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
812 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
813 case ON_VERTICAL_BORDER: |
732 | 814 return Qvertical_line; |
432 | 815 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
816 case ON_HEADER_LINE: |
25546 | 817 return Qheader_line; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
818 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
819 case ON_LEFT_FRINGE: |
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
820 return Qleft_fringe; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
821 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
822 case ON_RIGHT_FRINGE: |
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
823 return Qright_fringe; |
25315
79bb4978ab2e
(Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents:
25300
diff
changeset
|
824 |
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
825 case ON_LEFT_MARGIN: |
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
826 return Qleft_margin; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
827 |
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
828 case ON_RIGHT_MARGIN: |
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
829 return Qright_margin; |
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
830 |
56542
6d2d9477f39e
(coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents:
56540
diff
changeset
|
831 case ON_SCROLL_BAR: |
6d2d9477f39e
(coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents:
56540
diff
changeset
|
832 /* Historically we are supposed to return nil in this case. */ |
6d2d9477f39e
(coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents:
56540
diff
changeset
|
833 return Qnil; |
6d2d9477f39e
(coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents:
56540
diff
changeset
|
834 |
432 | 835 default: |
836 abort (); | |
837 } | |
838 } | |
839 | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
840 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
841 /* Callback for foreach_window, used in window_from_coordinates. |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
842 Check if window W contains coordinates specified by USER_DATA which |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
843 is actually a pointer to a struct check_window_data CW. |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
844 |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
845 Check if window W contains coordinates *CW->x and *CW->y. If it |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
846 does, return W in *CW->window, as Lisp_Object, and return in |
30777 | 847 *CW->part the part of the window under coordinates *X,*Y. Return |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
848 zero from this function to stop iterating over windows. */ |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
849 |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
850 struct check_window_data |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
851 { |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
852 Lisp_Object *window; |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
853 int *x, *y; |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
854 enum window_part *part; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
855 }; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
856 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
857 static int |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
858 check_window_containing (w, user_data) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
859 struct window *w; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
860 void *user_data; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
861 { |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
862 struct check_window_data *cw = (struct check_window_data *) user_data; |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
863 enum window_part found; |
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
864 int continue_p = 1; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
865 |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
866 found = coordinates_in_window (w, cw->x, cw->y); |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
867 if (found != ON_NOTHING) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
868 { |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
869 *cw->part = found; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
870 XSETWINDOW (*cw->window, w); |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
871 continue_p = 0; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
872 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
873 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
874 return continue_p; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
875 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
876 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
877 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
878 /* Find the window containing frame-relative pixel position X/Y and |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
879 return it as a Lisp_Object. |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
880 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
881 If X, Y is on one of the window's special `window_part' elements, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
882 set *PART to the id of that element, and return X and Y converted |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
883 to window relative coordinates in WX and WY. |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
884 |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
885 If there is no window under X, Y return nil and leave *PART |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
886 unmodified. TOOL_BAR_P non-zero means detect tool-bar windows. |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
887 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
888 This function was previously implemented with a loop cycling over |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
889 windows with Fnext_window, and starting with the frame's selected |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
890 window. It turned out that this doesn't work with an |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
891 implementation of next_window using Vwindow_list, because |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
892 FRAME_SELECTED_WINDOW (F) is not always contained in the window |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
893 tree of F when this function is called asynchronously from |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
894 note_mouse_highlight. The original loop didn't terminate in this |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
895 case. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
896 |
265 | 897 Lisp_Object |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
898 window_from_coordinates (f, x, y, part, wx, wy, tool_bar_p) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
899 struct frame *f; |
265 | 900 int x, y; |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
901 enum window_part *part; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
902 int *wx, *wy; |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25540
diff
changeset
|
903 int tool_bar_p; |
265 | 904 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
905 Lisp_Object window; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
906 struct check_window_data cw; |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
907 enum window_part dummy; |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
908 |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
909 if (part == 0) |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
910 part = &dummy; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
911 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
912 window = Qnil; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
913 cw.window = &window, cw.x = &x, cw.y = &y; cw.part = part; |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
914 foreach_window (f, check_window_containing, &cw); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
915 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
916 /* If not found above, see if it's in the tool bar window, if a tool |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
917 bar exists. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
918 if (NILP (window) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
919 && tool_bar_p |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
920 && WINDOWP (f->tool_bar_window) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
921 && WINDOW_TOTAL_LINES (XWINDOW (f->tool_bar_window)) > 0 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
922 && (coordinates_in_window (XWINDOW (f->tool_bar_window), &x, &y) |
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
923 != ON_NOTHING)) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
924 { |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
925 *part = ON_TEXT; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
926 window = f->tool_bar_window; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
927 } |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
928 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
929 if (wx) *wx = x; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
930 if (wy) *wy = y; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
931 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
932 return window; |
265 | 933 } |
934 | |
681
026f978690be
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
555
diff
changeset
|
935 DEFUN ("window-at", Fwindow_at, Swindow_at, 2, 3, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
936 doc: /* Return window containing coordinates X and Y on FRAME. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
937 If omitted, FRAME defaults to the currently selected frame. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
938 The top left corner of the frame is considered to be row 0, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
939 column 0. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
940 (x, y, frame) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
941 Lisp_Object x, y, frame; |
265 | 942 { |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
943 struct frame *f; |
265 | 944 |
769 | 945 if (NILP (frame)) |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
946 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
947 CHECK_LIVE_FRAME (frame); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
948 f = XFRAME (frame); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
949 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
950 /* Check that arguments are integers or floats. */ |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
951 CHECK_NUMBER_OR_FLOAT (x); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
952 CHECK_NUMBER_OR_FLOAT (y); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
953 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
954 return window_from_coordinates (f, |
56524
d2661c5fec0b
(Fwindow_at): Take account of FRAME_INTERNAL_BORDER_WIDTH.
Richard M. Stallman <rms@gnu.org>
parents:
56497
diff
changeset
|
955 (FRAME_PIXEL_X_FROM_CANON_X (f, x) |
d2661c5fec0b
(Fwindow_at): Take account of FRAME_INTERNAL_BORDER_WIDTH.
Richard M. Stallman <rms@gnu.org>
parents:
56497
diff
changeset
|
956 + FRAME_INTERNAL_BORDER_WIDTH (f)), |
d2661c5fec0b
(Fwindow_at): Take account of FRAME_INTERNAL_BORDER_WIDTH.
Richard M. Stallman <rms@gnu.org>
parents:
56497
diff
changeset
|
957 (FRAME_PIXEL_Y_FROM_CANON_Y (f, y) |
d2661c5fec0b
(Fwindow_at): Take account of FRAME_INTERNAL_BORDER_WIDTH.
Richard M. Stallman <rms@gnu.org>
parents:
56497
diff
changeset
|
958 + FRAME_INTERNAL_BORDER_WIDTH (f)), |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
959 0, 0, 0, 0); |
265 | 960 } |
961 | |
962 DEFUN ("window-point", Fwindow_point, Swindow_point, 0, 1, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
963 doc: /* Return current value of point in WINDOW. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
964 For a nonselected window, this is the value point would have |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
965 if that window were selected. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
966 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
967 Note that, when WINDOW is the selected window and its buffer |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
968 is also currently selected, the value returned is the same as (point). |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
969 It would be more strictly correct to return the `top-level' value |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
970 of point, outside of any save-excursion forms. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
971 But that is hard to define. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
972 (window) |
265 | 973 Lisp_Object window; |
974 { | |
975 register struct window *w = decode_window (window); | |
976 | |
977 if (w == XWINDOW (selected_window) | |
978 && current_buffer == XBUFFER (w->buffer)) | |
979 return Fpoint (); | |
980 return Fmarker_position (w->pointm); | |
981 } | |
982 | |
983 DEFUN ("window-start", Fwindow_start, Swindow_start, 0, 1, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
984 doc: /* Return position at which display currently starts in WINDOW. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
985 This is updated by redisplay or by calling `set-window-start'. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
986 (window) |
265 | 987 Lisp_Object window; |
988 { | |
989 return Fmarker_position (decode_window (window)->start); | |
990 } | |
991 | |
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
992 /* 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
|
993 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
994 This function returns nil if the position is not currently known. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
995 That happens when redisplay is preempted and doesn't finish. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
996 If in that case you want to compute where the end of the window would |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
997 have been if redisplay had finished, do this: |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
998 (save-excursion |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
999 (goto-char (window-start window)) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1000 (vertical-motion (1- (window-height window)) window) |
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
1001 (point))") */ |
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
1002 |
21198
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
1003 DEFUN ("window-end", Fwindow_end, Swindow_end, 0, 2, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1004 doc: /* Return position at which display currently ends in WINDOW. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1005 This is updated by redisplay, when it runs to completion. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1006 Simply changing the buffer text or setting `window-start' |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1007 does not update this value. |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
1008 Return nil if there is no recorded value. \(This can happen if the |
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
1009 last redisplay of WINDOW was preempted, and did not finish.) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1010 If UPDATE is non-nil, compute the up-to-date position |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1011 if it isn't already recorded. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1012 (window, update) |
21198
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
1013 Lisp_Object window, update; |
265 | 1014 { |
1015 Lisp_Object value; | |
1016 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
|
1017 Lisp_Object buf; |
990f6ee7f527
(Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents:
4145
diff
changeset
|
1018 |
990f6ee7f527
(Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents:
4145
diff
changeset
|
1019 buf = w->buffer; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1020 CHECK_BUFFER (buf); |
4292
990f6ee7f527
(Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents:
4145
diff
changeset
|
1021 |
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
1022 #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
|
1023 /* 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
|
1024 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
|
1025 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
|
1026 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
|
1027 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
|
1028 return Qnil; |
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
1029 #endif |
8492
865daa7a9faf
(Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
8486
diff
changeset
|
1030 |
21198
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
1031 if (! NILP (update) |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
1032 && ! (! NILP (w->window_end_valid) |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
1033 && XFASTINT (w->last_modified) >= MODIFF)) |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
1034 { |
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1035 struct text_pos startp; |
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1036 struct it it; |
36231
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1037 struct buffer *old_buffer = NULL, *b = XBUFFER (buf); |
26635
af8d605cbcf1
(Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
1038 |
af8d605cbcf1
(Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
1039 /* In case W->start is out of the range, use something |
46271
35153dd59211
*** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents:
46108
diff
changeset
|
1040 reasonable. This situation occurred when loading a file with |
26635
af8d605cbcf1
(Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
1041 `-l' containing a call to `rmail' with subsequent other |
af8d605cbcf1
(Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
1042 commands. At the end, W->start happened to be BEG, while |
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1043 rmail had already narrowed the buffer. */ |
26635
af8d605cbcf1
(Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
1044 if (XMARKER (w->start)->charpos < BEGV) |
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1045 SET_TEXT_POS (startp, BEGV, BEGV_BYTE); |
26635
af8d605cbcf1
(Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
1046 else if (XMARKER (w->start)->charpos > ZV) |
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1047 SET_TEXT_POS (startp, ZV, ZV_BYTE); |
26635
af8d605cbcf1
(Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
1048 else |
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1049 SET_TEXT_POS_FROM_MARKER (startp, w->start); |
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1050 |
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1051 /* Cannot use Fvertical_motion because that function doesn't |
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1052 cope with variable-height lines. */ |
36231
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1053 if (b != current_buffer) |
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1054 { |
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1055 old_buffer = current_buffer; |
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1056 set_buffer_internal (b); |
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1057 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1058 |
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1059 start_display (&it, w, startp); |
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1060 move_it_vertically (&it, window_box_height (w)); |
36471
bd660efb3fe7
(Fwindow_end): Call move_it_past_eol only if
Gerd Moellmann <gerd@gnu.org>
parents:
36444
diff
changeset
|
1061 if (it.current_y < it.last_visible_y) |
bd660efb3fe7
(Fwindow_end): Call move_it_past_eol only if
Gerd Moellmann <gerd@gnu.org>
parents:
36444
diff
changeset
|
1062 move_it_past_eol (&it); |
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1063 value = make_number (IT_CHARPOS (it)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1064 |
36231
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1065 if (old_buffer) |
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1066 set_buffer_internal (old_buffer); |
21198
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
1067 } |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
1068 else |
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1069 XSETINT (value, BUF_Z (XBUFFER (buf)) - XFASTINT (w->window_end_pos)); |
265 | 1070 |
1071 return value; | |
1072 } | |
1073 | |
1074 DEFUN ("set-window-point", Fset_window_point, Sset_window_point, 2, 2, 0, | |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
1075 doc: /* Make point value in WINDOW be at position POS in WINDOW's buffer. |
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
1076 Return POS. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1077 (window, pos) |
265 | 1078 Lisp_Object window, pos; |
1079 { | |
1080 register struct window *w = decode_window (window); | |
1081 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1082 CHECK_NUMBER_COERCE_MARKER (pos); |
24230
ee835eec7607
(Fset_window_point): If WINDOW is selected but the
Richard M. Stallman <rms@gnu.org>
parents:
23728
diff
changeset
|
1083 if (w == XWINDOW (selected_window) |
ee835eec7607
(Fset_window_point): If WINDOW is selected but the
Richard M. Stallman <rms@gnu.org>
parents:
23728
diff
changeset
|
1084 && XBUFFER (w->buffer) == current_buffer) |
265 | 1085 Fgoto_char (pos); |
1086 else | |
1087 set_marker_restricted (w->pointm, pos, w->buffer); | |
34491
f9d400d4653a
(Fset_window_point): If displaying cursors in windows
Gerd Moellmann <gerd@gnu.org>
parents:
34417
diff
changeset
|
1088 |
34615
a8944d7e6773
(Fset_window_point): Remove test for
Gerd Moellmann <gerd@gnu.org>
parents:
34499
diff
changeset
|
1089 /* We have to make sure that redisplay updates the window to show |
a8944d7e6773
(Fset_window_point): Remove test for
Gerd Moellmann <gerd@gnu.org>
parents:
34499
diff
changeset
|
1090 the new value of point. */ |
a8944d7e6773
(Fset_window_point): Remove test for
Gerd Moellmann <gerd@gnu.org>
parents:
34499
diff
changeset
|
1091 if (!EQ (window, selected_window)) |
34491
f9d400d4653a
(Fset_window_point): If displaying cursors in windows
Gerd Moellmann <gerd@gnu.org>
parents:
34417
diff
changeset
|
1092 ++windows_or_buffers_changed; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1093 |
265 | 1094 return pos; |
1095 } | |
1096 | |
1097 DEFUN ("set-window-start", Fset_window_start, Sset_window_start, 2, 3, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1098 doc: /* Make display in WINDOW start at position POS in WINDOW's buffer. |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
1099 Return POS. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1100 Optional third arg NOFORCE non-nil inhibits next redisplay |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1101 from overriding motion of point in order to display at this exact start. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1102 (window, pos, noforce) |
265 | 1103 Lisp_Object window, pos, noforce; |
1104 { | |
1105 register struct window *w = decode_window (window); | |
1106 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1107 CHECK_NUMBER_COERCE_MARKER (pos); |
265 | 1108 set_marker_restricted (w->start, pos, w->buffer); |
1109 /* this is not right, but much easier than doing what is right. */ | |
1110 w->start_at_line_beg = Qnil; | |
485 | 1111 if (NILP (noforce)) |
265 | 1112 w->force_start = Qt; |
1113 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
|
1114 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
|
1115 XSETFASTINT (w->last_overlay_modified, 0); |
338 | 1116 if (!EQ (window, selected_window)) |
1117 windows_or_buffers_changed++; | |
25387
df0083768b79
(Fset_window_point): Reset Vresize_mini_config.
Gerd Moellmann <gerd@gnu.org>
parents:
25375
diff
changeset
|
1118 |
265 | 1119 return pos; |
1120 } | |
1121 | |
1122 DEFUN ("window-dedicated-p", Fwindow_dedicated_p, Swindow_dedicated_p, | |
1123 1, 1, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1124 doc: /* Return WINDOW's dedicated object, usually t or nil. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1125 See also `set-window-dedicated-p'. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1126 (window) |
265 | 1127 Lisp_Object window; |
1128 { | |
1129 return decode_window (window)->dedicated; | |
1130 } | |
1131 | |
722
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
1132 DEFUN ("set-window-dedicated-p", Fset_window_dedicated_p, |
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
1133 Sset_window_dedicated_p, 2, 2, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1134 doc: /* Control whether WINDOW is dedicated to the buffer it displays. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1135 If it is dedicated, Emacs will not automatically change |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1136 which buffer appears in it. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1137 The second argument is the new value for the dedication flag; |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1138 non-nil means yes. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1139 (window, arg) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1140 Lisp_Object window, arg; |
265 | 1141 { |
1142 register struct window *w = decode_window (window); | |
1143 | |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
1144 w->dedicated = arg; |
265 | 1145 |
1146 return w->dedicated; | |
1147 } | |
1148 | |
1149 DEFUN ("window-display-table", Fwindow_display_table, Swindow_display_table, | |
1150 0, 1, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1151 doc: /* Return the display-table that WINDOW is using. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1152 (window) |
265 | 1153 Lisp_Object window; |
1154 { | |
1155 return decode_window (window)->display_table; | |
1156 } | |
1157 | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1158 /* Get the display table for use on window W. This is either W's |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1159 display table or W's buffer's display table. Ignore the specified |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1160 tables if they are not valid; if no valid table is specified, |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1161 return 0. */ |
265 | 1162 |
13187
1a4cee562d33
(window_display_table): Use DISP_TABLE_P. Return type
Richard M. Stallman <rms@gnu.org>
parents:
13126
diff
changeset
|
1163 struct Lisp_Char_Table * |
265 | 1164 window_display_table (w) |
1165 struct window *w; | |
1166 { | |
30446
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1167 struct Lisp_Char_Table *dp = NULL; |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1168 |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1169 if (DISP_TABLE_P (w->display_table)) |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1170 dp = XCHAR_TABLE (w->display_table); |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1171 else if (BUFFERP (w->buffer)) |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1172 { |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1173 struct buffer *b = XBUFFER (w->buffer); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1174 |
30446
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1175 if (DISP_TABLE_P (b->display_table)) |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1176 dp = XCHAR_TABLE (b->display_table); |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1177 else if (DISP_TABLE_P (Vstandard_display_table)) |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1178 dp = XCHAR_TABLE (Vstandard_display_table); |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1179 } |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1180 |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1181 return dp; |
265 | 1182 } |
1183 | |
555 | 1184 DEFUN ("set-window-display-table", Fset_window_display_table, Sset_window_display_table, 2, 2, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1185 doc: /* Set WINDOW's display-table to TABLE. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1186 (window, table) |
265 | 1187 register Lisp_Object window, table; |
1188 { | |
1189 register struct window *w; | |
1190 | |
1191 w = decode_window (window); | |
1192 w->display_table = table; | |
1193 return table; | |
1194 } | |
1195 | |
1196 /* Record info on buffer window w is displaying | |
1197 when it is about to cease to display that buffer. */ | |
21514 | 1198 static void |
265 | 1199 unshow_buffer (w) |
1200 register struct window *w; | |
1201 { | |
6517
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1202 Lisp_Object buf; |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1203 struct buffer *b; |
6517
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1204 |
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1205 buf = w->buffer; |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1206 b = XBUFFER (buf); |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1207 if (b != XMARKER (w->pointm)->buffer) |
265 | 1208 abort (); |
1209 | |
5990
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
1210 #if 0 |
265 | 1211 if (w == XWINDOW (selected_window) |
1212 || ! EQ (buf, XWINDOW (selected_window)->buffer)) | |
1213 /* Do this except when the selected window's buffer | |
1214 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
|
1215 #endif |
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
1216 /* 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
|
1217 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
|
1218 Now that this statement is unconditional, |
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
1219 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
|
1220 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
|
1221 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
|
1222 Some people might say that might be a good thing. Let's see. */ |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1223 b->last_window_start = marker_position (w->start); |
265 | 1224 |
1225 /* Point in the selected window's buffer | |
1226 is actually stored in that buffer, and the window's pointm isn't used. | |
1227 So don't clobber point in that buffer. */ | |
27869
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
1228 if (! EQ (buf, XWINDOW (selected_window)->buffer) |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
1229 /* This line helps to fix Horsley's testbug.el bug. */ |
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28104
diff
changeset
|
1230 && !(WINDOWP (b->last_selected_window) |
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28104
diff
changeset
|
1231 && w != XWINDOW (b->last_selected_window) |
27869
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
1232 && EQ (buf, XWINDOW (b->last_selected_window)->buffer))) |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1233 temp_set_point_both (b, |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1234 clip_to_bounds (BUF_BEGV (b), |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1235 XMARKER (w->pointm)->charpos, |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1236 BUF_ZV (b)), |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1237 clip_to_bounds (BUF_BEGV_BYTE (b), |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1238 marker_byte_position (w->pointm), |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1239 BUF_ZV_BYTE (b))); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1240 |
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28104
diff
changeset
|
1241 if (WINDOWP (b->last_selected_window) |
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28104
diff
changeset
|
1242 && w == XWINDOW (b->last_selected_window)) |
27869
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
1243 b->last_selected_window = Qnil; |
265 | 1244 } |
1245 | |
1246 /* Put replacement into the window structure in place of old. */ | |
21514 | 1247 static void |
265 | 1248 replace_window (old, replacement) |
1249 Lisp_Object old, replacement; | |
1250 { | |
1251 register Lisp_Object tem; | |
1252 register struct window *o = XWINDOW (old), *p = XWINDOW (replacement); | |
1253 | |
769 | 1254 /* If OLD is its frame's root_window, then replacement is the new |
1255 root_window for that frame. */ | |
265 | 1256 |
1525
f79a22ad87d0
* window.c (Fwindow_width, Fset_window_hscroll): Use accessors on
Jim Blandy <jimb@redhat.com>
parents:
1444
diff
changeset
|
1257 if (EQ (old, FRAME_ROOT_WINDOW (XFRAME (o->frame)))) |
769 | 1258 FRAME_ROOT_WINDOW (XFRAME (o->frame)) = replacement; |
265 | 1259 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1260 p->left_col = o->left_col; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1261 p->top_line = o->top_line; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1262 p->total_cols = o->total_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1263 p->total_lines = o->total_lines; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1264 p->desired_matrix = p->current_matrix = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1265 p->vscroll = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1266 bzero (&p->cursor, sizeof (p->cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1267 bzero (&p->last_cursor, sizeof (p->last_cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1268 bzero (&p->phys_cursor, sizeof (p->phys_cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1269 p->phys_cursor_type = -1; |
43620
8a5d6239662c
(make_window, replace_window): Initialize phys_cursor_width.
Kim F. Storm <storm@cua.dk>
parents:
43597
diff
changeset
|
1270 p->phys_cursor_width = -1; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1271 p->must_be_updated_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1272 p->pseudo_window_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1273 XSETFASTINT (p->window_end_vpos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1274 XSETFASTINT (p->window_end_pos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1275 p->window_end_valid = Qnil; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
1276 p->frozen_window_start_p = 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1277 p->orig_top_line = p->orig_total_lines = Qnil; |
265 | 1278 |
1279 p->next = tem = o->next; | |
485 | 1280 if (!NILP (tem)) |
265 | 1281 XWINDOW (tem)->prev = replacement; |
1282 | |
1283 p->prev = tem = o->prev; | |
485 | 1284 if (!NILP (tem)) |
265 | 1285 XWINDOW (tem)->next = replacement; |
1286 | |
1287 p->parent = tem = o->parent; | |
485 | 1288 if (!NILP (tem)) |
265 | 1289 { |
1290 if (EQ (XWINDOW (tem)->vchild, old)) | |
1291 XWINDOW (tem)->vchild = replacement; | |
1292 if (EQ (XWINDOW (tem)->hchild, old)) | |
1293 XWINDOW (tem)->hchild = replacement; | |
1294 } | |
1295 | |
1296 /*** Here, if replacement is a vertical combination | |
1297 and so is its new parent, we should make replacement's | |
1298 children be children of that parent instead. ***/ | |
1299 } | |
1300 | |
1301 DEFUN ("delete-window", Fdelete_window, Sdelete_window, 0, 1, "", | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1302 doc: /* Remove WINDOW from the display. Default is selected window. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1303 (window) |
265 | 1304 register Lisp_Object window; |
1305 { | |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1306 delete_window (window); |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1307 |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1308 if (! NILP (Vwindow_configuration_change_hook) |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1309 && ! NILP (Vrun_hooks)) |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1310 call1 (Vrun_hooks, Qwindow_configuration_change_hook); |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1311 |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1312 return Qnil; |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1313 } |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1314 |
20351 | 1315 void |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1316 delete_window (window) |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1317 register Lisp_Object window; |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1318 { |
265 | 1319 register Lisp_Object tem, parent, sib; |
1320 register struct window *p; | |
1321 register struct window *par; | |
34819
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1322 struct frame *f; |
265 | 1323 |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1324 /* 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
|
1325 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
|
1326 so we can't decode_window here. */ |
485 | 1327 if (NILP (window)) |
265 | 1328 window = selected_window; |
1329 else | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1330 CHECK_WINDOW (window); |
265 | 1331 p = XWINDOW (window); |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1332 |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1333 /* 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
|
1334 if (NILP (p->buffer) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1335 && NILP (p->hchild) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1336 && NILP (p->vchild)) |
17365
fc2ec9ced22f
(delete_window): Don't return value from void function.
Karl Heuer <kwzh@gnu.org>
parents:
17281
diff
changeset
|
1337 return; |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1338 |
265 | 1339 parent = p->parent; |
485 | 1340 if (NILP (parent)) |
265 | 1341 error ("Attempt to delete minibuffer or sole ordinary window"); |
1342 par = XWINDOW (parent); | |
1343 | |
1344 windows_or_buffers_changed++; | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1345 Vwindow_list = Qnil; |
34819
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1346 f = XFRAME (WINDOW_FRAME (p)); |
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1347 FRAME_WINDOW_SIZES_CHANGED (f) = 1; |
265 | 1348 |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1349 /* 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
|
1350 { |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1351 Lisp_Object swindow, pwindow; |
3723
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
1352 |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
1353 /* 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
|
1354 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
|
1355 and comparing each one with WINDOW. */ |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1356 swindow = FRAME_SELECTED_WINDOW (f); |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1357 |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1358 while (1) |
3723
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
1359 { |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1360 pwindow = swindow; |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1361 while (!NILP (pwindow)) |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1362 { |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1363 if (EQ (window, pwindow)) |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1364 break; |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1365 pwindow = XWINDOW (pwindow)->parent; |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1366 } |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1367 |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1368 /* If the window being deleted is not a parent of SWINDOW, |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1369 then SWINDOW is ok as the new selected window. */ |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1370 if (!EQ (window, pwindow)) |
3723
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
1371 break; |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1372 /* Otherwise, try another window for SWINDOW. */ |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1373 swindow = Fnext_window (swindow, Qlambda, Qnil);; |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1374 |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1375 /* If we get back to the frame's selected window, |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1376 it means there was no acceptable alternative, |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1377 so we cannot delete. */ |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1378 if (EQ (swindow, FRAME_SELECTED_WINDOW (f))) |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1379 error ("Cannot delete window"); |
3723
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
1380 } |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
1381 |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1382 /* If we need to change SWINDOW, do it. */ |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1383 if (! EQ (swindow, FRAME_SELECTED_WINDOW (f))) |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1384 { |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1385 /* 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
|
1386 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
|
1387 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
|
1388 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
|
1389 anything but set the frame's selected_window slot. */ |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1390 if (EQ (FRAME_SELECTED_WINDOW (f), selected_window)) |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
1391 Fselect_window (swindow, Qnil); |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1392 else |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1393 FRAME_SELECTED_WINDOW (f) = swindow; |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1394 } |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1395 } |
265 | 1396 |
1397 tem = p->buffer; | |
1398 /* tem is null for dummy parent windows | |
1399 (which have inferiors but not any contents themselves) */ | |
485 | 1400 if (!NILP (tem)) |
265 | 1401 { |
1402 unshow_buffer (p); | |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
1403 unchain_marker (XMARKER (p->pointm)); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
1404 unchain_marker (XMARKER (p->start)); |
265 | 1405 } |
1406 | |
26761
c15c2756ec0f
(delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents:
26635
diff
changeset
|
1407 /* Free window glyph matrices. It is sure that they are allocated |
c15c2756ec0f
(delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents:
26635
diff
changeset
|
1408 again when ADJUST_GLYPHS is called. Block input so that expose |
c15c2756ec0f
(delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents:
26635
diff
changeset
|
1409 events and other events that access glyph matrices are not |
c15c2756ec0f
(delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents:
26635
diff
changeset
|
1410 processed while we are changing them. */ |
c15c2756ec0f
(delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents:
26635
diff
changeset
|
1411 BLOCK_INPUT; |
34819
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1412 free_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f))); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1413 |
265 | 1414 tem = p->next; |
485 | 1415 if (!NILP (tem)) |
265 | 1416 XWINDOW (tem)->prev = p->prev; |
1417 | |
1418 tem = p->prev; | |
485 | 1419 if (!NILP (tem)) |
265 | 1420 XWINDOW (tem)->next = p->next; |
1421 | |
1422 if (EQ (window, par->hchild)) | |
1423 par->hchild = p->next; | |
1424 if (EQ (window, par->vchild)) | |
1425 par->vchild = p->next; | |
1426 | |
1427 /* Find one of our siblings to give our space to. */ | |
1428 sib = p->prev; | |
485 | 1429 if (NILP (sib)) |
265 | 1430 { |
1431 /* If p gives its space to its next sibling, that sibling needs | |
1432 to have its top/left side pulled back to where p's is. | |
1433 set_window_{height,width} will re-position the sibling's | |
1434 children. */ | |
1435 sib = p->next; | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1436 XWINDOW (sib)->top_line = p->top_line; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1437 XWINDOW (sib)->left_col = p->left_col; |
265 | 1438 } |
1439 | |
1440 /* Stretch that sibling. */ | |
485 | 1441 if (!NILP (par->vchild)) |
265 | 1442 set_window_height (sib, |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1443 XFASTINT (XWINDOW (sib)->total_lines) + XFASTINT (p->total_lines), |
265 | 1444 1); |
485 | 1445 if (!NILP (par->hchild)) |
265 | 1446 set_window_width (sib, |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1447 XFASTINT (XWINDOW (sib)->total_cols) + XFASTINT (p->total_cols), |
265 | 1448 1); |
1449 | |
1450 /* If parent now has only one child, | |
1451 put the child into the parent's place. */ | |
1452 tem = par->hchild; | |
485 | 1453 if (NILP (tem)) |
265 | 1454 tem = par->vchild; |
485 | 1455 if (NILP (XWINDOW (tem)->next)) |
265 | 1456 replace_window (parent, tem); |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1457 |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1458 /* 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
|
1459 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
|
1460 if (! NILP (p->hchild)) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1461 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
|
1462 else if (! NILP (p->vchild)) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1463 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
|
1464 |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1465 /* Mark this window as deleted. */ |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1466 p->buffer = p->hchild = p->vchild = Qnil; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1467 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1468 /* Adjust glyph matrices. */ |
34819
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1469 adjust_glyphs (f); |
26761
c15c2756ec0f
(delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents:
26635
diff
changeset
|
1470 UNBLOCK_INPUT; |
265 | 1471 } |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1472 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1473 |
265 | 1474 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1475 /*********************************************************************** |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1476 Window List |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1477 ***********************************************************************/ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1478 |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1479 /* Add window W to *USER_DATA. USER_DATA is actually a Lisp_Object |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1480 pointer. This is a callback function for foreach_window, used in |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1481 function window_list. */ |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1482 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1483 static int |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1484 add_window_to_list (w, user_data) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1485 struct window *w; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1486 void *user_data; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1487 { |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1488 Lisp_Object *list = (Lisp_Object *) user_data; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1489 Lisp_Object window; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1490 XSETWINDOW (window, w); |
30039
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1491 *list = Fcons (window, *list); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1492 return 1; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1493 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1494 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1495 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1496 /* Return a list of all windows, for use by next_window. If |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1497 Vwindow_list is a list, return that list. Otherwise, build a new |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1498 list, cache it in Vwindow_list, and return that. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1499 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1500 static Lisp_Object |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1501 window_list () |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1502 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1503 if (!CONSP (Vwindow_list)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1504 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1505 Lisp_Object tail; |
30039
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1506 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1507 Vwindow_list = Qnil; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1508 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) |
30039
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1509 { |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1510 Lisp_Object args[2]; |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1511 |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1512 /* We are visiting windows in canonical order, and add |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1513 new windows at the front of args[1], which means we |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1514 have to reverse this list at the end. */ |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1515 args[1] = Qnil; |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1516 foreach_window (XFRAME (XCAR (tail)), add_window_to_list, &args[1]); |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1517 args[0] = Vwindow_list; |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1518 args[1] = Fnreverse (args[1]); |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1519 Vwindow_list = Fnconc (2, args); |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1520 } |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1521 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1522 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1523 return Vwindow_list; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1524 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1525 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1526 |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1527 /* Value is non-zero if WINDOW satisfies the constraints given by |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1528 OWINDOW, MINIBUF and ALL_FRAMES. |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1529 |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1530 MINIBUF t means WINDOW may be minibuffer windows. |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1531 `lambda' means WINDOW may not be a minibuffer window. |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1532 a window means a specific minibuffer window |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1533 |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1534 ALL_FRAMES t means search all frames, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1535 nil means search just current frame, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1536 `visible' means search just visible frames, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1537 0 means search visible and iconified frames, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1538 a window means search the frame that window belongs to, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1539 a frame means consider windows on that frame, only. */ |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1540 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1541 static int |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1542 candidate_window_p (window, owindow, minibuf, all_frames) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1543 Lisp_Object window, owindow, minibuf, all_frames; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1544 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1545 struct window *w = XWINDOW (window); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1546 struct frame *f = XFRAME (w->frame); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1547 int candidate_p = 1; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1548 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1549 if (!BUFFERP (w->buffer)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1550 candidate_p = 0; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1551 else if (MINI_WINDOW_P (w) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1552 && (EQ (minibuf, Qlambda) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1553 || (WINDOWP (minibuf) && !EQ (minibuf, window)))) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1554 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1555 /* If MINIBUF is `lambda' don't consider any mini-windows. |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1556 If it is a window, consider only that one. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1557 candidate_p = 0; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1558 } |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1559 else if (EQ (all_frames, Qt)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1560 candidate_p = 1; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1561 else if (NILP (all_frames)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1562 { |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1563 xassert (WINDOWP (owindow)); |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1564 candidate_p = EQ (w->frame, XWINDOW (owindow)->frame); |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1565 } |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1566 else if (EQ (all_frames, Qvisible)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1567 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1568 FRAME_SAMPLE_VISIBILITY (f); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1569 candidate_p = FRAME_VISIBLE_P (f); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1570 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1571 else if (INTEGERP (all_frames) && XINT (all_frames) == 0) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1572 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1573 FRAME_SAMPLE_VISIBILITY (f); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1574 candidate_p = FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1575 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1576 else if (WINDOWP (all_frames)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1577 candidate_p = (EQ (FRAME_MINIBUF_WINDOW (f), all_frames) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1578 || EQ (XWINDOW (all_frames)->frame, w->frame) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1579 || EQ (XWINDOW (all_frames)->frame, FRAME_FOCUS_FRAME (f))); |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1580 else if (FRAMEP (all_frames)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1581 candidate_p = EQ (all_frames, w->frame); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1582 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1583 return candidate_p; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1584 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1585 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1586 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1587 /* Decode arguments as allowed by Fnext_window, Fprevious_window, and |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1588 Fwindow_list. See there for the meaning of WINDOW, MINIBUF, and |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1589 ALL_FRAMES. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1590 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1591 static void |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1592 decode_next_window_args (window, minibuf, all_frames) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1593 Lisp_Object *window, *minibuf, *all_frames; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1594 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1595 if (NILP (*window)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1596 *window = selected_window; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1597 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1598 CHECK_LIVE_WINDOW (*window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1599 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1600 /* MINIBUF nil may or may not include minibuffers. Decide if it |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1601 does. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1602 if (NILP (*minibuf)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1603 *minibuf = minibuf_level ? minibuf_window : Qlambda; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1604 else if (!EQ (*minibuf, Qt)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1605 *minibuf = Qlambda; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1606 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1607 /* Now *MINIBUF can be t => count all minibuffer windows, `lambda' |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1608 => count none of them, or a specific minibuffer window (the |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1609 active one) to count. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1610 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1611 /* ALL_FRAMES nil doesn't specify which frames to include. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1612 if (NILP (*all_frames)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1613 *all_frames = (!EQ (*minibuf, Qlambda) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1614 ? FRAME_MINIBUF_WINDOW (XFRAME (XWINDOW (*window)->frame)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1615 : Qnil); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1616 else if (EQ (*all_frames, Qvisible)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1617 ; |
58448
f3a76c43ac80
(Fset_window_scroll_bars): Don't use XINT if it isn't int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58441
diff
changeset
|
1618 else if (EQ (*all_frames, make_number (0))) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1619 ; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1620 else if (FRAMEP (*all_frames)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1621 ; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1622 else if (!EQ (*all_frames, Qt)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1623 *all_frames = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1624 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1625 /* Now *ALL_FRAMES is t meaning search all frames, nil meaning |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1626 search just current frame, `visible' meaning search just visible |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1627 frames, 0 meaning search visible and iconified frames, or a |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1628 window, meaning search the frame that window belongs to, or a |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1629 frame, meaning consider windows on that frame, only. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1630 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1631 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1632 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1633 /* Return the next or previous window of WINDOW in canonical ordering |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1634 of windows. NEXT_P non-zero means return the next window. See the |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1635 documentation string of next-window for the meaning of MINIBUF and |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1636 ALL_FRAMES. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1637 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1638 static Lisp_Object |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1639 next_window (window, minibuf, all_frames, next_p) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1640 Lisp_Object window, minibuf, all_frames; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1641 int next_p; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1642 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1643 decode_next_window_args (&window, &minibuf, &all_frames); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1644 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1645 /* If ALL_FRAMES is a frame, and WINDOW isn't on that frame, just |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1646 return the first window on the frame. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1647 if (FRAMEP (all_frames) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1648 && !EQ (all_frames, XWINDOW (window)->frame)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1649 return Fframe_first_window (all_frames); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1650 |
30039
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1651 if (next_p) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1652 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1653 Lisp_Object list; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1654 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1655 /* Find WINDOW in the list of all windows. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1656 list = Fmemq (window, window_list ()); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1657 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1658 /* Scan forward from WINDOW to the end of the window list. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1659 if (CONSP (list)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1660 for (list = XCDR (list); CONSP (list); list = XCDR (list)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1661 if (candidate_window_p (XCAR (list), window, minibuf, all_frames)) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1662 break; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1663 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1664 /* Scan from the start of the window list up to WINDOW. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1665 if (!CONSP (list)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1666 for (list = Vwindow_list; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1667 CONSP (list) && !EQ (XCAR (list), window); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1668 list = XCDR (list)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1669 if (candidate_window_p (XCAR (list), window, minibuf, all_frames)) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1670 break; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1671 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1672 if (CONSP (list)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1673 window = XCAR (list); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1674 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1675 else |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1676 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1677 Lisp_Object candidate, list; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1678 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1679 /* Scan through the list of windows for candidates. If there are |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1680 candidate windows in front of WINDOW, the last one of these |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1681 is the one we want. If there are candidates following WINDOW |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1682 in the list, again the last one of these is the one we want. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1683 candidate = Qnil; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1684 for (list = window_list (); CONSP (list); list = XCDR (list)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1685 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1686 if (EQ (XCAR (list), window)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1687 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1688 if (WINDOWP (candidate)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1689 break; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1690 } |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1691 else if (candidate_window_p (XCAR (list), window, minibuf, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1692 all_frames)) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1693 candidate = XCAR (list); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1694 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1695 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1696 if (WINDOWP (candidate)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1697 window = candidate; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1698 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1699 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1700 return window; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1701 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1702 |
432 | 1703 |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1704 DEFUN ("next-window", Fnext_window, Snext_window, 0, 3, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1705 doc: /* Return next window after WINDOW in canonical ordering of windows. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1706 If omitted, WINDOW defaults to the selected window. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1707 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1708 Optional second arg MINIBUF t means count the minibuffer window even |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1709 if not active. MINIBUF nil or omitted means count the minibuffer iff |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1710 it is active. MINIBUF neither t nor nil means not to count the |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1711 minibuffer even if it is active. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1712 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1713 Several frames may share a single minibuffer; if the minibuffer |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1714 counts, all windows on all frames that share that minibuffer count |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1715 too. Therefore, `next-window' can be used to iterate through the |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1716 set of windows even when the minibuffer is on another frame. If the |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1717 minibuffer does not count, only windows from WINDOW's frame count. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1718 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1719 Optional third arg ALL-FRAMES t means include windows on all frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1720 ALL-FRAMES nil or omitted means cycle within the frames as specified |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1721 above. ALL-FRAMES = `visible' means include windows on all visible frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1722 ALL-FRAMES = 0 means include windows on all visible and iconified frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1723 If ALL-FRAMES is a frame, restrict search to windows on that frame. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1724 Anything else means restrict to WINDOW's frame. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1725 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1726 If you use consistent values for MINIBUF and ALL-FRAMES, you can use |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1727 `next-window' to iterate through the entire cycle of acceptable |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1728 windows, eventually ending up back at the window you started with. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1729 `previous-window' traverses the same cycle, in the reverse order. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1730 (window, minibuf, all_frames) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1731 Lisp_Object window, minibuf, all_frames; |
265 | 1732 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1733 return next_window (window, minibuf, all_frames, 1); |
265 | 1734 } |
1735 | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1736 |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1737 DEFUN ("previous-window", Fprevious_window, Sprevious_window, 0, 3, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1738 doc: /* Return the window preceding WINDOW in canonical ordering of windows. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1739 If omitted, WINDOW defaults to the selected window. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1740 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1741 Optional second arg MINIBUF t means count the minibuffer window even |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1742 if not active. MINIBUF nil or omitted means count the minibuffer iff |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1743 it is active. MINIBUF neither t nor nil means not to count the |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1744 minibuffer even if it is active. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1745 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1746 Several frames may share a single minibuffer; if the minibuffer |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1747 counts, all windows on all frames that share that minibuffer count |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1748 too. Therefore, `previous-window' can be used to iterate through |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1749 the set of windows even when the minibuffer is on another frame. If |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1750 the minibuffer does not count, only windows from WINDOW's frame count |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1751 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1752 Optional third arg ALL-FRAMES t means include windows on all frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1753 ALL-FRAMES nil or omitted means cycle within the frames as specified |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1754 above. ALL-FRAMES = `visible' means include windows on all visible frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1755 ALL-FRAMES = 0 means include windows on all visible and iconified frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1756 If ALL-FRAMES is a frame, restrict search to windows on that frame. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1757 Anything else means restrict to WINDOW's frame. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1758 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1759 If you use consistent values for MINIBUF and ALL-FRAMES, you can use |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1760 `previous-window' to iterate through the entire cycle of acceptable |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1761 windows, eventually ending up back at the window you started with. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1762 `next-window' traverses the same cycle, in the reverse order. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1763 (window, minibuf, all_frames) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1764 Lisp_Object window, minibuf, all_frames; |
265 | 1765 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1766 return next_window (window, minibuf, all_frames, 0); |
265 | 1767 } |
1768 | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1769 |
338 | 1770 DEFUN ("other-window", Fother_window, Sother_window, 1, 2, "p", |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1771 doc: /* Select the ARG'th different window on this frame. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1772 All windows on current frame are arranged in a cyclic order. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1773 This command selects the window ARG steps away in that order. |
56393
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
1774 A negative ARG moves in the opposite order. The optional second |
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
1775 argument ALL_FRAMES has the same meaning as in `next-window', which see. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1776 (arg, all_frames) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1777 Lisp_Object arg, all_frames; |
265 | 1778 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1779 Lisp_Object window; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1780 int i; |
265 | 1781 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1782 CHECK_NUMBER (arg); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1783 window = selected_window; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1784 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1785 for (i = XINT (arg); i > 0; --i) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1786 window = Fnext_window (window, Qnil, all_frames); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1787 for (; i < 0; ++i) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1788 window = Fprevious_window (window, Qnil, all_frames); |
39953
3a1666ed16b8
(select_window_1): Unfreeze window start. Remove a
Gerd Moellmann <gerd@gnu.org>
parents:
39952
diff
changeset
|
1789 |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
1790 Fselect_window (window, Qnil); |
265 | 1791 return Qnil; |
1792 } | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1793 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1794 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1795 DEFUN ("window-list", Fwindow_list, Swindow_list, 0, 3, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1796 doc: /* Return a list of windows on FRAME, starting with WINDOW. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1797 FRAME nil or omitted means use the selected frame. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1798 WINDOW nil or omitted means use the selected window. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1799 MINIBUF t means include the minibuffer window, even if it isn't active. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1800 MINIBUF nil or omitted means include the minibuffer window only |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1801 if it's active. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1802 MINIBUF neither nil nor t means never include the minibuffer window. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1803 (frame, minibuf, window) |
33619
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1804 Lisp_Object frame, minibuf, window; |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1805 { |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1806 if (NILP (window)) |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1807 window = selected_window; |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1808 if (NILP (frame)) |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1809 frame = selected_frame; |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1810 |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1811 if (!EQ (frame, XWINDOW (window)->frame)) |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1812 error ("Window is on a different frame"); |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1813 |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1814 return window_list_1 (window, minibuf, frame); |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1815 } |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1816 |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1817 |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1818 /* Return a list of windows in canonical ordering. Arguments are like |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1819 for `next-window'. */ |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1820 |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1821 static Lisp_Object |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1822 window_list_1 (window, minibuf, all_frames) |
30265
9b1c8eafe4dc
(Fwindow_list): Declare arg `window'.
Dave Love <fx@gnu.org>
parents:
30102
diff
changeset
|
1823 Lisp_Object window, minibuf, all_frames; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1824 { |
56456
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1825 Lisp_Object tail, list, rest; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1826 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1827 decode_next_window_args (&window, &minibuf, &all_frames); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1828 list = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1829 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1830 for (tail = window_list (); CONSP (tail); tail = XCDR (tail)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1831 if (candidate_window_p (XCAR (tail), window, minibuf, all_frames)) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1832 list = Fcons (XCAR (tail), list); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1833 |
56456
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1834 /* Rotate the list to start with WINDOW. */ |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1835 list = Fnreverse (list); |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1836 rest = Fmemq (window, list); |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1837 if (!NILP (rest) && !EQ (rest, list)) |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1838 { |
56616
76bd0e931318
(window_list_1): YAILOM.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56585
diff
changeset
|
1839 for (tail = list; !EQ (XCDR (tail), rest); tail = XCDR (tail)) |
56456
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1840 ; |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1841 XSETCDR (tail, Qnil); |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1842 list = nconc2 (rest, list); |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1843 } |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1844 return list; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1845 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1846 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1847 |
265 | 1848 |
1849 /* Look at all windows, performing an operation specified by TYPE | |
1850 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
|
1851 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
|
1852 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
|
1853 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
|
1854 a frame, just look at windows on that frame. |
35038
ac8eb6b4eee6
(Fdelete_other_windows): Set window's window_end_valid
Gerd Moellmann <gerd@gnu.org>
parents:
35024
diff
changeset
|
1855 If MINI is non-zero, perform the operation on minibuffer windows too. */ |
265 | 1856 |
1857 enum window_loop | |
1858 { | |
1859 WINDOW_LOOP_UNUSED, | |
1860 GET_BUFFER_WINDOW, /* Arg is buffer */ | |
1861 GET_LRU_WINDOW, /* Arg is t for full-width windows only */ | |
1862 DELETE_OTHER_WINDOWS, /* Arg is window not to delete */ | |
1863 DELETE_BUFFER_WINDOWS, /* Arg is buffer */ | |
1864 GET_LARGEST_WINDOW, | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
1865 UNSHOW_BUFFER, /* Arg is buffer */ |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
1866 REDISPLAY_BUFFER_WINDOWS, /* Arg is buffer */ |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
1867 CHECK_ALL_WINDOWS |
265 | 1868 }; |
1869 | |
1870 static Lisp_Object | |
769 | 1871 window_loop (type, obj, mini, frames) |
265 | 1872 enum window_loop type; |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1873 Lisp_Object obj, frames; |
265 | 1874 int mini; |
1875 { | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1876 Lisp_Object window, windows, best_window, frame_arg; |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1877 struct frame *f; |
30102
9406cb07bac7
(window_loop): Add missing gcpro1 local variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30093
diff
changeset
|
1878 struct gcpro gcpro1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1879 |
769 | 1880 /* If we're only looping through windows on a particular frame, |
1881 frame points to that frame. If we're looping through windows | |
1882 on all frames, frame is 0. */ | |
1883 if (FRAMEP (frames)) | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1884 f = XFRAME (frames); |
769 | 1885 else if (NILP (frames)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1886 f = SELECTED_FRAME (); |
265 | 1887 else |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1888 f = NULL; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1889 |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1890 if (f) |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1891 frame_arg = Qlambda; |
58448
f3a76c43ac80
(Fset_window_scroll_bars): Don't use XINT if it isn't int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58441
diff
changeset
|
1892 else if (EQ (frames, make_number (0))) |
8167
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
1893 frame_arg = frames; |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1894 else if (EQ (frames, Qvisible)) |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1895 frame_arg = frames; |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1896 else |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1897 frame_arg = Qt; |
265 | 1898 |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1899 /* 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
|
1900 Qvisible to consider all visible frames, |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1901 or Qt otherwise. */ |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1902 |
265 | 1903 /* 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
|
1904 if (WINDOWP (obj)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1905 window = obj; |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1906 else if (f) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1907 window = FRAME_SELECTED_WINDOW (f); |
265 | 1908 else |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1909 window = FRAME_SELECTED_WINDOW (SELECTED_FRAME ()); |
983
eb19dfaec9c4
* window.c (window_loop): This used to keep track of the first
Jim Blandy <jimb@redhat.com>
parents:
972
diff
changeset
|
1910 |
33619
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1911 windows = window_list_1 (window, mini ? Qt : Qnil, frame_arg); |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1912 GCPRO1 (windows); |
265 | 1913 best_window = Qnil; |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1914 |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1915 for (; CONSP (windows); windows = CDR (windows)) |
265 | 1916 { |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1917 struct window *w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1918 |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1919 window = XCAR (windows); |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1920 w = XWINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1921 |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1922 /* Note that we do not pay attention here to whether the frame |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1923 is visible, since Fwindow_list skips non-visible frames if |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1924 that is desired, under the control of frame_arg. */ |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1925 if (!MINI_WINDOW_P (w) |
23728
0d1a0ded9aa1
(temp_output_buffer_show): Around temp-buffer-show-hook,
Richard M. Stallman <rms@gnu.org>
parents:
23410
diff
changeset
|
1926 /* For UNSHOW_BUFFER, we must always consider all windows. */ |
0d1a0ded9aa1
(temp_output_buffer_show): Around temp-buffer-show-hook,
Richard M. Stallman <rms@gnu.org>
parents:
23410
diff
changeset
|
1927 || type == UNSHOW_BUFFER |
265 | 1928 || (mini && minibuf_level > 0)) |
1929 switch (type) | |
1930 { | |
1931 case GET_BUFFER_WINDOW: | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1932 if (EQ (w->buffer, obj) |
16522
63ca7c6ceeff
(window_loop, case GET_BUFFER_WINDOW):
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
1933 /* Don't find any minibuffer window |
63ca7c6ceeff
(window_loop, case GET_BUFFER_WINDOW):
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
1934 except the one that is currently in use. */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1935 && (MINI_WINDOW_P (w) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1936 ? EQ (window, minibuf_window) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1937 : 1)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1938 { |
36068
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
1939 if (NILP (best_window)) |
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
1940 best_window = window; |
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
1941 else if (EQ (window, selected_window)) |
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
1942 /* For compatibility with 20.x, prefer to return |
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
1943 selected-window. */ |
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
1944 best_window = window; |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1945 } |
265 | 1946 break; |
1947 | |
1948 case GET_LRU_WINDOW: | |
1949 /* t as arg means consider only full-width windows */ | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1950 if (!NILP (obj) && !WINDOW_FULL_WIDTH_P (w)) |
265 | 1951 break; |
1952 /* Ignore dedicated windows and minibuffers. */ | |
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
1953 if (MINI_WINDOW_P (w) || EQ (w->dedicated, Qt)) |
265 | 1954 break; |
485 | 1955 if (NILP (best_window) |
265 | 1956 || (XFASTINT (XWINDOW (best_window)->use_time) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1957 > XFASTINT (w->use_time))) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1958 best_window = window; |
265 | 1959 break; |
1960 | |
1961 case DELETE_OTHER_WINDOWS: | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1962 if (!EQ (window, obj)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1963 Fdelete_window (window); |
265 | 1964 break; |
1965 | |
1966 case DELETE_BUFFER_WINDOWS: | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1967 if (EQ (w->buffer, obj)) |
265 | 1968 { |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1969 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
10808
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
1970 |
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
1971 /* 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
|
1972 kill the frame. */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1973 if (EQ (window, FRAME_ROOT_WINDOW (f)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1974 && !NILP (w->dedicated) |
10808
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
1975 && other_visible_frames (f)) |
265 | 1976 { |
10808
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
1977 /* 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
|
1978 There might be one, the minibuffer! */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1979 while (CONSP (XCDR (windows)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1980 && EQ (XWINDOW (XCAR (windows))->frame, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1981 XWINDOW (XCAR (XCDR (windows)))->frame)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1982 windows = XCDR (windows); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1983 |
10808
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
1984 /* Now we can safely delete the frame. */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1985 Fdelete_frame (w->frame, Qnil); |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1986 } |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1987 else if (NILP (w->parent)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1988 { |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1989 /* If we're deleting the buffer displayed in the |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1990 only window on the frame, find a new buffer to |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1991 display there. */ |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1992 Lisp_Object buffer; |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1993 buffer = Fother_buffer (obj, Qnil, w->frame); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1994 Fset_window_buffer (window, buffer, Qnil); |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1995 if (EQ (window, selected_window)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1996 Fset_buffer (w->buffer); |
265 | 1997 } |
1998 else | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1999 Fdelete_window (window); |
265 | 2000 } |
2001 break; | |
2002 | |
2003 case GET_LARGEST_WINDOW: | |
2004 { | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2005 /* Ignore dedicated windows and minibuffers. */ |
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2006 if (MINI_WINDOW_P (w) || EQ (w->dedicated, Qt)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2007 break; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2008 |
31393
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2009 if (NILP (best_window)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2010 best_window = window; |
31393
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2011 else |
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2012 { |
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2013 struct window *b = XWINDOW (best_window); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2014 if (XFASTINT (w->total_lines) * XFASTINT (w->total_cols) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2015 > XFASTINT (b->total_lines) * XFASTINT (b->total_cols)) |
31393
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2016 best_window = window; |
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2017 } |
265 | 2018 } |
2019 break; | |
2020 | |
2021 case UNSHOW_BUFFER: | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2022 if (EQ (w->buffer, obj)) |
265 | 2023 { |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2024 Lisp_Object buffer; |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2025 struct frame *f = XFRAME (w->frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2026 |
265 | 2027 /* Find another buffer to show in this window. */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2028 buffer = Fother_buffer (obj, Qnil, w->frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2029 |
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2030 /* 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
|
2031 kill the frame. */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2032 if (EQ (window, FRAME_ROOT_WINDOW (f)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2033 && !NILP (w->dedicated) |
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2034 && other_visible_frames (f)) |
8536
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2035 { |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2036 /* Skip the other windows on this frame. |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2037 There might be one, the minibuffer! */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2038 while (CONSP (XCDR (windows)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2039 && EQ (XWINDOW (XCAR (windows))->frame, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2040 XWINDOW (XCAR (XCDR (windows)))->frame)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2041 windows = XCDR (windows); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2042 |
8536
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2043 /* Now we can safely delete the frame. */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2044 Fdelete_frame (w->frame, Qnil); |
8536
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2045 } |
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2046 else if (!NILP (w->dedicated) && !NILP (w->parent)) |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2047 { |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2048 Lisp_Object window; |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2049 XSETWINDOW (window, w); |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2050 /* If this window is dedicated and not the only window |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2051 in its frame, then kill it. */ |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2052 Fdelete_window (window); |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2053 } |
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2054 else |
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2055 { |
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2056 /* Otherwise show a different buffer in the window. */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2057 w->dedicated = Qnil; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2058 Fset_window_buffer (window, buffer, Qnil); |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2059 if (EQ (window, selected_window)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2060 Fset_buffer (w->buffer); |
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2061 } |
265 | 2062 } |
2063 break; | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2064 |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2065 case REDISPLAY_BUFFER_WINDOWS: |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2066 if (EQ (w->buffer, obj)) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2067 { |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2068 mark_window_display_accurate (window, 0); |
54178
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
2069 w->update_mode_line = Qt; |
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
2070 XBUFFER (obj)->prevent_redisplay_optimizations_p = 1; |
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
2071 ++update_mode_lines; |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2072 best_window = window; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2073 } |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2074 break; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2075 |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2076 /* Check for a window that has a killed buffer. */ |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2077 case CHECK_ALL_WINDOWS: |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2078 if (! NILP (w->buffer) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2079 && NILP (XBUFFER (w->buffer)->name)) |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2080 abort (); |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2081 break; |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
2082 |
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
2083 case WINDOW_LOOP_UNUSED: |
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
2084 break; |
265 | 2085 } |
2086 } | |
2087 | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2088 UNGCPRO; |
265 | 2089 return best_window; |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
2090 } |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
2091 |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2092 /* Used for debugging. Abort if any window has a dead buffer. */ |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2093 |
25268 | 2094 void |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2095 check_all_windows () |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2096 { |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2097 window_loop (CHECK_ALL_WINDOWS, Qnil, 1, Qt); |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2098 } |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2099 |
265 | 2100 DEFUN ("get-lru-window", Fget_lru_window, Sget_lru_window, 0, 1, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2101 doc: /* Return the window least recently selected or used for display. |
54883
375346b8175c
(Fget_lru_window): Doc fix.
Nick Roberts <nickrob@snap.net.nz>
parents:
54267
diff
changeset
|
2102 Return a full-width window if possible. |
56393
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
2103 A minibuffer window is never a candidate. |
58732
cd5b85acf394
(Fget_lru_window, Fget_largest_window): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
58448
diff
changeset
|
2104 A dedicated window is never a candidate, so if all windows are dedicated, |
cd5b85acf394
(Fget_lru_window, Fget_largest_window): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
58448
diff
changeset
|
2105 the value is nil. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2106 If optional argument FRAME is `visible', search all visible frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2107 If FRAME is 0, search all visible and iconified frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2108 If FRAME is t, search all frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2109 If FRAME is nil, search only the selected frame. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2110 If FRAME is a frame, search only that frame. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2111 (frame) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2112 Lisp_Object frame; |
265 | 2113 { |
2114 register Lisp_Object w; | |
2115 /* 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
|
2116 w = window_loop (GET_LRU_WINDOW, Qt, 0, frame); |
485 | 2117 if (!NILP (w) && !EQ (w, selected_window)) |
265 | 2118 return w; |
2119 /* 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
|
2120 return window_loop (GET_LRU_WINDOW, Qnil, 0, frame); |
265 | 2121 } |
2122 | |
2123 DEFUN ("get-largest-window", Fget_largest_window, Sget_largest_window, 0, 1, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2124 doc: /* Return the largest window in area. |
56393
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
2125 A minibuffer window is never a candidate. |
58732
cd5b85acf394
(Fget_lru_window, Fget_largest_window): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
58448
diff
changeset
|
2126 A dedicated window is never a candidate, so if all windows are dedicated, |
cd5b85acf394
(Fget_lru_window, Fget_largest_window): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
58448
diff
changeset
|
2127 the value is nil. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2128 If optional argument FRAME is `visible', search all visible frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2129 If FRAME is 0, search all visible and iconified frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2130 If FRAME is t, search all frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2131 If FRAME is nil, search only the selected frame. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2132 If FRAME is a frame, search only that frame. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2133 (frame) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2134 Lisp_Object frame; |
265 | 2135 { |
2136 return window_loop (GET_LARGEST_WINDOW, Qnil, 0, | |
769 | 2137 frame); |
265 | 2138 } |
2139 | |
2140 DEFUN ("get-buffer-window", Fget_buffer_window, Sget_buffer_window, 1, 2, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2141 doc: /* Return a window currently displaying BUFFER, or nil if none. |
56393
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
2142 BUFFER can be a buffer or a buffer name. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2143 If optional argument FRAME is `visible', search all visible frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2144 If optional argument FRAME is 0, search all visible and iconified frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2145 If FRAME is t, search all frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2146 If FRAME is nil, search only the selected frame. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2147 If FRAME is a frame, search only that frame. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2148 (buffer, frame) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2149 Lisp_Object buffer, frame; |
265 | 2150 { |
2151 buffer = Fget_buffer (buffer); | |
9105
984a4b1be1d1
(Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents:
9028
diff
changeset
|
2152 if (BUFFERP (buffer)) |
769 | 2153 return window_loop (GET_BUFFER_WINDOW, buffer, 1, frame); |
265 | 2154 else |
2155 return Qnil; | |
2156 } | |
2157 | |
2158 DEFUN ("delete-other-windows", Fdelete_other_windows, Sdelete_other_windows, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2159 0, 1, "", |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2160 doc: /* Make WINDOW (or the selected window) fill its frame. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2161 Only the frame WINDOW is on is affected. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2162 This function tries to reduce display jumps |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2163 by keeping the text previously visible in WINDOW |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2164 in the same place on the frame. Doing this depends on |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2165 the value of (window-start WINDOW), so if calling this function |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2166 in a program gives strange scrolling, make sure the window-start |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2167 value is reasonable when this function is called. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2168 (window) |
265 | 2169 Lisp_Object window; |
2170 { | |
2171 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
|
2172 int startpos; |
35038
ac8eb6b4eee6
(Fdelete_other_windows): Set window's window_end_valid
Gerd Moellmann <gerd@gnu.org>
parents:
35024
diff
changeset
|
2173 int top, new_top; |
265 | 2174 |
485 | 2175 if (NILP (window)) |
265 | 2176 window = selected_window; |
2177 else | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
2178 CHECK_LIVE_WINDOW (window); |
265 | 2179 w = XWINDOW (window); |
9028
74119e5602eb
(Fdelete_other_windows): Nice error if WINDOW is minibuf.
Richard M. Stallman <rms@gnu.org>
parents:
8991
diff
changeset
|
2180 |
7348
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2181 startpos = marker_position (w->start); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2182 top = WINDOW_TOP_EDGE_LINE (w) - FRAME_TOP_MARGIN (XFRAME (WINDOW_FRAME (w))); |
265 | 2183 |
9028
74119e5602eb
(Fdelete_other_windows): Nice error if WINDOW is minibuf.
Richard M. Stallman <rms@gnu.org>
parents:
8991
diff
changeset
|
2184 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
|
2185 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
|
2186 |
2190
482c7827b968
(Fdelete_other_windows): Handle FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
2187 window_loop (DELETE_OTHER_WINDOWS, window, 0, WINDOW_FRAME (w)); |
265 | 2188 |
7348
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2189 /* 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
|
2190 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
|
2191 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
|
2192 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
|
2193 not current, due to typeahead). */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2194 new_top = WINDOW_TOP_EDGE_LINE (w) - FRAME_TOP_MARGIN (XFRAME (WINDOW_FRAME (w))); |
35038
ac8eb6b4eee6
(Fdelete_other_windows): Set window's window_end_valid
Gerd Moellmann <gerd@gnu.org>
parents:
35024
diff
changeset
|
2195 if (new_top != top |
ac8eb6b4eee6
(Fdelete_other_windows): Set window's window_end_valid
Gerd Moellmann <gerd@gnu.org>
parents:
35024
diff
changeset
|
2196 && startpos >= BUF_BEGV (XBUFFER (w->buffer)) |
7348
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2197 && 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
|
2198 { |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2199 struct position pos; |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2200 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
|
2201 |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2202 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
|
2203 /* 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
|
2204 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
|
2205 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
|
2206 |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
2207 set_marker_both (w->start, w->buffer, pos.bufpos, pos.bytepos); |
35038
ac8eb6b4eee6
(Fdelete_other_windows): Set window's window_end_valid
Gerd Moellmann <gerd@gnu.org>
parents:
35024
diff
changeset
|
2208 w->window_end_valid = Qnil; |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
2209 w->start_at_line_beg = ((pos.bytepos == BEGV_BYTE |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
2210 || FETCH_BYTE (pos.bytepos - 1) == '\n') ? Qt |
7348
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2211 : Qnil); |
13198
43d90596da34
(Fdelete_other_windows): Set w->force_start.
Richard M. Stallman <rms@gnu.org>
parents:
13187
diff
changeset
|
2212 /* 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
|
2213 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
|
2214 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
|
2215 |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2216 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
|
2217 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2218 |
265 | 2219 return Qnil; |
2220 } | |
2221 | |
2222 DEFUN ("delete-windows-on", Fdelete_windows_on, Sdelete_windows_on, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2223 1, 2, "bDelete windows on (buffer): ", |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2224 doc: /* Delete all windows showing BUFFER. |
56393
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
2225 BUFFER must be a buffer or the name of an existing buffer. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2226 Optional second argument FRAME controls which frames are affected. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2227 If optional argument FRAME is `visible', search all visible frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2228 If FRAME is 0, search all visible and iconified frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2229 If FRAME is nil, search all frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2230 If FRAME is t, search only the selected frame. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2231 If FRAME is a frame, search only that frame. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2232 (buffer, frame) |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
2233 Lisp_Object buffer, frame; |
265 | 2234 { |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
2235 /* 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
|
2236 expects. */ |
22223
5d15aed3a37c
(Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents:
22187
diff
changeset
|
2237 if (NILP (frame)) |
5d15aed3a37c
(Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents:
22187
diff
changeset
|
2238 frame = Qt; |
5d15aed3a37c
(Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents:
22187
diff
changeset
|
2239 else if (EQ (frame, Qt)) |
5d15aed3a37c
(Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents:
22187
diff
changeset
|
2240 frame = Qnil; |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
2241 |
485 | 2242 if (!NILP (buffer)) |
265 | 2243 { |
2244 buffer = Fget_buffer (buffer); | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
2245 CHECK_BUFFER (buffer); |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
2246 window_loop (DELETE_BUFFER_WINDOWS, buffer, 0, frame); |
265 | 2247 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2248 |
265 | 2249 return Qnil; |
2250 } | |
2251 | |
2252 DEFUN ("replace-buffer-in-windows", Freplace_buffer_in_windows, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2253 Sreplace_buffer_in_windows, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2254 1, 1, "bReplace buffer in windows: ", |
56393
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
2255 doc: /* Replace BUFFER with some other buffer in all windows showing it. |
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
2256 BUFFER may be a buffer or the name of an existing buffer. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2257 (buffer) |
265 | 2258 Lisp_Object buffer; |
2259 { | |
485 | 2260 if (!NILP (buffer)) |
265 | 2261 { |
2262 buffer = Fget_buffer (buffer); | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
2263 CHECK_BUFFER (buffer); |
265 | 2264 window_loop (UNSHOW_BUFFER, buffer, 0, Qt); |
2265 } | |
2266 return Qnil; | |
2267 } | |
13918
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2268 |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2269 /* 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
|
2270 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
|
2271 |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2272 void |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2273 replace_buffer_in_all_windows (buffer) |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2274 Lisp_Object buffer; |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2275 { |
14204
c0b44d3a8312
(replace_buffer_in_all_windows): Don't change selected
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
2276 #ifdef MULTI_KBOARD |
13918
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2277 Lisp_Object tail, frame; |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2278 |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2279 /* 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
|
2280 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
|
2281 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
|
2282 FOR_EACH_FRAME (tail, frame) |
20066
affc9c857428
(replace_buffer_in_all_windows):
Karl Heuer <kwzh@gnu.org>
parents:
20046
diff
changeset
|
2283 window_loop (UNSHOW_BUFFER, buffer, 1, frame); |
13918
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2284 #else |
20066
affc9c857428
(replace_buffer_in_all_windows):
Karl Heuer <kwzh@gnu.org>
parents:
20046
diff
changeset
|
2285 window_loop (UNSHOW_BUFFER, buffer, 1, Qt); |
13918
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2286 #endif |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2287 } |
265 | 2288 |
2289 /* 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
|
2290 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2291 /* 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
|
2292 might crash Emacs. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2293 |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2294 #define MIN_SAFE_WINDOW_WIDTH (2) |
42862
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
2295 #define MIN_SAFE_WINDOW_HEIGHT (1) |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2296 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2297 /* 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
|
2298 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
|
2299 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2300 static void |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2301 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
|
2302 { |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2303 /* 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
|
2304 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
|
2305 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
|
2306 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
|
2307 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
|
2308 } |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2309 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2310 /* 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
|
2311 minimum allowable size. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2312 |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
2313 void |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2314 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
|
2315 FRAME_PTR frame; |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
2316 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
|
2317 { |
4347
d6b289b1a6dc
* window.c (check_frame_size): Include the menu bar height in the
Jim Blandy <jimb@redhat.com>
parents:
4292
diff
changeset
|
2318 /* For height, we have to see: |
42875
87fe94f01b8e
(check_frame_size): Fix minimum height calculation.
Richard M. Stallman <rms@gnu.org>
parents:
42862
diff
changeset
|
2319 how many windows the frame has at minimum (one or two), |
87fe94f01b8e
(check_frame_size): Fix minimum height calculation.
Richard M. Stallman <rms@gnu.org>
parents:
42862
diff
changeset
|
2320 and whether it has a menu bar or other special stuff at the top. */ |
87fe94f01b8e
(check_frame_size): Fix minimum height calculation.
Richard M. Stallman <rms@gnu.org>
parents:
42862
diff
changeset
|
2321 int min_height |
87fe94f01b8e
(check_frame_size): Fix minimum height calculation.
Richard M. Stallman <rms@gnu.org>
parents:
42862
diff
changeset
|
2322 = ((FRAME_MINIBUF_ONLY_P (frame) || ! FRAME_HAS_MINIBUF_P (frame)) |
87fe94f01b8e
(check_frame_size): Fix minimum height calculation.
Richard M. Stallman <rms@gnu.org>
parents:
42862
diff
changeset
|
2323 ? MIN_SAFE_WINDOW_HEIGHT |
87fe94f01b8e
(check_frame_size): Fix minimum height calculation.
Richard M. Stallman <rms@gnu.org>
parents:
42862
diff
changeset
|
2324 : 2 * MIN_SAFE_WINDOW_HEIGHT); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2325 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2326 if (FRAME_TOP_MARGIN (frame) > 0) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2327 min_height += FRAME_TOP_MARGIN (frame); |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2328 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2329 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
|
2330 *rows = min_height; |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2331 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
|
2332 *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
|
2333 } |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2334 |
25254 | 2335 |
25268 | 2336 /* Value is non-zero if window W is fixed-size. WIDTH_P non-zero means |
2337 check if W's width can be changed, otherwise check W's height. | |
2338 CHECK_SIBLINGS_P non-zero means check resizablity of WINDOW's | |
2339 siblings, too. If none of the siblings is resizable, WINDOW isn't | |
2340 either. */ | |
2341 | |
2342 static int | |
2343 window_fixed_size_p (w, width_p, check_siblings_p) | |
2344 struct window *w; | |
2345 int width_p, check_siblings_p; | |
2346 { | |
2347 int fixed_p; | |
2348 struct window *c; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2349 |
25268 | 2350 if (!NILP (w->hchild)) |
2351 { | |
2352 c = XWINDOW (w->hchild); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2353 |
25268 | 2354 if (width_p) |
2355 { | |
2356 /* A horiz. combination is fixed-width if all of if its | |
2357 children are. */ | |
2358 while (c && window_fixed_size_p (c, width_p, 0)) | |
2359 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2360 fixed_p = c == NULL; | |
2361 } | |
2362 else | |
2363 { | |
2364 /* A horiz. combination is fixed-height if one of if its | |
2365 children is. */ | |
2366 while (c && !window_fixed_size_p (c, width_p, 0)) | |
2367 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2368 fixed_p = c != NULL; | |
2369 } | |
2370 } | |
2371 else if (!NILP (w->vchild)) | |
2372 { | |
2373 c = XWINDOW (w->vchild); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2374 |
25268 | 2375 if (width_p) |
2376 { | |
2377 /* A vert. combination is fixed-width if one of if its | |
2378 children is. */ | |
2379 while (c && !window_fixed_size_p (c, width_p, 0)) | |
2380 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2381 fixed_p = c != NULL; | |
2382 } | |
2383 else | |
2384 { | |
2385 /* A vert. combination is fixed-height if all of if its | |
2386 children are. */ | |
2387 while (c && window_fixed_size_p (c, width_p, 0)) | |
2388 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2389 fixed_p = c == NULL; | |
2390 } | |
2391 } | |
2392 else if (BUFFERP (w->buffer)) | |
2393 { | |
25739
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2394 if (w->height_fixed_p && !width_p) |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2395 fixed_p = 1; |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2396 else |
25268 | 2397 { |
25739
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2398 struct buffer *old = current_buffer; |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2399 Lisp_Object val; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2400 |
25739
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2401 current_buffer = XBUFFER (w->buffer); |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2402 val = find_symbol_value (Qwindow_size_fixed); |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2403 current_buffer = old; |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2404 |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2405 fixed_p = 0; |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2406 if (!EQ (val, Qunbound)) |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2407 { |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2408 fixed_p = !NILP (val); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2409 |
25739
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2410 if (fixed_p |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2411 && ((EQ (val, Qheight) && width_p) |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2412 || (EQ (val, Qwidth) && !width_p))) |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2413 fixed_p = 0; |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2414 } |
25268 | 2415 } |
2416 | |
2417 /* Can't tell if this one is resizable without looking at | |
2418 siblings. If all siblings are fixed-size this one is too. */ | |
2419 if (!fixed_p && check_siblings_p && WINDOWP (w->parent)) | |
2420 { | |
2421 Lisp_Object child; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2422 |
25268 | 2423 for (child = w->prev; !NILP (child); child = XWINDOW (child)->prev) |
2424 if (!window_fixed_size_p (XWINDOW (child), width_p, 0)) | |
2425 break; | |
2426 | |
2427 if (NILP (child)) | |
2428 for (child = w->next; !NILP (child); child = XWINDOW (child)->next) | |
2429 if (!window_fixed_size_p (XWINDOW (child), width_p, 0)) | |
2430 break; | |
2431 | |
2432 if (NILP (child)) | |
2433 fixed_p = 1; | |
2434 } | |
2435 } | |
2436 else | |
2437 fixed_p = 1; | |
2438 | |
2439 return fixed_p; | |
2440 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2441 |
25268 | 2442 |
2443 /* Return the minimum size of window W, not taking fixed-width windows | |
2444 into account. WIDTH_P non-zero means return the minimum width, | |
2445 otherwise return the minimum height. If W is a combination window, | |
2446 compute the minimum size from the minimum sizes of W's children. */ | |
2447 | |
2448 static int | |
2449 window_min_size_1 (w, width_p) | |
25254 | 2450 struct window *w; |
2451 int width_p; | |
2452 { | |
25268 | 2453 struct window *c; |
25254 | 2454 int size; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2455 |
25268 | 2456 if (!NILP (w->hchild)) |
2457 { | |
2458 c = XWINDOW (w->hchild); | |
2459 size = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2460 |
25268 | 2461 if (width_p) |
2462 { | |
2463 /* The min width of a horizontal combination is | |
2464 the sum of the min widths of its children. */ | |
2465 while (c) | |
2466 { | |
2467 size += window_min_size_1 (c, width_p); | |
2468 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2469 } | |
2470 } | |
2471 else | |
2472 { | |
2473 /* The min height a horizontal combination equals | |
2474 the maximum of all min height of its children. */ | |
2475 while (c) | |
2476 { | |
2477 int min_size = window_min_size_1 (c, width_p); | |
2478 size = max (min_size, size); | |
2479 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2480 } | |
2481 } | |
2482 } | |
2483 else if (!NILP (w->vchild)) | |
2484 { | |
2485 c = XWINDOW (w->vchild); | |
2486 size = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2487 |
25268 | 2488 if (width_p) |
2489 { | |
2490 /* The min width of a vertical combination is | |
2491 the maximum of the min widths of its children. */ | |
2492 while (c) | |
2493 { | |
2494 int min_size = window_min_size_1 (c, width_p); | |
2495 size = max (min_size, size); | |
2496 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2497 } | |
2498 } | |
2499 else | |
2500 { | |
2501 /* The min height of a vertical combination equals | |
2502 the sum of the min height of its children. */ | |
2503 while (c) | |
2504 { | |
2505 size += window_min_size_1 (c, width_p); | |
2506 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2507 } | |
2508 } | |
2509 } | |
25254 | 2510 else |
2511 { | |
25268 | 2512 if (width_p) |
2513 size = window_min_width; | |
25254 | 2514 else |
25268 | 2515 { |
2516 if (MINI_WINDOW_P (w) | |
2517 || (!WINDOW_WANTS_MODELINE_P (w) | |
25546 | 2518 && !WINDOW_WANTS_HEADER_LINE_P (w))) |
25268 | 2519 size = 1; |
2520 else | |
2521 size = window_min_height; | |
2522 } | |
25254 | 2523 } |
2524 | |
2525 return size; | |
2526 } | |
2527 | |
2528 | |
25268 | 2529 /* Return the minimum size of window W, taking fixed-size windows into |
2530 account. WIDTH_P non-zero means return the minimum width, | |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2531 otherwise return the minimum height. IGNORE_FIXED_P non-zero means |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2532 ignore if W is fixed-size. Set *FIXED to 1 if W is fixed-size |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2533 unless FIXED is null. */ |
25268 | 2534 |
2535 static int | |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2536 window_min_size (w, width_p, ignore_fixed_p, fixed) |
25268 | 2537 struct window *w; |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2538 int width_p, ignore_fixed_p, *fixed; |
25268 | 2539 { |
2540 int size, fixed_p; | |
2541 | |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2542 if (ignore_fixed_p) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2543 fixed_p = 0; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2544 else |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2545 fixed_p = window_fixed_size_p (w, width_p, 1); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2546 |
25268 | 2547 if (fixed) |
2548 *fixed = fixed_p; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2549 |
25268 | 2550 if (fixed_p) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2551 size = width_p ? XFASTINT (w->total_cols) : XFASTINT (w->total_lines); |
25268 | 2552 else |
2553 size = window_min_size_1 (w, width_p); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2554 |
25268 | 2555 return size; |
2556 } | |
2557 | |
2558 | |
51223
c1daf1c22f97
(Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents:
51207
diff
changeset
|
2559 /* Adjust the margins of window W if text area is too small. |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2560 Return 1 if window width is ok after adjustment; 0 if window |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2561 is still too narrow. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2562 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2563 static int |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2564 adjust_window_margins (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2565 struct window *w; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2566 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2567 int box_cols = (WINDOW_TOTAL_COLS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2568 - WINDOW_FRINGE_COLS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2569 - WINDOW_SCROLL_BAR_COLS (w)); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2570 int margin_cols = (WINDOW_LEFT_MARGIN_COLS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2571 + WINDOW_RIGHT_MARGIN_COLS (w)); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2572 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2573 if (box_cols - margin_cols >= MIN_SAFE_WINDOW_WIDTH) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2574 return 1; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2575 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2576 if (margin_cols < 0 || box_cols < MIN_SAFE_WINDOW_WIDTH) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2577 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2578 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2579 /* Window's text area is too narrow, but reducing the window |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2580 margins will fix that. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2581 margin_cols = box_cols - MIN_SAFE_WINDOW_WIDTH; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2582 if (WINDOW_RIGHT_MARGIN_COLS (w) > 0) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2583 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2584 if (WINDOW_LEFT_MARGIN_COLS (w) > 0) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2585 w->left_margin_cols = w->right_margin_cols |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2586 = make_number (margin_cols/2); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2587 else |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2588 w->right_margin_cols = make_number (margin_cols); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2589 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2590 else |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2591 w->left_margin_cols = make_number (margin_cols); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2592 return 1; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2593 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2594 |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2595 /* Calculate new sizes for windows in the list FORWARD when the window size |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2596 goes from TOTAL to SIZE. TOTAL must be greater than SIZE. |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2597 The number of windows in FORWARD is NCHILDREN, and the number that |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2598 can shrink is SHRINKABLE. |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2599 The minimum size a window can have is MIN_SIZE. |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2600 If we are shrinking fixed windows, RESIZE_FIXED_P is non-zero. |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2601 If we are shrinking columns, WIDTH_P is non-zero, otherwise we are |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2602 shrinking rows. |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2603 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2604 This function returns an allocated array of new sizes that the caller |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2605 must free. The size -1 means the window is fixed and RESIZE_FIXED_P |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2606 is zero. Array index 0 refers to the first window in FORWARD, 1 to |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2607 the second, and so on. |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2608 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2609 This function tries to keep windows at least at the minimum size |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2610 and resize other windows before it resizes any window to zero (i.e. |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2611 delete that window). |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2612 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2613 Windows are resized proportional to their size, so bigger windows |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2614 shrink more than smaller windows. */ |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2615 static int * |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2616 shrink_windows (total, size, nchildren, shrinkable, |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2617 min_size, resize_fixed_p, forward, width_p) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2618 int total, size, nchildren, shrinkable, min_size; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2619 int resize_fixed_p, width_p; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2620 Lisp_Object forward; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2621 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2622 int available_resize = 0; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2623 int *new_sizes; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2624 struct window *c; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2625 Lisp_Object child; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2626 int smallest = total; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2627 int total_removed = 0; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2628 int total_shrink = total - size; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2629 int i; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2630 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2631 new_sizes = xmalloc (sizeof (*new_sizes) * nchildren); |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2632 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2633 for (i = 0, child = forward; !NILP (child); child = c->next, ++i) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2634 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2635 int child_size; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2636 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2637 c = XWINDOW (child); |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2638 child_size = width_p ? XINT (c->total_cols) : XINT (c->total_lines); |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2639 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2640 if (! resize_fixed_p && window_fixed_size_p (c, width_p, 0)) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2641 new_sizes[i] = -1; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2642 else |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2643 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2644 new_sizes[i] = child_size; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2645 if (child_size > min_size) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2646 available_resize += child_size - min_size; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2647 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2648 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2649 /* We might need to shrink some windows to zero. Find the smallest |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2650 windows and set them to 0 until we can fulfil the new size. */ |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2651 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2652 while (shrinkable > 1 && size + available_resize < total) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2653 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2654 for (i = 0; i < nchildren; ++i) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2655 if (new_sizes[i] > 0 && smallest > new_sizes[i]) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2656 smallest = new_sizes[i]; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2657 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2658 for (i = 0; i < nchildren; ++i) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2659 if (new_sizes[i] == smallest) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2660 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2661 /* Resize this window down to zero. */ |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2662 new_sizes[i] = 0; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2663 if (smallest > min_size) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2664 available_resize -= smallest - min_size; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2665 available_resize += smallest; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2666 --shrinkable; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2667 total_removed += smallest; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2668 |
58217
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2669 /* We don't know what the smallest is now. */ |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2670 smallest = total; |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2671 |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2672 /* Out of for, just remove one window at the time and |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2673 check again if we have enough space. */ |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2674 break; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2675 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2676 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2677 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2678 /* Now, calculate the new sizes. Try to shrink each window |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2679 proportional to its size. */ |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2680 for (i = 0; i < nchildren; ++i) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2681 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2682 if (new_sizes[i] > min_size) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2683 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2684 int to_shrink = total_shrink*new_sizes[i]/total; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2685 if (new_sizes[i] - to_shrink < min_size) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2686 to_shrink = new_sizes[i] - min_size; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2687 new_sizes[i] -= to_shrink; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2688 total_removed += to_shrink; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2689 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2690 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2691 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2692 /* Any reminder due to rounding, we just subtract from windows |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2693 that are left and still can be shrunk. */ |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2694 while (total_shrink > total_removed) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2695 { |
58217
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2696 int nonzero_sizes = 0; |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2697 int nonzero_idx = -1; |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2698 |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2699 for (i = 0; i < nchildren; ++i) |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2700 if (new_sizes[i] > 0) |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2701 { |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2702 ++nonzero_sizes; |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2703 nonzero_idx = i; |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2704 } |
58441
9b7ff064cb26
(set_window_buffer): Clear display_error_modiff.
Kim F. Storm <storm@cua.dk>
parents:
58265
diff
changeset
|
2705 |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2706 for (i = 0; i < nchildren; ++i) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2707 if (new_sizes[i] > min_size) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2708 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2709 --new_sizes[i]; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2710 ++total_removed; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2711 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2712 /* Out of for, just shrink one window at the time and |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2713 check again if we have enough space. */ |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2714 break; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2715 } |
58217
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2716 |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2717 |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2718 /* Special case, only one window left. */ |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2719 if (nonzero_sizes == 1) |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2720 break; |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2721 } |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2722 |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2723 /* Any surplus due to rounding, we add to windows that are left. */ |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2724 while (total_shrink < total_removed) |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2725 { |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2726 for (i = 0; i < nchildren; ++i) |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2727 { |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2728 if (new_sizes[i] != 0 && total_shrink < total_removed) |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2729 { |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2730 ++new_sizes[i]; |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2731 --total_removed; |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2732 break; |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2733 } |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2734 } |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2735 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2736 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2737 return new_sizes; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2738 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2739 |
25268 | 2740 /* Set WINDOW's height or width to SIZE. WIDTH_P non-zero means set |
2741 WINDOW's width. Resize WINDOW's children, if any, so that they | |
2742 keep their proportionate size relative to WINDOW. Propagate | |
2743 WINDOW's top or left edge position to children. Delete windows | |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2744 that become too small unless NODELETE_P is non-zero. |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2745 |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2746 If NODELETE_P is 2, that means we do delete windows that are |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2747 too small, even if they were too small before! */ |
25268 | 2748 |
2749 static void | |
2750 size_window (window, size, width_p, nodelete_p) | |
2751 Lisp_Object window; | |
2752 int size, width_p, nodelete_p; | |
2753 { | |
2754 struct window *w = XWINDOW (window); | |
2755 struct window *c; | |
2756 Lisp_Object child, *forward, *sideward; | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2757 int old_size, min_size, safe_min_size; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2758 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2759 /* We test nodelete_p != 2 and nodelete_p != 1 below, so it |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2760 seems like it's too soon to do this here. ++KFS. */ |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2761 if (nodelete_p == 2) |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2762 nodelete_p = 0; |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2763 |
25268 | 2764 check_min_window_sizes (); |
32824
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
2765 size = max (0, size); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2766 |
25268 | 2767 /* If the window has been "too small" at one point, |
2768 don't delete it for being "too small" in the future. | |
2769 Preserve it as long as that is at all possible. */ | |
2770 if (width_p) | |
2771 { | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2772 old_size = WINDOW_TOTAL_COLS (w); |
25268 | 2773 min_size = window_min_width; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2774 /* Ensure that there is room for the scroll bar and fringes! |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2775 We may reduce display margins though. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2776 safe_min_size = (MIN_SAFE_WINDOW_WIDTH |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2777 + WINDOW_FRINGE_COLS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2778 + WINDOW_SCROLL_BAR_COLS (w)); |
25268 | 2779 } |
2780 else | |
2781 { | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2782 old_size = XINT (w->total_lines); |
25268 | 2783 min_size = window_min_height; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2784 safe_min_size = MIN_SAFE_WINDOW_HEIGHT; |
25268 | 2785 } |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2786 |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2787 if (old_size < min_size && nodelete_p != 2) |
25268 | 2788 w->too_small_ok = Qt; |
2789 | |
2790 /* Maybe delete WINDOW if it's too small. */ | |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2791 if (nodelete_p != 1 && !NILP (w->parent)) |
25268 | 2792 { |
2793 if (!MINI_WINDOW_P (w) && !NILP (w->too_small_ok)) | |
2794 min_size = width_p ? MIN_SAFE_WINDOW_WIDTH : MIN_SAFE_WINDOW_HEIGHT; | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2795 if (min_size < safe_min_size) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2796 min_size = safe_min_size; |
25268 | 2797 if (size < min_size) |
2798 { | |
2799 delete_window (window); | |
2800 return; | |
2801 } | |
2802 } | |
2803 | |
2804 /* Set redisplay hints. */ | |
32824
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
2805 w->last_modified = make_number (0); |
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
2806 w->last_overlay_modified = make_number (0); |
25268 | 2807 windows_or_buffers_changed++; |
32824
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
2808 FRAME_WINDOW_SIZES_CHANGED (XFRAME (w->frame)) = 1; |
25268 | 2809 |
2810 if (width_p) | |
2811 { | |
2812 sideward = &w->vchild; | |
2813 forward = &w->hchild; | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2814 w->total_cols = make_number (size); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2815 adjust_window_margins (w); |
25268 | 2816 } |
2817 else | |
2818 { | |
2819 sideward = &w->hchild; | |
2820 forward = &w->vchild; | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2821 w->total_lines = make_number (size); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2822 w->orig_total_lines = Qnil; |
25268 | 2823 } |
2824 | |
2825 if (!NILP (*sideward)) | |
2826 { | |
2827 for (child = *sideward; !NILP (child); child = c->next) | |
2828 { | |
2829 c = XWINDOW (child); | |
2830 if (width_p) | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2831 c->left_col = w->left_col; |
25268 | 2832 else |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2833 c->top_line = w->top_line; |
25268 | 2834 size_window (child, size, width_p, nodelete_p); |
2835 } | |
2836 } | |
2837 else if (!NILP (*forward)) | |
2838 { | |
2839 int fixed_size, each, extra, n; | |
2840 int resize_fixed_p, nfixed; | |
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
2841 int last_pos, first_pos, nchildren, total; |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2842 int *new_sizes = NULL; |
25268 | 2843 |
2844 /* Determine the fixed-size portion of the this window, and the | |
2845 number of child windows. */ | |
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
2846 fixed_size = nchildren = nfixed = total = 0; |
25268 | 2847 for (child = *forward; !NILP (child); child = c->next, ++nchildren) |
2848 { | |
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
2849 int child_size; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2850 |
25268 | 2851 c = XWINDOW (child); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2852 child_size = width_p ? XINT (c->total_cols) : XINT (c->total_lines); |
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
2853 total += child_size; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2854 |
25268 | 2855 if (window_fixed_size_p (c, width_p, 0)) |
2856 { | |
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
2857 fixed_size += child_size; |
25268 | 2858 ++nfixed; |
2859 } | |
2860 } | |
2861 | |
2862 /* If the new size is smaller than fixed_size, or if there | |
2863 aren't any resizable windows, allow resizing fixed-size | |
2864 windows. */ | |
2865 resize_fixed_p = nfixed == nchildren || size < fixed_size; | |
2866 | |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2867 /* Compute how many lines/columns to add/remove to each child. The |
25268 | 2868 value of extra takes care of rounding errors. */ |
2869 n = resize_fixed_p ? nchildren : nchildren - nfixed; | |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2870 if (size < total && n > 1) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2871 new_sizes = shrink_windows (total, size, nchildren, n, min_size, |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2872 resize_fixed_p, *forward, width_p); |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2873 else |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2874 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2875 each = (size - total) / n; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2876 extra = (size - total) - n * each; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2877 } |
25268 | 2878 |
2879 /* Compute new children heights and edge positions. */ | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2880 first_pos = width_p ? XINT (w->left_col) : XINT (w->top_line); |
25268 | 2881 last_pos = first_pos; |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2882 for (n = 0, child = *forward; !NILP (child); child = c->next, ++n) |
25268 | 2883 { |
2884 int new_size, old_size; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2885 |
25268 | 2886 c = XWINDOW (child); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2887 old_size = width_p ? XFASTINT (c->total_cols) : XFASTINT (c->total_lines); |
25268 | 2888 new_size = old_size; |
2889 | |
2890 /* The top or left edge position of this child equals the | |
2891 bottom or right edge of its predecessor. */ | |
2892 if (width_p) | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2893 c->left_col = make_number (last_pos); |
25268 | 2894 else |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2895 c->top_line = make_number (last_pos); |
25268 | 2896 |
2897 /* If this child can be resized, do it. */ | |
2898 if (resize_fixed_p || !window_fixed_size_p (c, width_p, 0)) | |
2899 { | |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2900 new_size = new_sizes ? new_sizes[n] : old_size + each + extra; |
25268 | 2901 extra = 0; |
2902 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2903 |
25268 | 2904 /* Set new height. Note that size_window also propagates |
2905 edge positions to children, so it's not a no-op if we | |
2906 didn't change the child's size. */ | |
2907 size_window (child, new_size, width_p, 1); | |
2908 | |
2909 /* Remember the bottom/right edge position of this child; it | |
2910 will be used to set the top/left edge of the next child. */ | |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2911 last_pos += new_size; |
25268 | 2912 } |
2913 | |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2914 if (new_sizes) xfree (new_sizes); |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2915 |
25268 | 2916 /* We should have covered the parent exactly with child windows. */ |
2917 xassert (size == last_pos - first_pos); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2918 |
25268 | 2919 /* Now delete any children that became too small. */ |
2920 if (!nodelete_p) | |
2921 for (child = *forward; !NILP (child); child = c->next) | |
2922 { | |
2923 int child_size; | |
2924 c = XWINDOW (child); | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2925 child_size = width_p ? XINT (c->total_cols) : XINT (c->total_lines); |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2926 size_window (child, child_size, width_p, 2); |
25268 | 2927 } |
2928 } | |
2929 } | |
2930 | |
2931 /* Set WINDOW's height to HEIGHT, and recursively change the height of | |
2932 WINDOW's children. NODELETE non-zero means don't delete windows | |
2933 that become too small in the process. (The caller should check | |
2934 later and do so if appropriate.) */ | |
265 | 2935 |
20351 | 2936 void |
265 | 2937 set_window_height (window, height, nodelete) |
2938 Lisp_Object window; | |
2939 int height; | |
2940 int nodelete; | |
2941 { | |
25268 | 2942 size_window (window, height, 0, nodelete); |
265 | 2943 } |
2944 | |
25268 | 2945 |
2946 /* Set WINDOW's width to WIDTH, and recursively change the width of | |
2947 WINDOW's children. NODELETE non-zero means don't delete windows | |
2948 that become too small in the process. (The caller should check | |
2949 later and do so if appropriate.) */ | |
265 | 2950 |
20351 | 2951 void |
265 | 2952 set_window_width (window, width, nodelete) |
2953 Lisp_Object window; | |
2954 int width; | |
2955 int nodelete; | |
2956 { | |
25268 | 2957 size_window (window, width, 1, nodelete); |
265 | 2958 } |
25268 | 2959 |
50367
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2960 /* Change window heights in windows rooted in WINDOW by N lines. */ |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2961 |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2962 void |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2963 change_window_heights (window, n) |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2964 Lisp_Object window; |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2965 int n; |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2966 { |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2967 struct window *w = XWINDOW (window); |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2968 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2969 XSETFASTINT (w->top_line, XFASTINT (w->top_line) + n); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2970 XSETFASTINT (w->total_lines, XFASTINT (w->total_lines) - n); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2971 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2972 if (INTEGERP (w->orig_top_line)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2973 XSETFASTINT (w->orig_top_line, XFASTINT (w->orig_top_line) + n); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2974 if (INTEGERP (w->orig_total_lines)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2975 XSETFASTINT (w->orig_total_lines, XFASTINT (w->orig_total_lines) - n); |
50367
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2976 |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2977 /* Handle just the top child in a vertical split. */ |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2978 if (!NILP (w->vchild)) |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2979 change_window_heights (w->vchild, n); |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2980 |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2981 /* Adjust all children in a horizontal split. */ |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2982 for (window = w->hchild; !NILP (window); window = w->next) |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2983 { |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2984 w = XWINDOW (window); |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2985 change_window_heights (window, n); |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2986 } |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2987 } |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2988 |
265 | 2989 |
362 | 2990 int window_select_count; |
265 | 2991 |
14445
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
2992 Lisp_Object |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
2993 Fset_window_buffer_unwind (obuf) |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
2994 Lisp_Object obuf; |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
2995 { |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
2996 Fset_buffer (obuf); |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
2997 return Qnil; |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
2998 } |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
2999 |
51240
1fe905dd5836
(Fset_window_buffer): Add type of `keep_margins' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51223
diff
changeset
|
3000 EXFUN (Fset_window_fringes, 4); |
1fe905dd5836
(Fset_window_buffer): Add type of `keep_margins' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51223
diff
changeset
|
3001 EXFUN (Fset_window_scroll_bars, 4); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3002 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3003 /* Make WINDOW display BUFFER as its contents. RUN_HOOKS_P non-zero |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3004 means it's allowed to run hooks. See make_frame for a case where |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3005 it's not allowed. KEEP_MARGINS_P non-zero means that the current |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3006 margins, fringes, and scroll-bar settings of the window are not |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3007 reset from the buffer's local settings. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3008 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3009 void |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3010 set_window_buffer (window, buffer, run_hooks_p, keep_margins_p) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3011 Lisp_Object window, buffer; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3012 int run_hooks_p, keep_margins_p; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3013 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3014 struct window *w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3015 struct buffer *b = XBUFFER (buffer); |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
3016 int count = SPECPDL_INDEX (); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3017 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3018 w->buffer = buffer; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3019 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3020 if (EQ (window, selected_window)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3021 b->last_selected_window = window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3022 |
58441
9b7ff064cb26
(set_window_buffer): Clear display_error_modiff.
Kim F. Storm <storm@cua.dk>
parents:
58265
diff
changeset
|
3023 /* Let redisplay errors through. */ |
9b7ff064cb26
(set_window_buffer): Clear display_error_modiff.
Kim F. Storm <storm@cua.dk>
parents:
58265
diff
changeset
|
3024 b->display_error_modiff = 0; |
9b7ff064cb26
(set_window_buffer): Clear display_error_modiff.
Kim F. Storm <storm@cua.dk>
parents:
58265
diff
changeset
|
3025 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3026 /* Update time stamps of buffer display. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3027 if (INTEGERP (b->display_count)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3028 XSETINT (b->display_count, XINT (b->display_count) + 1); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3029 b->display_time = Fcurrent_time (); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3030 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3031 XSETFASTINT (w->window_end_pos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3032 XSETFASTINT (w->window_end_vpos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3033 bzero (&w->last_cursor, sizeof w->last_cursor); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3034 w->window_end_valid = Qnil; |
36133
6eb00bee0989
(set_window_buffer): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36131
diff
changeset
|
3035 w->hscroll = w->min_hscroll = make_number (0); |
36444
f2fc8b180aaa
* window.c (set_window_buffer): Field vscroll is an int, not a lisp object.
Ken Raeburn <raeburn@raeburn.org>
parents:
36432
diff
changeset
|
3036 w->vscroll = 0; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3037 set_marker_both (w->pointm, buffer, BUF_PT (b), BUF_PT_BYTE (b)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3038 set_marker_restricted (w->start, |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3039 make_number (b->last_window_start), |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3040 buffer); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3041 w->start_at_line_beg = Qnil; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3042 w->force_start = Qnil; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3043 XSETFASTINT (w->last_modified, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3044 XSETFASTINT (w->last_overlay_modified, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3045 windows_or_buffers_changed++; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3046 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3047 /* We must select BUFFER for running the window-scroll-functions. |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3048 If WINDOW is selected, switch permanently. |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3049 Otherwise, switch but go back to the ambient buffer afterward. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3050 if (EQ (window, selected_window)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3051 Fset_buffer (buffer); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3052 /* We can't check ! NILP (Vwindow_scroll_functions) here |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3053 because that might itself be a local variable. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3054 else if (window_initialized) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3055 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3056 record_unwind_protect (Fset_window_buffer_unwind, Fcurrent_buffer ()); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3057 Fset_buffer (buffer); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3058 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3059 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3060 if (!keep_margins_p) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3061 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3062 /* Set left and right marginal area width etc. from buffer. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3063 |
51223
c1daf1c22f97
(Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents:
51207
diff
changeset
|
3064 /* This may call adjust_window_margins three times, so |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3065 temporarily disable window margins. */ |
52617
f8adaf14f570
(set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents:
52565
diff
changeset
|
3066 Lisp_Object save_left = w->left_margin_cols; |
f8adaf14f570
(set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents:
52565
diff
changeset
|
3067 Lisp_Object save_right = w->right_margin_cols; |
f8adaf14f570
(set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents:
52565
diff
changeset
|
3068 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3069 w->left_margin_cols = w->right_margin_cols = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3070 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3071 Fset_window_fringes (window, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3072 b->left_fringe_width, b->right_fringe_width, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3073 b->fringes_outside_margins); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3074 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3075 Fset_window_scroll_bars (window, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3076 b->scroll_bar_width, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3077 b->vertical_scroll_bar_type, Qnil); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3078 |
52617
f8adaf14f570
(set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents:
52565
diff
changeset
|
3079 w->left_margin_cols = save_left; |
f8adaf14f570
(set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents:
52565
diff
changeset
|
3080 w->right_margin_cols = save_right; |
f8adaf14f570
(set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents:
52565
diff
changeset
|
3081 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3082 Fset_window_margins (window, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3083 b->left_margin_cols, b->right_margin_cols); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3084 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3085 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3086 if (run_hooks_p) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3087 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3088 if (! NILP (Vwindow_scroll_functions)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3089 run_hook_with_args_2 (Qwindow_scroll_functions, window, |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3090 Fmarker_position (w->start)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3091 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3092 if (! NILP (Vwindow_configuration_change_hook) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3093 && ! NILP (Vrun_hooks)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3094 call1 (Vrun_hooks, Qwindow_configuration_change_hook); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3095 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3096 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3097 unbind_to (count, Qnil); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3098 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3099 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3100 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3101 DEFUN ("set-window-buffer", Fset_window_buffer, Sset_window_buffer, 2, 3, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3102 doc: /* Make WINDOW display BUFFER as its contents. |
56393
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
3103 BUFFER can be a buffer or the name of an existing buffer. |
55402
5896445199fd
(Fset_window_buffer): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55027
diff
changeset
|
3104 Optional third arg KEEP-MARGINS non-nil means that WINDOW's current |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3105 display margins, fringe widths, and scroll bar settings are maintained; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3106 the default is to reset these from BUFFER's local settings or the frame |
57031
0730ef55b4d8
(Fset_window_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56616
diff
changeset
|
3107 defaults. |
0730ef55b4d8
(Fset_window_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56616
diff
changeset
|
3108 |
0730ef55b4d8
(Fset_window_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56616
diff
changeset
|
3109 This function runs the hook `window-scroll-functions'. */) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3110 (window, buffer, keep_margins) |
51240
1fe905dd5836
(Fset_window_buffer): Add type of `keep_margins' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51223
diff
changeset
|
3111 register Lisp_Object window, buffer, keep_margins; |
265 | 3112 { |
3113 register Lisp_Object tem; | |
3114 register struct window *w = decode_window (window); | |
3115 | |
27848
27b993d2ea05
(Fset_window_buffer): Set WINDOW to the window
Gerd Moellmann <gerd@gnu.org>
parents:
27699
diff
changeset
|
3116 XSETWINDOW (window, w); |
265 | 3117 buffer = Fget_buffer (buffer); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3118 CHECK_BUFFER (buffer); |
265 | 3119 |
485 | 3120 if (NILP (XBUFFER (buffer)->name)) |
265 | 3121 error ("Attempt to display deleted buffer"); |
3122 | |
3123 tem = w->buffer; | |
485 | 3124 if (NILP (tem)) |
265 | 3125 error ("Window is deleted"); |
3126 else if (! EQ (tem, Qt)) /* w->buffer is t when the window | |
3127 is first being set up. */ | |
3128 { | |
485 | 3129 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
|
3130 error ("Window is dedicated to `%s'", |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3131 SDATA (XBUFFER (tem)->name)); |
265 | 3132 |
3133 unshow_buffer (w); | |
3134 } | |
3135 | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3136 set_window_buffer (window, buffer, 1, !NILP (keep_margins)); |
265 | 3137 return Qnil; |
3138 } | |
3139 | |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3140 /* Note that selected_window can be nil |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3141 when this is called from Fset_window_configuration. */ |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3142 |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3143 DEFUN ("select-window", Fselect_window, Sselect_window, 1, 2, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3144 doc: /* Select WINDOW. Most editing will apply to WINDOW's buffer. |
56089
36a475d543b8
(Fselect_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
55563
diff
changeset
|
3145 If WINDOW is not already selected, make WINDOW's buffer current |
56393
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
3146 and make WINDOW the frame's selected window. Return WINDOW. |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3147 Optional second arg NORECORD non-nil means |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3148 do not put this buffer at the front of the list of recently selected ones. |
47567
1075de6f6ebd
(select_window_1): Don't select frame.
Richard M. Stallman <rms@gnu.org>
parents:
47234
diff
changeset
|
3149 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3150 Note that the main editor command loop |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3151 selects the buffer of the selected window before each command. */) |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3152 (window, norecord) |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3153 register Lisp_Object window, norecord; |
22187
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
3154 { |
265 | 3155 register struct window *w; |
27869
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3156 register struct window *ow; |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3157 struct frame *sf; |
265 | 3158 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3159 CHECK_LIVE_WINDOW (window); |
265 | 3160 |
3161 w = XWINDOW (window); | |
39953
3a1666ed16b8
(select_window_1): Unfreeze window start. Remove a
Gerd Moellmann <gerd@gnu.org>
parents:
39952
diff
changeset
|
3162 w->frozen_window_start_p = 0; |
265 | 3163 |
58265
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
3164 ++window_select_count; |
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
3165 XSETFASTINT (w->use_time, window_select_count); |
265 | 3166 if (EQ (window, selected_window)) |
3167 return window; | |
3168 | |
61444 | 3169 /* Store the current buffer's actual point into the |
3170 old selected window. It belongs to that window, | |
3171 and when the window is not selected, must be in the window. */ | |
27869
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3172 if (!NILP (selected_window)) |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3173 { |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3174 ow = XWINDOW (selected_window); |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3175 if (! NILP (ow->buffer)) |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3176 set_marker_both (ow->pointm, ow->buffer, |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3177 BUF_PT (XBUFFER (ow->buffer)), |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3178 BUF_PT_BYTE (XBUFFER (ow->buffer))); |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3179 } |
265 | 3180 |
3181 selected_window = window; | |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3182 sf = SELECTED_FRAME (); |
48927
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
3183 if (XFRAME (WINDOW_FRAME (w)) != sf) |
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
3184 { |
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
3185 XFRAME (WINDOW_FRAME (w))->selected_window = window; |
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
3186 /* Use this rather than Fhandle_switch_frame |
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
3187 so that FRAME_FOCUS_FRAME is moved appropriately as we |
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
3188 move around in the state where a minibuffer in a separate |
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
3189 frame is active. */ |
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
3190 Fselect_frame (WINDOW_FRAME (w), Qnil); |
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
3191 } |
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
3192 else |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3193 sf->selected_window = window; |
265 | 3194 |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3195 if (NILP (norecord)) |
22187
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
3196 record_buffer (w->buffer); |
265 | 3197 Fset_buffer (w->buffer); |
3198 | |
16068
b19129a8c644
(unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
3199 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
|
3200 |
265 | 3201 /* Go to the point recorded in the window. |
3202 This is important when the buffer is in more | |
3203 than one window. It also matters when | |
3204 redisplay_window has altered point after scrolling, | |
3205 because it makes the change only in the window. */ | |
3206 { | |
3207 register int new_point = marker_position (w->pointm); | |
3208 if (new_point < BEGV) | |
3209 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
|
3210 else if (new_point > ZV) |
265 | 3211 SET_PT (ZV); |
3212 else | |
3213 SET_PT (new_point); | |
3214 } | |
3215 | |
3216 windows_or_buffers_changed++; | |
3217 return window; | |
3218 } | |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3219 |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3220 static Lisp_Object |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3221 select_window_norecord (window) |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3222 Lisp_Object window; |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3223 { |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3224 return Fselect_window (window, Qt); |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3225 } |
22187
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
3226 |
14175
ace33b55f549
(display_buffer_1): Don't deiconify the selected frame.
Richard M. Stallman <rms@gnu.org>
parents:
14166
diff
changeset
|
3227 /* 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
|
3228 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
|
3229 then return WINDOW. |
ace33b55f549
(display_buffer_1): Don't deiconify the selected frame.
Richard M. Stallman <rms@gnu.org>
parents:
14166
diff
changeset
|
3230 |
ace33b55f549
(display_buffer_1): Don't deiconify the selected frame.
Richard M. Stallman <rms@gnu.org>
parents:
14166
diff
changeset
|
3231 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
|
3232 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
|
3233 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
|
3234 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
|
3235 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
|
3236 |
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3237 static Lisp_Object |
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3238 display_buffer_1 (window) |
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3239 Lisp_Object window; |
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3240 { |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3241 Lisp_Object frame = XWINDOW (window)->frame; |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3242 FRAME_PTR f = XFRAME (frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3243 |
13619
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3244 FRAME_SAMPLE_VISIBILITY (f); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3245 |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3246 if (EQ (frame, selected_frame)) |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3247 ; /* Assume the selected frame is already visible enough. */ |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3248 else if (minibuf_level > 0 |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3249 && MINI_WINDOW_P (XWINDOW (selected_window)) |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3250 && WINDOW_LIVE_P (minibuf_selected_window) |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3251 && EQ (frame, WINDOW_FRAME (XWINDOW (minibuf_selected_window)))) |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3252 ; /* Assume the frame from which we invoked the minibuffer is visible. */ |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3253 else |
14535
8ca7e641c144
(display_buffer_1): Raise the frame if already visible.
Richard M. Stallman <rms@gnu.org>
parents:
14445
diff
changeset
|
3254 { |
8ca7e641c144
(display_buffer_1): Raise the frame if already visible.
Richard M. Stallman <rms@gnu.org>
parents:
14445
diff
changeset
|
3255 if (FRAME_ICONIFIED_P (f)) |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3256 Fmake_frame_visible (frame); |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
3257 else if (FRAME_VISIBLE_P (f)) |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3258 Fraise_frame (frame); |
14535
8ca7e641c144
(display_buffer_1): Raise the frame if already visible.
Richard M. Stallman <rms@gnu.org>
parents:
14445
diff
changeset
|
3259 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3260 |
13619
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3261 return window; |
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3262 } |
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3263 |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3264 DEFUN ("special-display-p", Fspecial_display_p, Sspecial_display_p, 1, 1, 0, |
57508
22f6e207e697
(Fspecial_display_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57309
diff
changeset
|
3265 doc: /* Returns non-nil if a buffer named BUFFER-NAME gets a special frame. |
61871
dd7b3da13b8f
(Fsame_window_p, Fspecial_display_p): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
61755
diff
changeset
|
3266 If the value is t, `display-buffer' or `pop-to-buffer' would create a |
dd7b3da13b8f
(Fsame_window_p, Fspecial_display_p): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
61755
diff
changeset
|
3267 special frame for that buffer using the default frame parameters. |
dd7b3da13b8f
(Fsame_window_p, Fspecial_display_p): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
61755
diff
changeset
|
3268 |
dd7b3da13b8f
(Fsame_window_p, Fspecial_display_p): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
61755
diff
changeset
|
3269 If the value is a list, it is a list of frame parameters that would be used |
57508
22f6e207e697
(Fspecial_display_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57309
diff
changeset
|
3270 to make a frame for that buffer. |
22f6e207e697
(Fspecial_display_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57309
diff
changeset
|
3271 The variables `special-display-buffer-names' |
22f6e207e697
(Fspecial_display_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57309
diff
changeset
|
3272 and `special-display-regexps' control this. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3273 (buffer_name) |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3274 Lisp_Object buffer_name; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3275 { |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3276 Lisp_Object tem; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3277 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3278 CHECK_STRING (buffer_name); |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3279 |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3280 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
|
3281 if (!NILP (tem)) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3282 return Qt; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3283 |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3284 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
|
3285 if (!NILP (tem)) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3286 return XCDR (tem); |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3287 |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3288 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
|
3289 { |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3290 Lisp_Object car = XCAR (tem); |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3291 if (STRINGP (car) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3292 && 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
|
3293 return Qt; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3294 else if (CONSP (car) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3295 && STRINGP (XCAR (car)) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3296 && fast_string_match (XCAR (car), buffer_name) >= 0) |
20653
19ba67f153d5
(Fspecial_display_p): Return the right value
Richard M. Stallman <rms@gnu.org>
parents:
20627
diff
changeset
|
3297 return XCDR (car); |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3298 } |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3299 return Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3300 } |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3301 |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3302 DEFUN ("same-window-p", Fsame_window_p, Ssame_window_p, 1, 1, 0, |
61871
dd7b3da13b8f
(Fsame_window_p, Fspecial_display_p): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
61755
diff
changeset
|
3303 doc: /* Returns non-nil if a buffer named BUFFER-NAME would use the same window. |
dd7b3da13b8f
(Fsame_window_p, Fspecial_display_p): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
61755
diff
changeset
|
3304 More precisely, if `display-buffer' or `pop-to-buffer' would display |
dd7b3da13b8f
(Fsame_window_p, Fspecial_display_p): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
61755
diff
changeset
|
3305 that buffer in the selected window rather than (as usual) in some other window. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3306 See `same-window-buffer-names' and `same-window-regexps'. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3307 (buffer_name) |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3308 Lisp_Object buffer_name; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3309 { |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3310 Lisp_Object tem; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3311 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3312 CHECK_STRING (buffer_name); |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3313 |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3314 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
|
3315 if (!NILP (tem)) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3316 return Qt; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3317 |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3318 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
|
3319 if (!NILP (tem)) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3320 return Qt; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3321 |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3322 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
|
3323 { |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3324 Lisp_Object car = XCAR (tem); |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3325 if (STRINGP (car) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3326 && 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
|
3327 return Qt; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3328 else if (CONSP (car) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3329 && STRINGP (XCAR (car)) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3330 && 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
|
3331 return Qt; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3332 } |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3333 return Qnil; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3334 } |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3335 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3336 /* Use B so the default is (other-buffer). */ |
20867
fccf74829150
(Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
20777
diff
changeset
|
3337 DEFUN ("display-buffer", Fdisplay_buffer, Sdisplay_buffer, 1, 3, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3338 "BDisplay buffer: \nP", |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3339 doc: /* Make BUFFER appear in some window but don't select it. |
56393
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
3340 BUFFER must be the name of an existing buffer, or, when called from Lisp, |
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
3341 a buffer. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3342 If BUFFER is shown already in some window, just use that one, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3343 unless the window is the selected window and the optional second |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3344 argument NOT-THIS-WINDOW is non-nil (interactively, with prefix arg). |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3345 If `pop-up-frames' is non-nil, make a new frame if no window shows BUFFER. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3346 Returns the window displaying BUFFER. |
44155
d94cb7b3b165
(Fdisplay_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43713
diff
changeset
|
3347 If `display-buffer-reuse-frames' is non-nil, and another frame is currently |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3348 displaying BUFFER, then simply raise that frame. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3349 |
54267
bd5ef1fde279
(Fdisplay_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
54229
diff
changeset
|
3350 The variables `special-display-buffer-names', |
bd5ef1fde279
(Fdisplay_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
54229
diff
changeset
|
3351 `special-display-regexps', `same-window-buffer-names', and |
bd5ef1fde279
(Fdisplay_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
54229
diff
changeset
|
3352 `same-window-regexps' customize how certain buffer names are handled. |
bd5ef1fde279
(Fdisplay_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
54229
diff
changeset
|
3353 The latter two take effect only if NOT-THIS-WINDOW is t. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3354 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3355 If optional argument FRAME is `visible', search all visible frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3356 If FRAME is 0, search all visible and iconified frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3357 If FRAME is t, search all frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3358 If FRAME is a frame, search only that frame. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3359 If FRAME is nil, search only the selected frame |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3360 (actually the last nonminibuffer frame), |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3361 unless `pop-up-frames' or `display-buffer-reuse-frames' is non-nil, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3362 which means search visible and iconified frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3363 |
55563
a58f6db8bf3d
(Fdisplay_buffer, Fsplit_window, split-height-threshold): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
55402
diff
changeset
|
3364 If a full-width window on a splittable frame is available to display |
a58f6db8bf3d
(Fdisplay_buffer, Fsplit_window, split-height-threshold): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
55402
diff
changeset
|
3365 the buffer, it may be split, subject to the value of the variable |
a58f6db8bf3d
(Fdisplay_buffer, Fsplit_window, split-height-threshold): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
55402
diff
changeset
|
3366 `split-height-threshold'. |
a58f6db8bf3d
(Fdisplay_buffer, Fsplit_window, split-height-threshold): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
55402
diff
changeset
|
3367 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3368 If `even-window-heights' is non-nil, window heights will be evened out |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3369 if displaying the buffer causes two vertically adjacent windows to be |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3370 displayed. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3371 (buffer, not_this_window, frame) |
20867
fccf74829150
(Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
20777
diff
changeset
|
3372 register Lisp_Object buffer, not_this_window, frame; |
265 | 3373 { |
25182
ef79ee0ceedd
(display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents:
25115
diff
changeset
|
3374 register Lisp_Object window, tem, swp; |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3375 struct frame *f; |
25182
ef79ee0ceedd
(display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents:
25115
diff
changeset
|
3376 |
ef79ee0ceedd
(display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents:
25115
diff
changeset
|
3377 swp = Qnil; |
265 | 3378 buffer = Fget_buffer (buffer); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3379 CHECK_BUFFER (buffer); |
265 | 3380 |
485 | 3381 if (!NILP (Vdisplay_buffer_function)) |
265 | 3382 return call2 (Vdisplay_buffer_function, buffer, not_this_window); |
3383 | |
485 | 3384 if (NILP (not_this_window) |
265 | 3385 && 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
|
3386 return display_buffer_1 (selected_window); |
265 | 3387 |
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
3388 /* 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
|
3389 in the selected window. */ |
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
3390 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
|
3391 { |
25182
ef79ee0ceedd
(display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents:
25115
diff
changeset
|
3392 swp = Fsame_window_p (XBUFFER (buffer)->name); |
ef79ee0ceedd
(display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents:
25115
diff
changeset
|
3393 if (!NILP (swp) && !no_switch_window (selected_window)) |
11003
71304a70d0f6
(Fdisplay_buffer): Fix prev change--return selected window.
Richard M. Stallman <rms@gnu.org>
parents:
10958
diff
changeset
|
3394 { |
71304a70d0f6
(Fdisplay_buffer): Fix prev change--return selected window.
Richard M. Stallman <rms@gnu.org>
parents:
10958
diff
changeset
|
3395 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
|
3396 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
|
3397 } |
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
3398 } |
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
3399 |
44155
d94cb7b3b165
(Fdisplay_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43713
diff
changeset
|
3400 /* If the user wants pop-up-frames or display-buffer-reuse-frames, |
11427
c4ee56df7173
(Fdisplay_buffer): Search the proper frame when the
Karl Heuer <kwzh@gnu.org>
parents:
11405
diff
changeset
|
3401 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
|
3402 Otherwise search only the current frame. */ |
20867
fccf74829150
(Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
20777
diff
changeset
|
3403 if (! NILP (frame)) |
fccf74829150
(Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
20777
diff
changeset
|
3404 tem = frame; |
30560
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
3405 else if (pop_up_frames |
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
3406 || display_buffer_reuse_frames |
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
3407 || last_nonminibuf_frame == 0) |
11427
c4ee56df7173
(Fdisplay_buffer): Search the proper frame when the
Karl Heuer <kwzh@gnu.org>
parents:
11405
diff
changeset
|
3408 XSETFASTINT (tem, 0); |
c4ee56df7173
(Fdisplay_buffer): Search the proper frame when the
Karl Heuer <kwzh@gnu.org>
parents:
11405
diff
changeset
|
3409 else |
c4ee56df7173
(Fdisplay_buffer): Search the proper frame when the
Karl Heuer <kwzh@gnu.org>
parents:
11405
diff
changeset
|
3410 XSETFRAME (tem, last_nonminibuf_frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3411 |
11427
c4ee56df7173
(Fdisplay_buffer): Search the proper frame when the
Karl Heuer <kwzh@gnu.org>
parents:
11405
diff
changeset
|
3412 window = Fget_buffer_window (buffer, tem); |
485 | 3413 if (!NILP (window) |
3414 && (NILP (not_this_window) || !EQ (window, selected_window))) | |
30560
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
3415 return display_buffer_1 (window); |
265 | 3416 |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3417 /* Certain buffer names get special handling. */ |
25182
ef79ee0ceedd
(display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents:
25115
diff
changeset
|
3418 if (!NILP (Vspecial_display_function) && NILP (swp)) |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3419 { |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3420 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
|
3421 if (EQ (tem, Qt)) |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3422 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
|
3423 if (CONSP (tem)) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3424 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
|
3425 } |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3426 |
769 | 3427 /* If there are no frames open that have more than a minibuffer, |
3428 we need to create a new frame. */ | |
3429 if (pop_up_frames || last_nonminibuf_frame == 0) | |
265 | 3430 { |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3431 window = Fframe_selected_window (call0 (Vpop_up_frame_function)); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3432 Fset_window_buffer (window, buffer, Qnil); |
13619
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3433 return display_buffer_1 (window); |
265 | 3434 } |
3435 | |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3436 f = SELECTED_FRAME (); |
358 | 3437 if (pop_up_windows |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3438 || FRAME_MINIBUF_ONLY_P (f) |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3439 /* 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
|
3440 don't try to reuse its windows. */ |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3441 || !NILP (XWINDOW (FRAME_ROOT_WINDOW (f))->dedicated)) |
358 | 3442 { |
6517
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
3443 Lisp_Object frames; |
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
3444 |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
3445 frames = Qnil; |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3446 if (FRAME_MINIBUF_ONLY_P (f)) |
9282
f4fa46f6a032
(Fminibuffer_window, Fwindow_at, Fwindow_end, Fnext_window, Fprevious_window,
Karl Heuer <kwzh@gnu.org>
parents:
9243
diff
changeset
|
3447 XSETFRAME (frames, last_nonminibuf_frame); |
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3448 /* Don't try to create a window if we would get an error. */ |
265 | 3449 if (split_height_threshold < window_min_height << 1) |
3450 split_height_threshold = window_min_height << 1; | |
3451 | |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3452 /* 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
|
3453 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
|
3454 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
|
3455 |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3456 /* 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
|
3457 try other frames. */ |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3458 if (FRAME_NO_SPLIT_P (NILP (frames) ? f : last_nonminibuf_frame)) |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3459 { |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3460 /* Try visible frames first. */ |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3461 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
|
3462 /* 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
|
3463 if (NILP (window)) |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3464 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
|
3465 if (NILP (window)) |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3466 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
|
3467 } |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3468 else |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3469 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
|
3470 |
9567
cf4f4c8a3ef6
(Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents:
9324
diff
changeset
|
3471 /* 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
|
3472 split it. */ |
485 | 3473 if (!NILP (window) |
9567
cf4f4c8a3ef6
(Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents:
9324
diff
changeset
|
3474 && ! FRAME_NO_SPLIT_P (XFRAME (XWINDOW (window)->frame)) |
265 | 3475 && 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
|
3476 && WINDOW_FULL_WIDTH_P (XWINDOW (window))) |
265 | 3477 window = Fsplit_window (window, Qnil, Qnil); |
3478 else | |
3479 { | |
9614
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3480 Lisp_Object upper, lower, other; |
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3481 |
769 | 3482 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
|
3483 /* 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
|
3484 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
|
3485 if (!NILP (window) |
9567
cf4f4c8a3ef6
(Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents:
9324
diff
changeset
|
3486 && ! 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
|
3487 && (EQ (window, selected_window) |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3488 || EQ (XWINDOW (window)->parent, Qnil)) |
265 | 3489 && window_height (window) >= window_min_height << 1) |
3490 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
|
3491 /* If Fget_lru_window returned nil, try other approaches. */ |
17628
0b6db83d4663
(Fdisplay_buffer): If we give up and try other frames,
Richard M. Stallman <rms@gnu.org>
parents:
17540
diff
changeset
|
3492 |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3493 /* Try visible frames first. */ |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3494 if (NILP (window)) |
17628
0b6db83d4663
(Fdisplay_buffer): If we give up and try other frames,
Richard M. Stallman <rms@gnu.org>
parents:
17540
diff
changeset
|
3495 window = Fget_buffer_window (buffer, Qvisible); |
0b6db83d4663
(Fdisplay_buffer): If we give up and try other frames,
Richard M. Stallman <rms@gnu.org>
parents:
17540
diff
changeset
|
3496 if (NILP (window)) |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3497 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
|
3498 /* 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
|
3499 if (NILP (window)) |
17628
0b6db83d4663
(Fdisplay_buffer): If we give up and try other frames,
Richard M. Stallman <rms@gnu.org>
parents:
17540
diff
changeset
|
3500 window = Fget_buffer_window (buffer, make_number (0)); |
0b6db83d4663
(Fdisplay_buffer): If we give up and try other frames,
Richard M. Stallman <rms@gnu.org>
parents:
17540
diff
changeset
|
3501 if (NILP (window)) |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3502 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
|
3503 /* Try invisible frames. */ |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3504 if (NILP (window)) |
17628
0b6db83d4663
(Fdisplay_buffer): If we give up and try other frames,
Richard M. Stallman <rms@gnu.org>
parents:
17540
diff
changeset
|
3505 window = Fget_buffer_window (buffer, Qt); |
0b6db83d4663
(Fdisplay_buffer): If we give up and try other frames,
Richard M. Stallman <rms@gnu.org>
parents:
17540
diff
changeset
|
3506 if (NILP (window)) |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3507 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
|
3508 /* 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
|
3509 if (NILP (window)) |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3510 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
|
3511 /* 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
|
3512 even out their heights. */ |
11750
b911d6f75664
(Fdisplay_buffer): Initialize other, upper, lower.
Richard M. Stallman <rms@gnu.org>
parents:
11731
diff
changeset
|
3513 other = upper = lower = Qnil; |
9614
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3514 if (!NILP (XWINDOW (window)->prev)) |
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3515 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
|
3516 if (!NILP (XWINDOW (window)->next)) |
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3517 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
|
3518 if (!NILP (other) |
34261
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
3519 && !NILP (Veven_window_heights) |
9614
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3520 /* Check that OTHER and WINDOW are vertically arrayed. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3521 && !EQ (XWINDOW (other)->top_line, XWINDOW (window)->top_line) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3522 && (XFASTINT (XWINDOW (other)->total_lines) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3523 > XFASTINT (XWINDOW (window)->total_lines))) |
9614
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3524 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3525 int total = (XFASTINT (XWINDOW (other)->total_lines) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3526 + XFASTINT (XWINDOW (window)->total_lines)); |
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
3527 enlarge_window (upper, |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3528 total / 2 - XFASTINT (XWINDOW (upper)->total_lines), |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3529 0, 0); |
9614
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3530 } |
265 | 3531 } |
3532 } | |
3533 else | |
3534 window = Fget_lru_window (Qnil); | |
3535 | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3536 Fset_window_buffer (window, buffer, Qnil); |
13619
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3537 return display_buffer_1 (window); |
265 | 3538 } |
3539 | |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3540 |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3541 DEFUN ("force-window-update", Fforce_window_update, Sforce_window_update, |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3542 0, 1, 0, |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3543 doc: /* Force redisplay of all windows. |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3544 If optional arg OBJECT is a window, force redisplay of that window only. |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
3545 If OBJECT is a buffer or buffer name, force redisplay of all windows |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3546 displaying that buffer. */) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3547 (object) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3548 Lisp_Object object; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3549 { |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3550 if (NILP (object)) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3551 { |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3552 windows_or_buffers_changed++; |
54178
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
3553 update_mode_lines++; |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3554 return Qt; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3555 } |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3556 |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3557 if (WINDOWP (object)) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3558 { |
54178
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
3559 struct window *w = XWINDOW (object); |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3560 mark_window_display_accurate (object, 0); |
54178
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
3561 w->update_mode_line = Qt; |
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
3562 if (BUFFERP (w->buffer)) |
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
3563 XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1; |
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
3564 ++update_mode_lines; |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3565 return Qt; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3566 } |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
3567 |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3568 if (STRINGP (object)) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3569 object = Fget_buffer (object); |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3570 if (BUFFERP (object) && !NILP (XBUFFER (object)->name)) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3571 { |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3572 /* Walk all windows looking for buffer, and force update |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3573 of each of those windows. */ |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3574 |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3575 object = window_loop (REDISPLAY_BUFFER_WINDOWS, object, 0, Qvisible); |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3576 return NILP (object) ? Qnil : Qt; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3577 } |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3578 |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3579 /* If nothing suitable was found, just return. |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3580 We could signal an error, but this feature will typically be used |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3581 asynchronously in timers or process sentinels, so we don't. */ |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3582 return Qnil; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3583 } |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3584 |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3585 |
265 | 3586 void |
3587 temp_output_buffer_show (buf) | |
3588 register Lisp_Object buf; | |
3589 { | |
3590 register struct buffer *old = current_buffer; | |
3591 register Lisp_Object window; | |
3592 register struct window *w; | |
3593 | |
18493
d65021d5c39e
(temp_output_buffer_show): Copy default-directory from current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18065
diff
changeset
|
3594 XBUFFER (buf)->directory = current_buffer->directory; |
d65021d5c39e
(temp_output_buffer_show): Copy default-directory from current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18065
diff
changeset
|
3595 |
265 | 3596 Fset_buffer (buf); |
10302
34556316a48a
(temp_output_buffer_show): Use BUF_SAVE_MODIFF.
Richard M. Stallman <rms@gnu.org>
parents:
10043
diff
changeset
|
3597 BUF_SAVE_MODIFF (XBUFFER (buf)) = MODIFF; |
265 | 3598 BEGV = BEG; |
3599 ZV = Z; | |
3600 SET_PT (BEG); | |
46410
7453a1fdc264
(temp_output_buffer_show): Don't set prevent_redisplay_optimizations_p.
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
3601 #if 0 /* rms: there should be no reason for this. */ |
25375 | 3602 XBUFFER (buf)->prevent_redisplay_optimizations_p = 1; |
46410
7453a1fdc264
(temp_output_buffer_show): Don't set prevent_redisplay_optimizations_p.
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
3603 #endif |
265 | 3604 set_buffer_internal (old); |
3605 | |
3606 if (!EQ (Vtemp_buffer_show_function, Qnil)) | |
3607 call1 (Vtemp_buffer_show_function, buf); | |
3608 else | |
3609 { | |
20867
fccf74829150
(Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
20777
diff
changeset
|
3610 window = Fdisplay_buffer (buf, Qnil, Qnil); |
265 | 3611 |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3612 if (!EQ (XWINDOW (window)->frame, selected_frame)) |
769 | 3613 Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window))); |
265 | 3614 Vminibuf_scroll_window = window; |
3615 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
|
3616 XSETFASTINT (w->hscroll, 0); |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
3617 XSETFASTINT (w->min_hscroll, 0); |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3618 set_marker_restricted_both (w->start, buf, BEG, BEG); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3619 set_marker_restricted_both (w->pointm, buf, BEG, BEG); |
11731
b8d3aea195cd
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11427
diff
changeset
|
3620 |
22149
ad3ee5ec90d1
(Fselect_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
21844
diff
changeset
|
3621 /* Run temp-buffer-show-hook, with the chosen window selected |
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3622 and its buffer current. */ |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3623 |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3624 if (!NILP (Vrun_hooks) |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3625 && !NILP (Fboundp (Qtemp_buffer_show_hook)) |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3626 && !NILP (Fsymbol_value (Qtemp_buffer_show_hook))) |
11405
645e3883da72
(temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents:
11307
diff
changeset
|
3627 { |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3628 int count = SPECPDL_INDEX (); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3629 Lisp_Object prev_window, prev_buffer; |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3630 prev_window = selected_window; |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3631 XSETBUFFER (prev_buffer, old); |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
3632 |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3633 /* Select the window that was chosen, for running the hook. |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3634 Note: Both Fselect_window and select_window_norecord may |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3635 set-buffer to the buffer displayed in the window, |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3636 so we need to save the current buffer. --stef */ |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3637 record_unwind_protect (Fset_buffer, prev_buffer); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3638 record_unwind_protect (select_window_norecord, prev_window); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3639 Fselect_window (window, Qt); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3640 Fset_buffer (w->buffer); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3641 call1 (Vrun_hooks, Qtemp_buffer_show_hook); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3642 unbind_to (count, Qnil); |
11405
645e3883da72
(temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents:
11307
diff
changeset
|
3643 } |
645e3883da72
(temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents:
11307
diff
changeset
|
3644 } |
265 | 3645 } |
3646 | |
21514 | 3647 static void |
265 | 3648 make_dummy_parent (window) |
3649 Lisp_Object window; | |
3650 { | |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3651 Lisp_Object new; |
265 | 3652 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
|
3653 int i; |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3654 |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3655 o = XWINDOW (window); |
36432
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
3656 p = allocate_window (); |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3657 for (i = 0; i < VECSIZE (struct window); ++i) |
36432
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
3658 ((struct Lisp_Vector *) p)->contents[i] |
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
3659 = ((struct Lisp_Vector *)o)->contents[i]; |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3660 XSETWINDOW (new, p); |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3661 |
58265
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
3662 ++sequence_number; |
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
3663 XSETFASTINT (p->sequence_number, sequence_number); |
265 | 3664 |
3665 /* Put new into window structure in place of window */ | |
3666 replace_window (window, new); | |
3667 | |
3668 o->next = Qnil; | |
3669 o->prev = Qnil; | |
3670 o->vchild = Qnil; | |
3671 o->hchild = Qnil; | |
3672 o->parent = new; | |
3673 | |
3674 p->start = Qnil; | |
3675 p->pointm = Qnil; | |
3676 p->buffer = Qnil; | |
3677 } | |
3678 | |
3679 DEFUN ("split-window", Fsplit_window, Ssplit_window, 0, 3, "", | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3680 doc: /* Split WINDOW, putting SIZE lines in the first of the pair. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3681 WINDOW defaults to selected one and SIZE to half its size. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3682 If optional third arg HORFLAG is non-nil, split side by side |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3683 and put SIZE columns in the first of the pair. In that case, |
55563
a58f6db8bf3d
(Fdisplay_buffer, Fsplit_window, split-height-threshold): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
55402
diff
changeset
|
3684 SIZE includes that window's scroll bar, or the divider column to its right. |
56393
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
3685 Interactively, all arguments are nil. |
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
3686 |
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
3687 Returns the newly created window (which is the lower or rightmost one). |
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
3688 The upper or leftmost window is the original one and remains selected. |
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
3689 See Info node `(elisp)Splitting Windows' for more details and examples.*/) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3690 (window, size, horflag) |
13780
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3691 Lisp_Object window, size, horflag; |
265 | 3692 { |
3693 register Lisp_Object new; | |
3694 register struct window *o, *p; | |
13723
4e170419e83c
(Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents:
13619
diff
changeset
|
3695 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
|
3696 register int size_int; |
265 | 3697 |
485 | 3698 if (NILP (window)) |
265 | 3699 window = selected_window; |
3700 else | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3701 CHECK_LIVE_WINDOW (window); |
265 | 3702 |
3703 o = XWINDOW (window); | |
13723
4e170419e83c
(Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents:
13619
diff
changeset
|
3704 fo = XFRAME (WINDOW_FRAME (o)); |
265 | 3705 |
13780
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3706 if (NILP (size)) |
265 | 3707 { |
485 | 3708 if (!NILP (horflag)) |
13723
4e170419e83c
(Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents:
13619
diff
changeset
|
3709 /* Calculate the size of the left-hand window, by dividing |
25044
e6c2ab650ebc
(Fsplit_window): For default size, round up for left window.
Karl Heuer <kwzh@gnu.org>
parents:
24997
diff
changeset
|
3710 the usable space in columns by two. |
e6c2ab650ebc
(Fsplit_window): For default size, round up for left window.
Karl Heuer <kwzh@gnu.org>
parents:
24997
diff
changeset
|
3711 We round up, since the left-hand window may include |
e6c2ab650ebc
(Fsplit_window): For default size, round up for left window.
Karl Heuer <kwzh@gnu.org>
parents:
24997
diff
changeset
|
3712 a dividing line, while the right-hand may not. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3713 size_int = (XFASTINT (o->total_cols) + 1) >> 1; |
265 | 3714 else |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3715 size_int = XFASTINT (o->total_lines) >> 1; |
265 | 3716 } |
3717 else | |
3718 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3719 CHECK_NUMBER (size); |
13780
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3720 size_int = XINT (size); |
265 | 3721 } |
3722 | |
3723 if (MINI_WINDOW_P (o)) | |
3724 error ("Attempt to split minibuffer window"); | |
25268 | 3725 else if (window_fixed_size_p (o, !NILP (horflag), 0)) |
3726 error ("Attempt to split fixed-size window"); | |
265 | 3727 |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
3728 check_min_window_sizes (); |
265 | 3729 |
485 | 3730 if (NILP (horflag)) |
265 | 3731 { |
13780
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3732 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
|
3733 error ("Window height %d too small (after splitting)", size_int); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3734 if (size_int + window_min_height > XFASTINT (o->total_lines)) |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
3735 error ("Window height %d too small (after splitting)", |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3736 XFASTINT (o->total_lines) - size_int); |
485 | 3737 if (NILP (o->parent) |
3738 || NILP (XWINDOW (o->parent)->vchild)) | |
265 | 3739 { |
3740 make_dummy_parent (window); | |
3741 new = o->parent; | |
3742 XWINDOW (new)->vchild = window; | |
3743 } | |
3744 } | |
3745 else | |
3746 { | |
13780
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3747 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
|
3748 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
|
3749 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3750 if (size_int + window_min_width > XFASTINT (o->total_cols)) |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
3751 error ("Window width %d too small (after splitting)", |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3752 XFASTINT (o->total_cols) - size_int); |
485 | 3753 if (NILP (o->parent) |
3754 || NILP (XWINDOW (o->parent)->hchild)) | |
265 | 3755 { |
3756 make_dummy_parent (window); | |
3757 new = o->parent; | |
3758 XWINDOW (new)->hchild = window; | |
3759 } | |
3760 } | |
3761 | |
3762 /* Now we know that window's parent is a vertical combination | |
3763 if we are dividing vertically, or a horizontal combination | |
3764 if we are making side-by-side windows */ | |
3765 | |
3766 windows_or_buffers_changed++; | |
13723
4e170419e83c
(Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents:
13619
diff
changeset
|
3767 FRAME_WINDOW_SIZES_CHANGED (fo) = 1; |
265 | 3768 new = make_window (); |
3769 p = XWINDOW (new); | |
3770 | |
769 | 3771 p->frame = o->frame; |
265 | 3772 p->next = o->next; |
485 | 3773 if (!NILP (p->next)) |
265 | 3774 XWINDOW (p->next)->prev = new; |
3775 p->prev = window; | |
3776 o->next = new; | |
3777 p->parent = o->parent; | |
3778 p->buffer = Qt; | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3779 p->window_end_valid = Qnil; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3780 bzero (&p->last_cursor, sizeof p->last_cursor); |
265 | 3781 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3782 /* Duplicate special geometry settings. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3783 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3784 p->left_margin_cols = o->left_margin_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3785 p->right_margin_cols = o->right_margin_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3786 p->left_fringe_width = o->left_fringe_width; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3787 p->right_fringe_width = o->right_fringe_width; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3788 p->fringes_outside_margins = o->fringes_outside_margins; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3789 p->scroll_bar_width = o->scroll_bar_width; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3790 p->vertical_scroll_bar_type = o->vertical_scroll_bar_type; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3791 |
769 | 3792 /* Apportion the available frame space among the two new windows */ |
265 | 3793 |
485 | 3794 if (!NILP (horflag)) |
265 | 3795 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3796 p->total_lines = o->total_lines; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3797 p->top_line = o->top_line; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3798 XSETFASTINT (p->total_cols, XFASTINT (o->total_cols) - size_int); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3799 XSETFASTINT (o->total_cols, size_int); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3800 XSETFASTINT (p->left_col, XFASTINT (o->left_col) + size_int); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3801 adjust_window_margins (p); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3802 adjust_window_margins (o); |
265 | 3803 } |
3804 else | |
3805 { | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3806 p->left_col = o->left_col; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3807 p->total_cols = o->total_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3808 XSETFASTINT (p->total_lines, XFASTINT (o->total_lines) - size_int); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3809 XSETFASTINT (o->total_lines, size_int); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3810 XSETFASTINT (p->top_line, XFASTINT (o->top_line) + size_int); |
265 | 3811 } |
3812 | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3813 /* Adjust glyph matrices. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3814 adjust_glyphs (fo); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3815 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3816 Fset_window_buffer (new, o->buffer, Qt); |
265 | 3817 return new; |
3818 } | |
3819 | |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3820 DEFUN ("enlarge-window", Fenlarge_window, Senlarge_window, 1, 3, "p", |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3821 doc: /* Make current window ARG lines bigger. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3822 From program, optional second arg non-nil means grow sideways ARG columns. |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3823 Interactively, if an argument is not given, make the window one line bigger. |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3824 |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3825 Optional third arg PRESERVE-BEFORE, if non-nil, means do not change the size |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3826 of the siblings above or to the left of the selected window. Only |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3827 siblings to the right or below are changed. */) |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3828 (arg, side, preserve_before) |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3829 register Lisp_Object arg, side, preserve_before; |
265 | 3830 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3831 CHECK_NUMBER (arg); |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3832 enlarge_window (selected_window, XINT (arg), !NILP (side), |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3833 !NILP (preserve_before)); |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3834 |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3835 if (! NILP (Vwindow_configuration_change_hook)) |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3836 call1 (Vrun_hooks, Qwindow_configuration_change_hook); |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3837 |
265 | 3838 return Qnil; |
3839 } | |
3840 | |
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3841 DEFUN ("shrink-window", Fshrink_window, Sshrink_window, 1, 3, "p", |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3842 doc: /* Make current window ARG lines smaller. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3843 From program, optional second arg non-nil means shrink sideways arg columns. |
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3844 Interactively, if an argument is not given, make the window one line smaller. |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3845 |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3846 Optional third arg PRESERVE-BEFORE, if non-nil, means do not change the size |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3847 of the siblings above or to the left of the selected window. Only |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3848 siblings to the right or below are changed. */) |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3849 (arg, side, preserve_before) |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3850 register Lisp_Object arg, side, preserve_before; |
265 | 3851 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3852 CHECK_NUMBER (arg); |
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3853 enlarge_window (selected_window, -XINT (arg), !NILP (side), |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3854 !NILP (preserve_before)); |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3855 |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3856 if (! NILP (Vwindow_configuration_change_hook)) |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3857 call1 (Vrun_hooks, Qwindow_configuration_change_hook); |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3858 |
265 | 3859 return Qnil; |
3860 } | |
3861 | |
3862 int | |
3863 window_height (window) | |
3864 Lisp_Object window; | |
3865 { | |
3866 register struct window *p = XWINDOW (window); | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3867 return WINDOW_TOTAL_LINES (p); |
265 | 3868 } |
3869 | |
3870 int | |
3871 window_width (window) | |
3872 Lisp_Object window; | |
3873 { | |
3874 register struct window *p = XWINDOW (window); | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3875 return WINDOW_TOTAL_COLS (p); |
265 | 3876 } |
3877 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3878 |
265 | 3879 #define CURBEG(w) \ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3880 *(widthflag ? &(XWINDOW (w)->left_col) : &(XWINDOW (w)->top_line)) |
265 | 3881 |
3882 #define CURSIZE(w) \ | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3883 *(widthflag ? &(XWINDOW (w)->total_cols) : &(XWINDOW (w)->total_lines)) |
265 | 3884 |
25268 | 3885 |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3886 /* Enlarge WINDOW by DELTA. WIDTHFLAG non-zero means |
25268 | 3887 increase its width. Siblings of the selected window are resized to |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3888 fulfill the size request. If they become too small in the process, |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3889 they will be deleted. |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3890 |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3891 If PRESERVE_BEFORE is nonzero, that means don't alter |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3892 the siblings to the left or above WINDOW. */ |
265 | 3893 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3894 static void |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3895 enlarge_window (window, delta, widthflag, preserve_before) |
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
3896 Lisp_Object window; |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3897 int delta, widthflag, preserve_before; |
265 | 3898 { |
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
3899 Lisp_Object parent, next, prev; |
25268 | 3900 struct window *p; |
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
3901 Lisp_Object *sizep; |
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
3902 int maximum; |
20351 | 3903 int (*sizefun) P_ ((Lisp_Object)) |
3904 = widthflag ? window_width : window_height; | |
25268 | 3905 void (*setsizefun) P_ ((Lisp_Object, int, int)) |
20351 | 3906 = (widthflag ? set_window_width : set_window_height); |
25268 | 3907 |
3908 /* Check values of window_min_width and window_min_height for | |
3909 validity. */ | |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
3910 check_min_window_sizes (); |
265 | 3911 |
25268 | 3912 /* Give up if this window cannot be resized. */ |
3913 if (window_fixed_size_p (XWINDOW (window), widthflag, 1)) | |
3914 error ("Window is not resizable"); | |
3915 | |
3916 /* Find the parent of the selected window. */ | |
265 | 3917 while (1) |
3918 { | |
3919 p = XWINDOW (window); | |
3920 parent = p->parent; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3921 |
485 | 3922 if (NILP (parent)) |
265 | 3923 { |
3924 if (widthflag) | |
3925 error ("No other window to side of this one"); | |
3926 break; | |
3927 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3928 |
25268 | 3929 if (widthflag |
3930 ? !NILP (XWINDOW (parent)->hchild) | |
485 | 3931 : !NILP (XWINDOW (parent)->vchild)) |
265 | 3932 break; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3933 |
265 | 3934 window = parent; |
3935 } | |
3936 | |
1049
25046e48ce9a
* window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents:
1016
diff
changeset
|
3937 sizep = &CURSIZE (window); |
25046e48ce9a
* window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents:
1016
diff
changeset
|
3938 |
265 | 3939 { |
3940 register int maxdelta; | |
3941 | |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3942 /* Compute the maximum size increment this window can have. */ |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3943 |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3944 if (preserve_before) |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3945 { |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3946 if (!NILP (parent)) |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3947 { |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3948 maxdelta = (*sizefun) (parent) - XINT (*sizep); |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3949 /* Subtract size of siblings before, since we can't take that. */ |
42351
29b74fa42a55
* window.c (enlarge_window): In new preserve_before code, convert CURBEG from
Ken Raeburn <raeburn@raeburn.org>
parents:
42308
diff
changeset
|
3950 maxdelta -= XINT (CURBEG (window)) - XINT (CURBEG (parent)); |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3951 } |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3952 else |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3953 maxdelta = (!NILP (p->next) ? ((*sizefun) (p->next) |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3954 - window_min_size (XWINDOW (p->next), |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3955 widthflag, 0, 0)) |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3956 : (delta = 0)); |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3957 } |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3958 else |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3959 maxdelta = (!NILP (parent) ? (*sizefun) (parent) - XINT (*sizep) |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3960 /* This is a main window followed by a minibuffer. */ |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3961 : !NILP (p->next) ? ((*sizefun) (p->next) |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3962 - window_min_size (XWINDOW (p->next), |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3963 widthflag, 0, 0)) |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3964 /* This is a minibuffer following a main window. */ |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3965 : !NILP (p->prev) ? ((*sizefun) (p->prev) |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3966 - window_min_size (XWINDOW (p->prev), |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3967 widthflag, 0, 0)) |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3968 /* This is a frame with only one window, a minibuffer-only |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3969 or a minibufferless frame. */ |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3970 : (delta = 0)); |
265 | 3971 |
3972 if (delta > maxdelta) | |
3973 /* This case traps trying to make the minibuffer | |
769 | 3974 the full frame, or make the only window aside from the |
3975 minibuffer the full frame. */ | |
265 | 3976 delta = maxdelta; |
7618
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
3977 } |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
3978 |
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
3979 if (XINT (*sizep) + delta < window_min_size (XWINDOW (window), widthflag, 0, 0)) |
7618
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
3980 { |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3981 delete_window (window); |
432 | 3982 return; |
7618
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
3983 } |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
3984 |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
3985 if (delta == 0) |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
3986 return; |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
3987 |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3988 /* Find the total we can get from other siblings without deleting them. */ |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3989 maximum = 0; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3990 for (next = p->next; ! NILP (next); next = XWINDOW (next)->next) |
25254 | 3991 maximum += (*sizefun) (next) - window_min_size (XWINDOW (next), |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3992 widthflag, 0, 0); |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3993 if (! preserve_before) |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3994 for (prev = p->prev; ! NILP (prev); prev = XWINDOW (prev)->prev) |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3995 maximum += (*sizefun) (prev) - window_min_size (XWINDOW (prev), |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3996 widthflag, 0, 0); |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3997 |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3998 /* If we can get it all from them without deleting them, do so. */ |
18900
23ee59ec294b
(set_window_height): Allow all heights > 0 for minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
18737
diff
changeset
|
3999 if (delta <= maximum) |
265 | 4000 { |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4001 Lisp_Object first_unaffected; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4002 Lisp_Object first_affected; |
25268 | 4003 int fixed_p; |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4004 |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4005 next = p->next; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4006 prev = p->prev; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4007 first_affected = window; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4008 /* Look at one sibling at a time, |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4009 moving away from this window in both directions alternately, |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4010 and take as much as we can get without deleting that sibling. */ |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
4011 while (delta != 0 |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
4012 && (!NILP (next) || (!preserve_before && !NILP (prev)))) |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4013 { |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4014 if (! NILP (next)) |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4015 { |
25254 | 4016 int this_one = ((*sizefun) (next) |
25268 | 4017 - window_min_size (XWINDOW (next), |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4018 widthflag, 0, &fixed_p)); |
25268 | 4019 if (!fixed_p) |
4020 { | |
4021 if (this_one > delta) | |
4022 this_one = delta; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4023 |
25268 | 4024 (*setsizefun) (next, (*sizefun) (next) - this_one, 0); |
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
4025 (*setsizefun) (window, XINT (*sizep) + this_one, 0); |
25268 | 4026 |
4027 delta -= this_one; | |
4028 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4029 |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4030 next = XWINDOW (next)->next; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4031 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4032 |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4033 if (delta == 0) |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4034 break; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4035 |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
4036 if (!preserve_before && ! NILP (prev)) |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4037 { |
25254 | 4038 int this_one = ((*sizefun) (prev) |
25268 | 4039 - window_min_size (XWINDOW (prev), |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4040 widthflag, 0, &fixed_p)); |
25268 | 4041 if (!fixed_p) |
4042 { | |
4043 if (this_one > delta) | |
4044 this_one = delta; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4045 |
25268 | 4046 first_affected = prev; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4047 |
25268 | 4048 (*setsizefun) (prev, (*sizefun) (prev) - this_one, 0); |
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
4049 (*setsizefun) (window, XINT (*sizep) + this_one, 0); |
25268 | 4050 |
4051 delta -= this_one; | |
4052 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4053 |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4054 prev = XWINDOW (prev)->prev; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4055 } |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4056 } |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4057 |
25268 | 4058 xassert (delta == 0); |
4059 | |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4060 /* Now recalculate the edge positions of all the windows affected, |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4061 based on the new sizes. */ |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4062 first_unaffected = next; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4063 prev = first_affected; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4064 for (next = XWINDOW (prev)->next; ! EQ (next, first_unaffected); |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4065 prev = next, next = XWINDOW (next)->next) |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4066 { |
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
4067 XSETINT (CURBEG (next), XINT (CURBEG (prev)) + (*sizefun) (prev)); |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4068 /* This does not change size of NEXT, |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4069 but it propagates the new top edge to its children */ |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4070 (*setsizefun) (next, (*sizefun) (next), 0); |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4071 } |
265 | 4072 } |
4073 else | |
4074 { | |
4075 register int delta1; | |
4076 register int opht = (*sizefun) (parent); | |
4077 | |
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
4078 if (opht <= XINT (*sizep) + delta) |
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4079 { |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4080 /* If trying to grow this window to or beyond size of the parent, |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4081 just delete all the sibling windows. */ |
42862
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4082 Lisp_Object start, tem, next; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4083 |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4084 start = XWINDOW (parent)->vchild; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4085 if (NILP (start)) |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4086 start = XWINDOW (parent)->hchild; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4087 |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4088 /* Delete any siblings that come after WINDOW. */ |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4089 tem = XWINDOW (window)->next; |
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4090 while (! NILP (tem)) |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4091 { |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4092 next = XWINDOW (tem)->next; |
42862
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4093 delete_window (tem); |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4094 tem = next; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4095 } |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4096 |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4097 /* Delete any siblings that come after WINDOW. |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4098 Note that if START is not WINDOW, then WINDOW still |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4099 Fhas siblings, so WINDOW has not yet replaced its parent. */ |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4100 tem = start; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4101 while (! EQ (tem, window)) |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4102 { |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4103 next = XWINDOW (tem)->next; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4104 delete_window (tem); |
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4105 tem = next; |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4106 } |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4107 } |
265 | 4108 else |
25268 | 4109 { |
4110 /* Otherwise, make delta1 just right so that if we add | |
4111 delta1 lines to this window and to the parent, and then | |
4112 shrink the parent back to its original size, the new | |
4113 proportional size of this window will increase by delta. | |
4114 | |
4115 The function size_window will compute the new height h' | |
4116 of the window from delta1 as: | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4117 |
25268 | 4118 e = delta1/n |
4119 x = delta1 - delta1/n * n for the 1st resizable child | |
4120 h' = h + e + x | |
4121 | |
4122 where n is the number of children that can be resized. | |
4123 We can ignore x by choosing a delta1 that is a multiple of | |
4124 n. We want the height of this window to come out as | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4125 |
25268 | 4126 h' = h + delta |
4127 | |
4128 So, delta1 must be | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4129 |
25268 | 4130 h + e = h + delta |
4131 delta1/n = delta | |
4132 delta1 = n * delta. | |
4133 | |
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
4134 The number of children n equals the number of resizable |
25268 | 4135 children of this window + 1 because we know window itself |
4136 is resizable (otherwise we would have signalled an error. */ | |
4137 | |
4138 struct window *w = XWINDOW (window); | |
4139 Lisp_Object s; | |
4140 int n = 1; | |
4141 | |
4142 for (s = w->next; !NILP (s); s = XWINDOW (s)->next) | |
4143 if (!window_fixed_size_p (XWINDOW (s), widthflag, 0)) | |
4144 ++n; | |
4145 for (s = w->prev; !NILP (s); s = XWINDOW (s)->prev) | |
4146 if (!window_fixed_size_p (XWINDOW (s), widthflag, 0)) | |
4147 ++n; | |
4148 | |
4149 delta1 = n * delta; | |
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4150 |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4151 /* Add delta1 lines or columns to this window, and to the parent, |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4152 keeping things consistent while not affecting siblings. */ |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4153 XSETINT (CURSIZE (parent), opht + delta1); |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4154 (*setsizefun) (window, XINT (*sizep) + delta1, 0); |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4155 |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4156 /* Squeeze out delta1 lines or columns from our parent, |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4157 shriking this window and siblings proportionately. |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4158 This brings parent back to correct size. |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4159 Delta1 was calculated so this makes this window the desired size, |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4160 taking it all out of the siblings. */ |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4161 (*setsizefun) (parent, opht, 0); |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4162 |
25268 | 4163 } |
265 | 4164 } |
4165 | |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
4166 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
|
4167 XSETFASTINT (p->last_overlay_modified, 0); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4168 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4169 /* Adjust glyph matrices. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4170 adjust_glyphs (XFRAME (WINDOW_FRAME (XWINDOW (window)))); |
265 | 4171 } |
25254 | 4172 |
265 | 4173 #undef CURBEG |
4174 #undef CURSIZE | |
4175 | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4176 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4177 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4178 /*********************************************************************** |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4179 Resizing Mini-Windows |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4180 ***********************************************************************/ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4181 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4182 static void shrink_window_lowest_first P_ ((struct window *, int)); |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4183 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4184 enum save_restore_action |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4185 { |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4186 CHECK_ORIG_SIZES, |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4187 SAVE_ORIG_SIZES, |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4188 RESTORE_ORIG_SIZES |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4189 }; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4190 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4191 static int save_restore_orig_size P_ ((struct window *, |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4192 enum save_restore_action)); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4193 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4194 /* Shrink windows rooted in window W to HEIGHT. Take the space needed |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4195 from lowest windows first. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4196 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4197 static void |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4198 shrink_window_lowest_first (w, height) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4199 struct window *w; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4200 int height; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4201 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4202 struct window *c; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4203 Lisp_Object child; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4204 int old_height; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4205 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4206 xassert (!MINI_WINDOW_P (w)); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4207 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4208 /* Set redisplay hints. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4209 XSETFASTINT (w->last_modified, 0); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4210 XSETFASTINT (w->last_overlay_modified, 0); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4211 windows_or_buffers_changed++; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4212 FRAME_WINDOW_SIZES_CHANGED (XFRAME (WINDOW_FRAME (w))) = 1; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4213 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4214 old_height = XFASTINT (w->total_lines); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4215 XSETFASTINT (w->total_lines, height); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4216 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4217 if (!NILP (w->hchild)) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4218 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4219 for (child = w->hchild; !NILP (child); child = c->next) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4220 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4221 c = XWINDOW (child); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4222 c->top_line = w->top_line; |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4223 shrink_window_lowest_first (c, height); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4224 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4225 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4226 else if (!NILP (w->vchild)) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4227 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4228 Lisp_Object last_child; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4229 int delta = old_height - height; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4230 int last_top; |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
4231 |
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
4232 last_child = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4233 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4234 /* Find the last child. We are taking space from lowest windows |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4235 first, so we iterate over children from the last child |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4236 backwards. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4237 for (child = w->vchild; !NILP (child); child = XWINDOW (child)->next) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4238 last_child = child; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4239 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4240 /* Assign new heights. We leave only MIN_SAFE_WINDOW_HEIGHT. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4241 for (child = last_child; delta && !NILP (child); child = c->prev) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4242 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4243 int this_one; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4244 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4245 c = XWINDOW (child); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4246 this_one = XFASTINT (c->total_lines) - MIN_SAFE_WINDOW_HEIGHT; |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4247 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4248 if (this_one > delta) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4249 this_one = delta; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4250 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4251 shrink_window_lowest_first (c, XFASTINT (c->total_lines) - this_one); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4252 delta -= this_one; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4253 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4254 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4255 /* Compute new positions. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4256 last_top = XINT (w->top_line); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4257 for (child = w->vchild; !NILP (child); child = c->next) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4258 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4259 c = XWINDOW (child); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4260 c->top_line = make_number (last_top); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4261 shrink_window_lowest_first (c, XFASTINT (c->total_lines)); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4262 last_top += XFASTINT (c->total_lines); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4263 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4264 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4265 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4266 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4267 |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4268 /* Save, restore, or check positions and sizes in the window tree |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4269 rooted at W. ACTION says what to do. |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4270 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4271 If ACTION is CHECK_ORIG_SIZES, check if orig_top_line and |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4272 orig_total_lines members are valid for all windows in the window |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4273 tree. Value is non-zero if they are valid. |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4274 |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4275 If ACTION is SAVE_ORIG_SIZES, save members top and height in |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4276 orig_top_line and orig_total_lines for all windows in the tree. |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4277 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4278 If ACTION is RESTORE_ORIG_SIZES, restore top and height from values |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4279 stored in orig_top_line and orig_total_lines for all windows. */ |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4280 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4281 static int |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4282 save_restore_orig_size (w, action) |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4283 struct window *w; |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4284 enum save_restore_action action; |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4285 { |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4286 int success_p = 1; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4287 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4288 while (w) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4289 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4290 if (!NILP (w->hchild)) |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4291 { |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4292 if (!save_restore_orig_size (XWINDOW (w->hchild), action)) |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4293 success_p = 0; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4294 } |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4295 else if (!NILP (w->vchild)) |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4296 { |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4297 if (!save_restore_orig_size (XWINDOW (w->vchild), action)) |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4298 success_p = 0; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4299 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4300 |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4301 switch (action) |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4302 { |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4303 case CHECK_ORIG_SIZES: |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4304 if (!INTEGERP (w->orig_top_line) || !INTEGERP (w->orig_total_lines)) |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4305 return 0; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4306 break; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4307 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4308 case SAVE_ORIG_SIZES: |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4309 w->orig_top_line = w->top_line; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4310 w->orig_total_lines = w->total_lines; |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4311 XSETFASTINT (w->last_modified, 0); |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4312 XSETFASTINT (w->last_overlay_modified, 0); |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4313 break; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4314 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4315 case RESTORE_ORIG_SIZES: |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4316 xassert (INTEGERP (w->orig_top_line) && INTEGERP (w->orig_total_lines)); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4317 w->top_line = w->orig_top_line; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4318 w->total_lines = w->orig_total_lines; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4319 w->orig_total_lines = w->orig_top_line = Qnil; |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4320 XSETFASTINT (w->last_modified, 0); |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4321 XSETFASTINT (w->last_overlay_modified, 0); |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4322 break; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4323 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4324 default: |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4325 abort (); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4326 } |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4327 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4328 w = NILP (w->next) ? NULL : XWINDOW (w->next); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4329 } |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4330 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4331 return success_p; |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4332 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4333 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4334 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4335 /* Grow mini-window W by DELTA lines, DELTA >= 0, or as much as we can |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4336 without deleting other windows. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4337 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4338 void |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4339 grow_mini_window (w, delta) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4340 struct window *w; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4341 int delta; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4342 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4343 struct frame *f = XFRAME (w->frame); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4344 struct window *root; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4345 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4346 xassert (MINI_WINDOW_P (w)); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4347 xassert (delta >= 0); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4348 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4349 /* Check values of window_min_width and window_min_height for |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4350 validity. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4351 check_min_window_sizes (); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4352 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4353 /* Compute how much we can enlarge the mini-window without deleting |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4354 other windows. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4355 root = XWINDOW (FRAME_ROOT_WINDOW (f)); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4356 if (delta) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4357 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4358 int min_height = window_min_size (root, 0, 0, 0); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4359 if (XFASTINT (root->total_lines) - delta < min_height) |
40619
4e8c66bd2abb
(grow_mini_window): Fix typo in comment.
Pavel Janík <Pavel@Janik.cz>
parents:
40543
diff
changeset
|
4360 /* Note that the root window may already be smaller than |
40543
9461cfa8d18d
(grow_mini_window): Handle case that the root
Gerd Moellmann <gerd@gnu.org>
parents:
40459
diff
changeset
|
4361 min_height. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4362 delta = max (0, XFASTINT (root->total_lines) - min_height); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4363 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4364 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4365 if (delta) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4366 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4367 /* Save original window sizes and positions, if not already done. */ |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4368 if (!save_restore_orig_size (root, CHECK_ORIG_SIZES)) |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4369 save_restore_orig_size (root, SAVE_ORIG_SIZES); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4370 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4371 /* Shrink other windows. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4372 shrink_window_lowest_first (root, XFASTINT (root->total_lines) - delta); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4373 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4374 /* Grow the mini-window. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4375 w->top_line = make_number (XFASTINT (root->top_line) + XFASTINT (root->total_lines)); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4376 w->total_lines = make_number (XFASTINT (w->total_lines) + delta); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4377 XSETFASTINT (w->last_modified, 0); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4378 XSETFASTINT (w->last_overlay_modified, 0); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4379 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4380 adjust_glyphs (f); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4381 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4382 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4383 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4384 |
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
4385 /* Shrink mini-window W. If there is recorded info about window sizes |
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
4386 before a call to grow_mini_window, restore recorded window sizes. |
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
4387 Otherwise, if the mini-window is higher than 1 line, resize it to 1 |
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
4388 line. */ |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4389 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4390 void |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4391 shrink_mini_window (w) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4392 struct window *w; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4393 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4394 struct frame *f = XFRAME (w->frame); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4395 struct window *root = XWINDOW (FRAME_ROOT_WINDOW (f)); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4396 |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4397 if (save_restore_orig_size (root, CHECK_ORIG_SIZES)) |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4398 { |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4399 save_restore_orig_size (root, RESTORE_ORIG_SIZES); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4400 adjust_glyphs (f); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4401 FRAME_WINDOW_SIZES_CHANGED (f) = 1; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4402 windows_or_buffers_changed = 1; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4403 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4404 else if (XFASTINT (w->total_lines) > 1) |
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
4405 { |
35621
5f154b8fc2bd
(size_window): Set the window's orig_top to nil when
Gerd Moellmann <gerd@gnu.org>
parents:
35483
diff
changeset
|
4406 /* Distribute the additional lines of the mini-window |
5f154b8fc2bd
(size_window): Set the window's orig_top to nil when
Gerd Moellmann <gerd@gnu.org>
parents:
35483
diff
changeset
|
4407 among the other windows. */ |
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
4408 Lisp_Object window; |
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
4409 XSETWINDOW (window, w); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4410 enlarge_window (window, 1 - XFASTINT (w->total_lines), 0, 0); |
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
4411 } |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4412 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4413 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4414 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4415 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4416 /* Mark window cursors off for all windows in the window tree rooted |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4417 at W by setting their phys_cursor_on_p flag to zero. Called from |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4418 xterm.c, e.g. when a frame is cleared and thereby all cursors on |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4419 the frame are cleared. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4420 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4421 void |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4422 mark_window_cursors_off (w) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4423 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4424 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4425 while (w) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4426 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4427 if (!NILP (w->hchild)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4428 mark_window_cursors_off (XWINDOW (w->hchild)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4429 else if (!NILP (w->vchild)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4430 mark_window_cursors_off (XWINDOW (w->vchild)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4431 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4432 w->phys_cursor_on_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4433 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4434 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4435 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4436 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4437 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4438 |
37270
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4439 /* Return number of lines of text (not counting mode lines) in W. */ |
265 | 4440 |
4441 int | |
4442 window_internal_height (w) | |
4443 struct window *w; | |
4444 { | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4445 int ht = XFASTINT (w->total_lines); |
265 | 4446 |
37270
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4447 if (!MINI_WINDOW_P (w)) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4448 { |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4449 if (!NILP (w->parent) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4450 || !NILP (w->vchild) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4451 || !NILP (w->hchild) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4452 || !NILP (w->next) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4453 || !NILP (w->prev) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4454 || WINDOW_WANTS_MODELINE_P (w)) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4455 --ht; |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4456 |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4457 if (WINDOW_WANTS_HEADER_LINE_P (w)) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4458 --ht; |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4459 } |
265 | 4460 |
4461 return ht; | |
4462 } | |
4463 | |
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4464 |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4465 /* 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
|
4466 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
|
4467 separating W from the sibling to its right. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4468 |
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4469 int |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4470 window_box_text_cols (w) |
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4471 struct window *w; |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4472 { |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4473 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4474 int width = XINT (w->total_cols); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4475 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4476 if (WINDOW_HAS_VERTICAL_SCROLL_BAR (w)) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4477 /* Scroll bars occupy a few columns. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4478 width -= WINDOW_CONFIG_SCROLL_BAR_COLS (w); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4479 else if (!FRAME_WINDOW_P (f) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4480 && !WINDOW_RIGHTMOST_P (w) && !WINDOW_FULL_WIDTH_P (w)) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4481 /* The column of `|' characters separating side-by-side windows |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4482 occupies one column only. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4483 width -= 1; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4484 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4485 if (FRAME_WINDOW_P (f)) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4486 /* On window-systems, fringes and display margins cannot be |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4487 used for normal text. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4488 width -= (WINDOW_FRINGE_COLS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4489 + WINDOW_LEFT_MARGIN_COLS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4490 + WINDOW_RIGHT_MARGIN_COLS (w)); |
16297
701db778b7a4
(Fwindow_edges): Use new WINDOW_RIGHT_EDGE macro.
Richard M. Stallman <rms@gnu.org>
parents:
16208
diff
changeset
|
4491 |
701db778b7a4
(Fwindow_edges): Use new WINDOW_RIGHT_EDGE macro.
Richard M. Stallman <rms@gnu.org>
parents:
16208
diff
changeset
|
4492 return width; |
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4493 } |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4494 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4495 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4496 /************************************************************************ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4497 Window Scrolling |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4498 ***********************************************************************/ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4499 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4500 /* Scroll contents of window WINDOW up. If WHOLE is non-zero, scroll |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
4501 N screen-fulls, which is defined as the height of the window minus |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4502 next_screen_context_lines. If WHOLE is zero, scroll up N lines |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4503 instead. Negative values of N mean scroll down. NOERROR non-zero |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4504 means don't signal an error if we try to move over BEGV or ZV, |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4505 respectively. */ |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4506 |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4507 static void |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4508 window_scroll (window, n, whole, noerror) |
265 | 4509 Lisp_Object window; |
4510 int n; | |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4511 int whole; |
522 | 4512 int noerror; |
265 | 4513 { |
47865
22b1643144e9
(window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents:
47567
diff
changeset
|
4514 immediate_quit = 1; |
22b1643144e9
(window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents:
47567
diff
changeset
|
4515 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4516 /* If we must, use the pixel-based version which is much slower than |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4517 the line-based one but can handle varying line heights. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4518 if (FRAME_WINDOW_P (XFRAME (XWINDOW (window)->frame))) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4519 window_scroll_pixel_based (window, n, whole, noerror); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4520 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4521 window_scroll_line_based (window, n, whole, noerror); |
47865
22b1643144e9
(window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents:
47567
diff
changeset
|
4522 |
22b1643144e9
(window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents:
47567
diff
changeset
|
4523 immediate_quit = 0; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4524 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4525 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4526 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4527 /* Implementation of window_scroll that works based on pixel line |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4528 heights. See the comment of window_scroll for parameter |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4529 descriptions. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4530 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4531 static void |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4532 window_scroll_pixel_based (window, n, whole, noerror) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4533 Lisp_Object window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4534 int n; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4535 int whole; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4536 int noerror; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4537 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4538 struct it it; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4539 struct window *w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4540 struct text_pos start; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4541 Lisp_Object tem; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4542 int this_scroll_margin; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4543 int preserve_y; |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4544 /* True if we fiddled the window vscroll field without really scrolling. */ |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4545 int vscrolled = 0; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4546 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4547 SET_TEXT_POS_FROM_MARKER (start, w->start); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4548 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4549 /* If PT is not visible in WINDOW, move back one half of |
38830
a6f5dfd3e5f4
(window_scroll_pixel_based): Don't recenter if
Gerd Moellmann <gerd@gnu.org>
parents:
38722
diff
changeset
|
4550 the screen. Allow PT to be partially visible, otherwise |
a6f5dfd3e5f4
(window_scroll_pixel_based): Don't recenter if
Gerd Moellmann <gerd@gnu.org>
parents:
38722
diff
changeset
|
4551 something like (scroll-down 1) with PT in the line before |
a6f5dfd3e5f4
(window_scroll_pixel_based): Don't recenter if
Gerd Moellmann <gerd@gnu.org>
parents:
38722
diff
changeset
|
4552 the partially visible one would recenter. */ |
a6f5dfd3e5f4
(window_scroll_pixel_based): Don't recenter if
Gerd Moellmann <gerd@gnu.org>
parents:
38722
diff
changeset
|
4553 tem = Fpos_visible_in_window_p (make_number (PT), window, Qt); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4554 if (NILP (tem)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4555 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4556 /* Move backward half the height of the window. Performance note: |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4557 vmotion used here is about 10% faster, but would give wrong |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4558 results for variable height lines. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4559 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4560 it.current_y = it.last_visible_y; |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
4561 move_it_vertically_backward (&it, window_box_height (w) / 2); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4562 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4563 /* The function move_iterator_vertically may move over more than |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4564 the specified y-distance. If it->w is small, e.g. a |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4565 mini-buffer window, we may end up in front of the window's |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4566 display area. This is the case when Start displaying at the |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4567 start of the line containing PT in this case. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4568 if (it.current_y <= 0) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4569 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4570 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID); |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
4571 move_it_vertically_backward (&it, 0); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4572 it.current_y = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4573 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4574 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4575 start = it.current.pos; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4576 } |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4577 else if (auto_window_vscroll_p) |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4578 { |
59700
c401b93db575
* window.c (Fpos_visible_in_window_p): Simplify return value for
Kim F. Storm <storm@cua.dk>
parents:
59695
diff
changeset
|
4579 if (tem = XCAR (XCDR (XCDR (tem))), CONSP (tem)) |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4580 { |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4581 int px; |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4582 int dy = WINDOW_FRAME_LINE_HEIGHT (w); |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4583 if (whole) |
59717
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4584 dy = max ((window_box_height (w) |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4585 - next_screen_context_lines * dy), |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4586 dy); |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4587 dy *= n; |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4588 |
59700
c401b93db575
* window.c (Fpos_visible_in_window_p): Simplify return value for
Kim F. Storm <storm@cua.dk>
parents:
59695
diff
changeset
|
4589 if (n < 0 && (px = XINT (XCAR (tem))) > 0) |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4590 { |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4591 px = max (0, -w->vscroll - min (px, -dy)); |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4592 Fset_window_vscroll (window, make_number (px), Qt); |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4593 return; |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4594 } |
59700
c401b93db575
* window.c (Fpos_visible_in_window_p): Simplify return value for
Kim F. Storm <storm@cua.dk>
parents:
59695
diff
changeset
|
4595 if (n > 0 && (px = XINT (XCDR (tem))) > 0) |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4596 { |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4597 px = max (0, -w->vscroll + min (px, dy)); |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4598 Fset_window_vscroll (window, make_number (px), Qt); |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4599 return; |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4600 } |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4601 } |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4602 Fset_window_vscroll (window, make_number (0), Qt); |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4603 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4604 |
58083 | 4605 /* If scroll_preserve_screen_position is non-nil, we try to set |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4606 point in the same window line as it is now, so get that line. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4607 if (!NILP (Vscroll_preserve_screen_position)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4608 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4609 start_display (&it, w, start); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4610 move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4611 preserve_y = it.current_y; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4612 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4613 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4614 preserve_y = -1; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4615 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4616 /* Move iterator it from start the specified distance forward or |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4617 backward. The result is the new window start. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4618 start_display (&it, w, start); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4619 if (whole) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4620 { |
59717
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4621 int start_pos = IT_CHARPOS (it); |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4622 int dy = WINDOW_FRAME_LINE_HEIGHT (w); |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4623 dy = max ((window_box_height (w) |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4624 - next_screen_context_lines * dy), |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4625 dy) * n; |
34717
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4626 |
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4627 /* Note that move_it_vertically always moves the iterator to the |
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4628 start of a line. So, if the last line doesn't have a newline, |
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4629 we would end up at the start of the line ending at ZV. */ |
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4630 if (dy <= 0) |
59717
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4631 { |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4632 move_it_vertically_backward (&it, -dy); |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4633 /* Ensure we actually does move, e.g. in case we are currently |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4634 looking at an image that is taller that the window height. */ |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4635 while (start_pos == IT_CHARPOS (it) |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4636 && start_pos > BEGV) |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4637 move_it_by_lines (&it, -1, 1); |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4638 } |
34717
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4639 else if (dy > 0) |
59695
75b50deae4e9
(window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents:
59677
diff
changeset
|
4640 { |
75b50deae4e9
(window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents:
59677
diff
changeset
|
4641 move_it_to (&it, ZV, -1, it.current_y + dy, -1, |
75b50deae4e9
(window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents:
59677
diff
changeset
|
4642 MOVE_TO_POS | MOVE_TO_Y); |
75b50deae4e9
(window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents:
59677
diff
changeset
|
4643 /* Ensure we actually does move, e.g. in case we are currently |
75b50deae4e9
(window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents:
59677
diff
changeset
|
4644 looking at an image that is taller that the window height. */ |
75b50deae4e9
(window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents:
59677
diff
changeset
|
4645 while (start_pos == IT_CHARPOS (it) |
75b50deae4e9
(window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents:
59677
diff
changeset
|
4646 && start_pos < ZV) |
75b50deae4e9
(window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents:
59677
diff
changeset
|
4647 move_it_by_lines (&it, 1, 1); |
75b50deae4e9
(window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents:
59677
diff
changeset
|
4648 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4649 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4650 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4651 move_it_by_lines (&it, n, 1); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4652 |
49011
594a08370cb3
(window_scroll_pixel_based): Partially undo last change.
Richard M. Stallman <rms@gnu.org>
parents:
48945
diff
changeset
|
4653 /* We failed if we find ZV is already on the screen (scrolling up, |
594a08370cb3
(window_scroll_pixel_based): Partially undo last change.
Richard M. Stallman <rms@gnu.org>
parents:
48945
diff
changeset
|
4654 means there's nothing past the end), or if we can't start any |
594a08370cb3
(window_scroll_pixel_based): Partially undo last change.
Richard M. Stallman <rms@gnu.org>
parents:
48945
diff
changeset
|
4655 earlier (scrolling down, means there's nothing past the top). */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4656 if ((n > 0 && IT_CHARPOS (it) == ZV) |
49011
594a08370cb3
(window_scroll_pixel_based): Partially undo last change.
Richard M. Stallman <rms@gnu.org>
parents:
48945
diff
changeset
|
4657 || (n < 0 && IT_CHARPOS (it) == CHARPOS (start))) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4658 { |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4659 if (IT_CHARPOS (it) == ZV) |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4660 { |
48945
a96801f68a82
(window_scroll_pixel_based): Fix check for reaching BEGV.
Richard M. Stallman <rms@gnu.org>
parents:
48927
diff
changeset
|
4661 if (it.current_y < it.last_visible_y |
a96801f68a82
(window_scroll_pixel_based): Fix check for reaching BEGV.
Richard M. Stallman <rms@gnu.org>
parents:
48927
diff
changeset
|
4662 && (it.current_y + it.max_ascent + it.max_descent |
a96801f68a82
(window_scroll_pixel_based): Fix check for reaching BEGV.
Richard M. Stallman <rms@gnu.org>
parents:
48927
diff
changeset
|
4663 >= it.last_visible_y)) |
35126
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4664 { |
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4665 /* The last line was only partially visible, make it fully |
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4666 visible. */ |
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4667 w->vscroll = (it.last_visible_y |
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4668 - it.current_y + it.max_ascent + it.max_descent); |
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4669 adjust_glyphs (it.f); |
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4670 } |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4671 else if (noerror) |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4672 return; |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4673 else |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4674 Fsignal (Qend_of_buffer, Qnil); |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4675 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4676 else |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4677 { |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4678 if (w->vscroll != 0) |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4679 /* The first line was only partially visible, make it fully |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4680 visible. */ |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4681 w->vscroll = 0; |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4682 else if (noerror) |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4683 return; |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4684 else |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4685 Fsignal (Qbeginning_of_buffer, Qnil); |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4686 } |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4687 |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4688 /* If control gets here, then we vscrolled. */ |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4689 |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4690 XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1; |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4691 |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4692 /* Don't try to change the window start below. */ |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4693 vscrolled = 1; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4694 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4695 |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4696 if (! vscrolled) |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4697 { |
45562
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
4698 int pos = IT_CHARPOS (it); |
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
4699 int bytepos; |
49836
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4700 |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4701 /* If in the middle of a multi-glyph character move forward to |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4702 the next character. */ |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4703 if (in_display_vector_p (&it)) |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4704 { |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4705 ++pos; |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4706 move_it_to (&it, pos, -1, -1, -1, MOVE_TO_POS); |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4707 } |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4708 |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4709 /* Set the window start, and set up the window for redisplay. */ |
45562
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
4710 set_marker_restricted (w->start, make_number (pos), |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4711 w->buffer); |
45562
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
4712 bytepos = XMARKER (w->start)->bytepos; |
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
4713 w->start_at_line_beg = ((pos == BEGV || FETCH_BYTE (bytepos - 1) == '\n') |
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
4714 ? Qt : Qnil); |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4715 w->update_mode_line = Qt; |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4716 XSETFASTINT (w->last_modified, 0); |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4717 XSETFASTINT (w->last_overlay_modified, 0); |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4718 /* Set force_start so that redisplay_window will run the |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4719 window-scroll-functions. */ |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4720 w->force_start = Qt; |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4721 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4722 |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
4723 /* The rest of this function uses current_y in a nonstandard way, |
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
4724 not including the height of the header line if any. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4725 it.current_y = it.vpos = 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4726 |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4727 /* Move PT out of scroll margins. |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4728 This code wants current_y to be zero at the window start position |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4729 even if there is a header line. */ |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4730 this_scroll_margin = max (0, scroll_margin); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4731 this_scroll_margin = min (this_scroll_margin, XFASTINT (w->total_lines) / 4); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4732 this_scroll_margin *= FRAME_LINE_HEIGHT (it.f); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4733 |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4734 if (n > 0) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4735 { |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4736 /* We moved the window start towards ZV, so PT may be now |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4737 in the scroll margin at the top. */ |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4738 move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4739 if (IT_CHARPOS (it) == PT && it.current_y >= this_scroll_margin) |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4740 /* We found PT at a legitimate height. Leave it alone. */ |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4741 ; |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4742 else if (preserve_y >= 0) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4743 { |
59342
132e8f3a36a1
(window_scroll_pixel_based): Don't correct preserve_y
Richard M. Stallman <rms@gnu.org>
parents:
59258
diff
changeset
|
4744 /* If we have a header line, take account of it. |
132e8f3a36a1
(window_scroll_pixel_based): Don't correct preserve_y
Richard M. Stallman <rms@gnu.org>
parents:
59258
diff
changeset
|
4745 This is necessary because we set it.current_y to 0, above. */ |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4746 if (WINDOW_WANTS_HEADER_LINE_P (w)) |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4747 preserve_y -= CURRENT_HEADER_LINE_HEIGHT (w); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4748 |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4749 move_it_to (&it, -1, -1, preserve_y, -1, MOVE_TO_Y); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4750 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4751 } |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4752 else |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4753 { |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4754 while (it.current_y < this_scroll_margin) |
44264
6bcf9f9c10df
(window_scroll_pixel_based): Exit the move_it_by_lines
Richard M. Stallman <rms@gnu.org>
parents:
44155
diff
changeset
|
4755 { |
6bcf9f9c10df
(window_scroll_pixel_based): Exit the move_it_by_lines
Richard M. Stallman <rms@gnu.org>
parents:
44155
diff
changeset
|
4756 int prev = it.current_y; |
6bcf9f9c10df
(window_scroll_pixel_based): Exit the move_it_by_lines
Richard M. Stallman <rms@gnu.org>
parents:
44155
diff
changeset
|
4757 move_it_by_lines (&it, 1, 1); |
6bcf9f9c10df
(window_scroll_pixel_based): Exit the move_it_by_lines
Richard M. Stallman <rms@gnu.org>
parents:
44155
diff
changeset
|
4758 if (prev == it.current_y) |
6bcf9f9c10df
(window_scroll_pixel_based): Exit the move_it_by_lines
Richard M. Stallman <rms@gnu.org>
parents:
44155
diff
changeset
|
4759 break; |
6bcf9f9c10df
(window_scroll_pixel_based): Exit the move_it_by_lines
Richard M. Stallman <rms@gnu.org>
parents:
44155
diff
changeset
|
4760 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4761 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4762 } |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4763 } |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4764 else if (n < 0) |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4765 { |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4766 int charpos, bytepos; |
60198
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4767 int partial_p; |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4768 |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4769 /* Save our position, for the preserve_y case. */ |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4770 charpos = IT_CHARPOS (it); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4771 bytepos = IT_BYTEPOS (it); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4772 |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4773 /* We moved the window start towards BEGV, so PT may be now |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4774 in the scroll margin at the bottom. */ |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4775 move_it_to (&it, PT, -1, |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4776 it.last_visible_y - this_scroll_margin - 1, -1, |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4777 MOVE_TO_POS | MOVE_TO_Y); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4778 |
60198
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4779 /* Save our position, in case it's correct. */ |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4780 charpos = IT_CHARPOS (it); |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4781 bytepos = IT_BYTEPOS (it); |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4782 |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4783 /* See if point is on a partially visible line at the end. */ |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4784 if (it.what == IT_EOB) |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4785 partial_p = it.current_y + it.ascent + it.descent > it.last_visible_y; |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4786 else |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4787 { |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4788 move_it_by_lines (&it, 1, 1); |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4789 partial_p = it.current_y > it.last_visible_y; |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4790 } |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4791 |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4792 if (charpos == PT && !partial_p) |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4793 /* We found PT before we found the display margin, so PT is ok. */ |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4794 ; |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4795 else if (preserve_y >= 0) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4796 { |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4797 SET_TEXT_POS_FROM_MARKER (start, w->start); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4798 start_display (&it, w, start); |
59342
132e8f3a36a1
(window_scroll_pixel_based): Don't correct preserve_y
Richard M. Stallman <rms@gnu.org>
parents:
59258
diff
changeset
|
4799 #if 0 /* It's wrong to subtract this here |
132e8f3a36a1
(window_scroll_pixel_based): Don't correct preserve_y
Richard M. Stallman <rms@gnu.org>
parents:
59258
diff
changeset
|
4800 because we called start_display again |
132e8f3a36a1
(window_scroll_pixel_based): Don't correct preserve_y
Richard M. Stallman <rms@gnu.org>
parents:
59258
diff
changeset
|
4801 and did not alter it.current_y this time. */ |
132e8f3a36a1
(window_scroll_pixel_based): Don't correct preserve_y
Richard M. Stallman <rms@gnu.org>
parents:
59258
diff
changeset
|
4802 |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4803 /* If we have a header line, take account of it. */ |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4804 if (WINDOW_WANTS_HEADER_LINE_P (w)) |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4805 preserve_y -= CURRENT_HEADER_LINE_HEIGHT (w); |
59342
132e8f3a36a1
(window_scroll_pixel_based): Don't correct preserve_y
Richard M. Stallman <rms@gnu.org>
parents:
59258
diff
changeset
|
4806 #endif |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4807 |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4808 move_it_to (&it, -1, -1, preserve_y, -1, MOVE_TO_Y); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4809 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4810 } |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4811 else |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4812 { |
60198
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4813 if (partial_p) |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4814 /* The last line was only partially visible, so back up two |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4815 lines to make sure we're on a fully visible line. */ |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4816 { |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4817 move_it_by_lines (&it, -2, 0); |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4818 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4819 } |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4820 else |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4821 /* No, the position we saved is OK, so use it. */ |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4822 SET_PT_BOTH (charpos, bytepos); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4823 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4824 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4825 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4826 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4827 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4828 /* Implementation of window_scroll that works based on screen lines. |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4829 See the comment of window_scroll for parameter descriptions. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4830 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4831 static void |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4832 window_scroll_line_based (window, n, whole, noerror) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4833 Lisp_Object window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4834 int n; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4835 int whole; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4836 int noerror; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4837 { |
265 | 4838 register struct window *w = XWINDOW (window); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4839 register int opoint = PT, opoint_byte = PT_BYTE; |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4840 register int pos, pos_byte; |
265 | 4841 register int ht = window_internal_height (w); |
4842 register Lisp_Object tem; | |
4843 int lose; | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4844 Lisp_Object bolp; |
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
|
4845 int startpos; |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4846 struct position posit; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4847 int original_vpos; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4848 |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
4849 /* If scrolling screen-fulls, compute the number of lines to |
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
4850 scroll from the window's height. */ |
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
4851 if (whole) |
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
4852 n *= max (1, ht - next_screen_context_lines); |
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
4853 |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4854 startpos = marker_position (w->start); |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4855 |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4856 posit = *compute_motion (startpos, 0, 0, 0, |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4857 PT, ht, 0, |
56585
f2ea7576ac6e
(window_scroll_line_based): Let compute_motion
Kim F. Storm <storm@cua.dk>
parents:
56542
diff
changeset
|
4858 -1, XINT (w->hscroll), |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4859 0, w); |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4860 original_vpos = posit.vpos; |
13102
960db92441d8
(window_scroll): Always set force_start.
Richard M. Stallman <rms@gnu.org>
parents:
12981
diff
changeset
|
4861 |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
4862 XSETFASTINT (tem, PT); |
32773
a7fdbf39d4de
(window_scroll_pixel_based, window_scroll_line_based):
Miles Bader <miles@gnu.org>
parents:
32752
diff
changeset
|
4863 tem = Fpos_visible_in_window_p (tem, window, Qnil); |
265 | 4864 |
485 | 4865 if (NILP (tem)) |
265 | 4866 { |
6341
dfc758dd2b08
(window_scroll, Fmove_to_window_line): Avoid dividing negative numbers,
Karl Heuer <kwzh@gnu.org>
parents:
6326
diff
changeset
|
4867 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
|
4868 startpos = PT; |
265 | 4869 } |
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
|
4870 |
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
|
4871 SET_PT (startpos); |
7347 | 4872 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
|
4873 Fvertical_motion (make_number (n), window); |
7347 | 4874 pos = PT; |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4875 pos_byte = PT_BYTE; |
265 | 4876 bolp = Fbolp (); |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4877 SET_PT_BOTH (opoint, opoint_byte); |
265 | 4878 |
4879 if (lose) | |
522 | 4880 { |
4881 if (noerror) | |
4882 return; | |
4883 else | |
4884 Fsignal (Qbeginning_of_buffer, Qnil); | |
4885 } | |
265 | 4886 |
4887 if (pos < ZV) | |
4888 { | |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4889 int this_scroll_margin = scroll_margin; |
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4890 |
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4891 /* 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
|
4892 if (this_scroll_margin < 0) |
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4893 this_scroll_margin = 0; |
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4894 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4895 if (XINT (w->total_lines) < 4 * scroll_margin) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4896 this_scroll_margin = XINT (w->total_lines) / 4; |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4897 |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4898 set_marker_restricted_both (w->start, w->buffer, pos, pos_byte); |
265 | 4899 w->start_at_line_beg = bolp; |
4900 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
|
4901 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
|
4902 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
|
4903 /* 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
|
4904 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
|
4905 w->force_start = Qt; |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4906 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4907 if (whole && !NILP (Vscroll_preserve_screen_position)) |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4908 { |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4909 SET_PT_BOTH (pos, pos_byte); |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4910 Fvertical_motion (make_number (original_vpos), window); |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4911 } |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4912 /* 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
|
4913 that it is outside the scroll margin. */ |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4914 else if (n > 0) |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4915 { |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4916 int top_margin; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4917 |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4918 if (this_scroll_margin > 0) |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4919 { |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4920 SET_PT_BOTH (pos, pos_byte); |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4921 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
|
4922 top_margin = PT; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4923 } |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4924 else |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4925 top_margin = pos; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4926 |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4927 if (top_margin <= opoint) |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4928 SET_PT_BOTH (opoint, opoint_byte); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4929 else if (!NILP (Vscroll_preserve_screen_position)) |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4930 { |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4931 SET_PT_BOTH (pos, pos_byte); |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4932 Fvertical_motion (make_number (original_vpos), window); |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4933 } |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
4934 else |
20046
8baac8399a29
(window_scroll): When scrolling forward and point is
Karl Heuer <kwzh@gnu.org>
parents:
19667
diff
changeset
|
4935 SET_PT (top_margin); |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4936 } |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4937 else if (n < 0) |
265 | 4938 { |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4939 int bottom_margin; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4940 |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4941 /* 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
|
4942 but not within the scroll margin. */ |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4943 SET_PT_BOTH (pos, pos_byte); |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4944 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
|
4945 if (XFASTINT (tem) == ht - this_scroll_margin) |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4946 bottom_margin = PT; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4947 else |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4948 bottom_margin = PT + 1; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4949 |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4950 if (bottom_margin > opoint) |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4951 SET_PT_BOTH (opoint, opoint_byte); |
265 | 4952 else |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4953 { |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4954 if (!NILP (Vscroll_preserve_screen_position)) |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
4955 { |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4956 SET_PT_BOTH (pos, pos_byte); |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
4957 Fvertical_motion (make_number (original_vpos), window); |
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
4958 } |
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
4959 else |
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
4960 Fvertical_motion (make_number (-1), window); |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4961 } |
265 | 4962 } |
4963 } | |
4964 else | |
522 | 4965 { |
4966 if (noerror) | |
4967 return; | |
4968 else | |
4969 Fsignal (Qend_of_buffer, Qnil); | |
4970 } | |
265 | 4971 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4972 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4973 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4974 /* Scroll selected_window up or down. If N is nil, scroll a |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4975 screen-full which is defined as the height of the window minus |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4976 next_screen_context_lines. If N is the symbol `-', scroll. |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4977 DIRECTION may be 1 meaning to scroll down, or -1 meaning to scroll |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4978 up. This is the guts of Fscroll_up and Fscroll_down. */ |
265 | 4979 |
4980 static void | |
4981 scroll_command (n, direction) | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4982 Lisp_Object n; |
265 | 4983 int direction; |
4984 { | |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46271
diff
changeset
|
4985 int count = SPECPDL_INDEX (); |
265 | 4986 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4987 xassert (abs (direction) == 1); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4988 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4989 /* If selected window's buffer isn't current, make it current for |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4990 the moment. But don't screw up if window_scroll gets an error. */ |
265 | 4991 if (XBUFFER (XWINDOW (selected_window)->buffer) != current_buffer) |
548 | 4992 { |
4993 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
4994 Fset_buffer (XWINDOW (selected_window)->buffer); | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4995 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4996 /* Make redisplay consider other windows than just selected_window. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4997 ++windows_or_buffers_changed; |
548 | 4998 } |
265 | 4999 |
485 | 5000 if (NILP (n)) |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5001 window_scroll (selected_window, direction, 1, 0); |
265 | 5002 else if (EQ (n, Qminus)) |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5003 window_scroll (selected_window, -direction, 1, 0); |
265 | 5004 else |
5005 { | |
5006 n = Fprefix_numeric_value (n); | |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5007 window_scroll (selected_window, XINT (n) * direction, 0, 0); |
265 | 5008 } |
548 | 5009 |
5010 unbind_to (count, Qnil); | |
265 | 5011 } |
5012 | |
5013 DEFUN ("scroll-up", Fscroll_up, Sscroll_up, 0, 1, "P", | |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
5014 doc: /* Scroll text of current window upward ARG lines. |
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
5015 If ARG is omitted or nil, scroll upward by a near full screen. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5016 A near full screen is `next-screen-context-lines' less than a full screen. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5017 Negative ARG means scroll downward. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5018 If ARG is the atom `-', scroll downward by nearly full screen. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5019 When calling from a program, supply as argument a number, nil, or `-'. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5020 (arg) |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5021 Lisp_Object arg; |
265 | 5022 { |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5023 scroll_command (arg, 1); |
265 | 5024 return Qnil; |
5025 } | |
5026 | |
5027 DEFUN ("scroll-down", Fscroll_down, Sscroll_down, 0, 1, "P", | |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
5028 doc: /* Scroll text of current window down ARG lines. |
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
5029 If ARG is omitted or nil, scroll down by a near full screen. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5030 A near full screen is `next-screen-context-lines' less than a full screen. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5031 Negative ARG means scroll upward. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5032 If ARG is the atom `-', scroll upward by nearly full screen. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5033 When calling from a program, supply as argument a number, nil, or `-'. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5034 (arg) |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5035 Lisp_Object arg; |
265 | 5036 { |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5037 scroll_command (arg, -1); |
265 | 5038 return Qnil; |
5039 } | |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5040 |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5041 DEFUN ("other-window-for-scrolling", Fother_window_for_scrolling, Sother_window_for_scrolling, 0, 0, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5042 doc: /* Return the other window for \"other window scroll\" commands. |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
5043 If `other-window-scroll-buffer' is non-nil, a window |
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
5044 showing that buffer is used. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5045 If in the minibuffer, `minibuffer-scroll-window' if non-nil |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
5046 specifies the window. This takes precedence over |
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
5047 `other-window-scroll-buffer'. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5048 () |
265 | 5049 { |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5050 Lisp_Object window; |
265 | 5051 |
5052 if (MINI_WINDOW_P (XWINDOW (selected_window)) | |
485 | 5053 && !NILP (Vminibuf_scroll_window)) |
265 | 5054 window = Vminibuf_scroll_window; |
5055 /* If buffer is specified, scroll that buffer. */ | |
485 | 5056 else if (!NILP (Vother_window_scroll_buffer)) |
265 | 5057 { |
5058 window = Fget_buffer_window (Vother_window_scroll_buffer, Qnil); | |
485 | 5059 if (NILP (window)) |
20867
fccf74829150
(Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
20777
diff
changeset
|
5060 window = Fdisplay_buffer (Vother_window_scroll_buffer, Qt, Qnil); |
265 | 5061 } |
5062 else | |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5063 { |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5064 /* 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
|
5065 frame. */ |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5066 window = Fnext_window (selected_window, Qnil, Qnil); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5067 |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5068 if (EQ (window, selected_window)) |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5069 /* 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
|
5070 visible frame. */ |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5071 do |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5072 window = Fnext_window (window, Qnil, Qt); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5073 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
|
5074 && ! EQ (window, selected_window)); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5075 } |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5076 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
5077 CHECK_LIVE_WINDOW (window); |
265 | 5078 |
5079 if (EQ (window, selected_window)) | |
5080 error ("There is no other window"); | |
5081 | |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5082 return window; |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5083 } |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5084 |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5085 DEFUN ("scroll-other-window", Fscroll_other_window, Sscroll_other_window, 0, 1, "P", |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5086 doc: /* Scroll next window upward ARG lines; or near full screen if no ARG. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5087 A near full screen is `next-screen-context-lines' less than a full screen. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5088 The next window is the one below the current one; or the one at the top |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5089 if the current one is at the bottom. Negative ARG means scroll downward. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5090 If ARG is the atom `-', scroll downward by nearly full screen. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5091 When calling from a program, supply as argument a number, nil, or `-'. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5092 |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
5093 If `other-window-scroll-buffer' is non-nil, scroll the window |
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
5094 showing that buffer, popping the buffer up if necessary. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5095 If in the minibuffer, `minibuffer-scroll-window' if non-nil |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
5096 specifies the window to scroll. This takes precedence over |
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
5097 `other-window-scroll-buffer'. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5098 (arg) |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5099 Lisp_Object arg; |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5100 { |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5101 Lisp_Object window; |
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5102 struct window *w; |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46271
diff
changeset
|
5103 int count = SPECPDL_INDEX (); |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5104 |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5105 window = Fother_window_for_scrolling (); |
265 | 5106 w = XWINDOW (window); |
5107 | |
5108 /* Don't screw up if window_scroll gets an error. */ | |
5109 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5110 ++windows_or_buffers_changed; |
265 | 5111 |
5112 Fset_buffer (w->buffer); | |
5113 SET_PT (marker_position (w->pointm)); | |
5114 | |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5115 if (NILP (arg)) |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5116 window_scroll (window, 1, 1, 1); |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5117 else if (EQ (arg, Qminus)) |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5118 window_scroll (window, -1, 1, 1); |
265 | 5119 else |
5120 { | |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5121 if (CONSP (arg)) |
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5122 arg = Fcar (arg); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
5123 CHECK_NUMBER (arg); |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5124 window_scroll (window, XINT (arg), 0, 1); |
265 | 5125 } |
5126 | |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5127 set_marker_both (w->pointm, Qnil, PT, PT_BYTE); |
1931
129d8225f748
* keyboard.c (recursive_edit_1, command_loop_1): Pass the proper
Jim Blandy <jimb@redhat.com>
parents:
1829
diff
changeset
|
5128 unbind_to (count, Qnil); |
265 | 5129 |
5130 return Qnil; | |
5131 } | |
5132 | |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5133 DEFUN ("scroll-left", Fscroll_left, Sscroll_left, 0, 2, "P\np", |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5134 doc: /* Scroll selected window display ARG columns left. |
40459
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
5135 Default for ARG is window width minus 2. |
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
5136 Value is the total amount of leftward horizontal scrolling in |
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
5137 effect after the change. |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5138 If SET_MINIMUM is non-nil, the new scroll amount becomes the |
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5139 lower bound for automatic scrolling, i.e. automatic scrolling |
40459
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
5140 will not scroll a window to a column less than the value returned |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5141 by this function. This happens in an interactive call. */) |
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5142 (arg, set_minimum) |
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5143 register Lisp_Object arg, set_minimum; |
265 | 5144 { |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5145 Lisp_Object result; |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5146 int hscroll; |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5147 struct window *w = XWINDOW (selected_window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5148 |
485 | 5149 if (NILP (arg)) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5150 XSETFASTINT (arg, window_box_text_cols (w) - 2); |
265 | 5151 else |
5152 arg = Fprefix_numeric_value (arg); | |
5153 | |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5154 hscroll = XINT (w->hscroll) + XINT (arg); |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5155 result = Fset_window_hscroll (selected_window, make_number (hscroll)); |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5156 |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5157 if (!NILP (set_minimum)) |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5158 w->min_hscroll = w->hscroll; |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5159 |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5160 return result; |
265 | 5161 } |
5162 | |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5163 DEFUN ("scroll-right", Fscroll_right, Sscroll_right, 0, 2, "P\np", |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5164 doc: /* Scroll selected window display ARG columns right. |
40459
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
5165 Default for ARG is window width minus 2. |
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
5166 Value is the total amount of leftward horizontal scrolling in |
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
5167 effect after the change. |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5168 If SET_MINIMUM is non-nil, the new scroll amount becomes the |
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5169 lower bound for automatic scrolling, i.e. automatic scrolling |
40459
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
5170 will not scroll a window to a column less than the value returned |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5171 by this function. This happens in an interactive call. */) |
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5172 (arg, set_minimum) |
57898
f85e0cc87926
(Fscroll_right): Fix last change.
Andreas Schwab <schwab@suse.de>
parents:
57874
diff
changeset
|
5173 register Lisp_Object arg, set_minimum; |
265 | 5174 { |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5175 Lisp_Object result; |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5176 int hscroll; |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5177 struct window *w = XWINDOW (selected_window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5178 |
485 | 5179 if (NILP (arg)) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5180 XSETFASTINT (arg, window_box_text_cols (w) - 2); |
265 | 5181 else |
5182 arg = Fprefix_numeric_value (arg); | |
5183 | |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5184 hscroll = XINT (w->hscroll) - XINT (arg); |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5185 result = Fset_window_hscroll (selected_window, make_number (hscroll)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5186 |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5187 if (!NILP (set_minimum)) |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5188 w->min_hscroll = w->hscroll; |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5189 |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5190 return result; |
265 | 5191 } |
5192 | |
43624
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5193 DEFUN ("minibuffer-selected-window", Fminibuffer_selected_window, Sminibuffer_selected_window, 0, 0, 0, |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5194 doc: /* Return the window which was selected when entering the minibuffer. |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5195 Returns nil, if current window is not a minibuffer window. */) |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5196 () |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5197 { |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5198 if (minibuf_level > 0 |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5199 && MINI_WINDOW_P (XWINDOW (selected_window)) |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5200 && WINDOW_LIVE_P (minibuf_selected_window)) |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5201 return minibuf_selected_window; |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5202 |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5203 return Qnil; |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5204 } |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5205 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5206 /* Value is the number of lines actually displayed in window W, |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5207 as opposed to its height. */ |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5208 |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5209 static int |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5210 displayed_window_lines (w) |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5211 struct window *w; |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5212 { |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5213 struct it it; |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5214 struct text_pos start; |
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
5215 int height = window_box_height (w); |
33059
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5216 struct buffer *old_buffer; |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5217 int bottom_y; |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5218 |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5219 if (XBUFFER (w->buffer) != current_buffer) |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5220 { |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5221 old_buffer = current_buffer; |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5222 set_buffer_internal (XBUFFER (w->buffer)); |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5223 } |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5224 else |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5225 old_buffer = NULL; |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5226 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5227 /* In case W->start is out of the accessible range, do something |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5228 reasonable. This happens in Info mode when Info-scroll-down |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5229 calls (recenter -1) while W->start is 1. */ |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5230 if (XMARKER (w->start)->charpos < BEGV) |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5231 SET_TEXT_POS (start, BEGV, BEGV_BYTE); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5232 else if (XMARKER (w->start)->charpos > ZV) |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5233 SET_TEXT_POS (start, ZV, ZV_BYTE); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5234 else |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5235 SET_TEXT_POS_FROM_MARKER (start, w->start); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5236 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5237 start_display (&it, w, start); |
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
5238 move_it_vertically (&it, height); |
36202
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5239 bottom_y = line_bottom_y (&it); |
34416
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5240 |
47234
ca48173ebf57
(displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents:
46410
diff
changeset
|
5241 /* rms: On a non-window display, |
ca48173ebf57
(displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents:
46410
diff
changeset
|
5242 the value of it.vpos at the bottom of the screen |
ca48173ebf57
(displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents:
46410
diff
changeset
|
5243 seems to be 1 larger than window_box_height (w). |
ca48173ebf57
(displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents:
46410
diff
changeset
|
5244 This kludge fixes a bug whereby (move-to-window-line -1) |
ca48173ebf57
(displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents:
46410
diff
changeset
|
5245 when ZV is on the last screen line |
ca48173ebf57
(displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents:
46410
diff
changeset
|
5246 moves to the previous screen line instead of the last one. */ |
ca48173ebf57
(displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents:
46410
diff
changeset
|
5247 if (! FRAME_WINDOW_P (XFRAME (w->frame))) |
ca48173ebf57
(displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents:
46410
diff
changeset
|
5248 height++; |
ca48173ebf57
(displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents:
46410
diff
changeset
|
5249 |
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
5250 /* Add in empty lines at the bottom of the window. */ |
33059
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5251 if (bottom_y < height) |
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
5252 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5253 int uy = FRAME_LINE_HEIGHT (it.f); |
36202
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5254 it.vpos += (height - bottom_y + uy - 1) / uy; |
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
5255 } |
34384
9669bb49fca2
(Fmove_to_window_line): Skip past any partially visible first line.
Miles Bader <miles@gnu.org>
parents:
34381
diff
changeset
|
5256 |
36202
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5257 if (old_buffer) |
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5258 set_buffer_internal (old_buffer); |
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5259 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5260 return it.vpos; |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5261 } |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5262 |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5263 |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5264 DEFUN ("recenter", Frecenter, Srecenter, 0, 1, "P", |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5265 doc: /* Center point in window and redisplay frame. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5266 With prefix argument ARG, recenter putting point on screen line ARG |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5267 relative to the current window. If ARG is negative, it counts up from the |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5268 bottom of the window. (ARG should be less than the height of the window.) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5269 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5270 If ARG is omitted or nil, erase the entire frame and then |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5271 redraw with point in the center of the current window. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5272 Just C-u as prefix means put point in the center of the window |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5273 and redisplay normally--don't erase and redraw the frame. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5274 (arg) |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5275 register Lisp_Object arg; |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5276 { |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5277 struct window *w = XWINDOW (selected_window); |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5278 struct buffer *buf = XBUFFER (w->buffer); |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5279 struct buffer *obuf = current_buffer; |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5280 int center_p = 0; |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5281 int charpos, bytepos; |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5282 |
42089
ca7101bea5ee
(Frecenter): Clear display_error_modiff field.
Richard M. Stallman <rms@gnu.org>
parents:
41980
diff
changeset
|
5283 /* If redisplay is suppressed due to an error, try again. */ |
ca7101bea5ee
(Frecenter): Clear display_error_modiff field.
Richard M. Stallman <rms@gnu.org>
parents:
41980
diff
changeset
|
5284 obuf->display_error_modiff = 0; |
ca7101bea5ee
(Frecenter): Clear display_error_modiff field.
Richard M. Stallman <rms@gnu.org>
parents:
41980
diff
changeset
|
5285 |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5286 if (NILP (arg)) |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5287 { |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5288 int i; |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5289 |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5290 /* Invalidate pixel data calculated for all compositions. */ |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5291 for (i = 0; i < n_compositions; i++) |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5292 composition_table[i]->font = NULL; |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5293 |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5294 Fredraw_frame (w->frame); |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5295 SET_FRAME_GARBAGED (XFRAME (WINDOW_FRAME (w))); |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5296 center_p = 1; |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5297 } |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5298 else if (CONSP (arg)) /* Just C-u. */ |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5299 center_p = 1; |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5300 else |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5301 { |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5302 arg = Fprefix_numeric_value (arg); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
5303 CHECK_NUMBER (arg); |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5304 } |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5305 |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5306 set_buffer_internal (buf); |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5307 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5308 /* Handle centering on a graphical frame specially. Such frames can |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5309 have variable-height lines and centering point on the basis of |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5310 line counts would lead to strange effects. */ |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5311 if (FRAME_WINDOW_P (XFRAME (w->frame))) |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5312 { |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5313 if (center_p) |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5314 { |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5315 struct it it; |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5316 struct text_pos pt; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5317 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5318 SET_TEXT_POS (pt, PT, PT_BYTE); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5319 start_display (&it, w, pt); |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5320 move_it_vertically_backward (&it, window_box_height (w) / 2); |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5321 charpos = IT_CHARPOS (it); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5322 bytepos = IT_BYTEPOS (it); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5323 } |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5324 else if (XINT (arg) < 0) |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5325 { |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5326 struct it it; |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5327 struct text_pos pt; |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5328 int nlines = - XINT (arg); |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5329 int extra_line_spacing; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5330 int h = window_box_height (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5331 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5332 SET_TEXT_POS (pt, PT, PT_BYTE); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5333 start_display (&it, w, pt); |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5334 |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5335 /* Be sure we have the exact height of the full line containing PT. */ |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5336 move_it_by_lines (&it, 0, 1); |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5337 |
38722
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
5338 /* The amount of pixels we have to move back is the window |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5339 height minus what's displayed in the line containing PT, |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5340 and the lines below. */ |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5341 it.current_y = 0; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5342 it.vpos = 0; |
38722
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
5343 move_it_by_lines (&it, nlines, 1); |
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
5344 |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5345 if (it.vpos == nlines) |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5346 h -= it.current_y; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5347 else |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5348 { |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5349 /* Last line has no newline */ |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5350 h -= line_bottom_y (&it); |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5351 it.vpos++; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5352 } |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5353 |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5354 /* Don't reserve space for extra line spacing of last line. */ |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5355 extra_line_spacing = it.max_extra_line_spacing; |
38722
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
5356 |
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
5357 /* If we can't move down NLINES lines because we hit |
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
5358 the end of the buffer, count in some empty lines. */ |
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
5359 if (it.vpos < nlines) |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5360 { |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5361 nlines -= it.vpos; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5362 extra_line_spacing = it.extra_line_spacing; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5363 h -= nlines * (FRAME_LINE_HEIGHT (it.f) + extra_line_spacing); |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5364 } |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5365 if (h <= 0) |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5366 return Qnil; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5367 |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5368 /* Now find the new top line (starting position) of the window. */ |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5369 start_display (&it, w, pt); |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5370 it.current_y = 0; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5371 move_it_vertically_backward (&it, h); |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5372 |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5373 /* If extra line spacing is present, we may move too far |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5374 back. This causes the last line to be only partially |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5375 visible (which triggers redisplay to recenter that line |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5376 in the middle), so move forward. |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5377 But ignore extra line spacing on last line, as it is not |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5378 considered to be part of the visible height of the line. |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5379 */ |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5380 h += extra_line_spacing; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5381 while (-it.current_y > h) |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5382 move_it_by_lines (&it, 1, 1); |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5383 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5384 charpos = IT_CHARPOS (it); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5385 bytepos = IT_BYTEPOS (it); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5386 } |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5387 else |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5388 { |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5389 struct position pos; |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5390 pos = *vmotion (PT, - XINT (arg), w); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5391 charpos = pos.bufpos; |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5392 bytepos = pos.bytepos; |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5393 } |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5394 } |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5395 else |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5396 { |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5397 struct position pos; |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5398 int ht = window_internal_height (w); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5399 |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5400 if (center_p) |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5401 arg = make_number (ht / 2); |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5402 else if (XINT (arg) < 0) |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5403 arg = make_number (XINT (arg) + ht); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5404 |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5405 pos = *vmotion (PT, - XINT (arg), w); |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5406 charpos = pos.bufpos; |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5407 bytepos = pos.bytepos; |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5408 } |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5409 |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5410 /* Set the new window start. */ |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5411 set_marker_both (w->start, w->buffer, charpos, bytepos); |
35024
4ab60becd588
(Frecenter): When changing the window start, set the
Gerd Moellmann <gerd@gnu.org>
parents:
35020
diff
changeset
|
5412 w->window_end_valid = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5413 |
46108
7b8b4ec9573c
(Frecenter): With arg, set optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
46021
diff
changeset
|
5414 w->optional_new_start = Qt; |
7b8b4ec9573c
(Frecenter): With arg, set optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
46021
diff
changeset
|
5415 |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5416 if (bytepos == BEGV_BYTE || FETCH_BYTE (bytepos - 1) == '\n') |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5417 w->start_at_line_beg = Qt; |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5418 else |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5419 w->start_at_line_beg = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5420 |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5421 set_buffer_internal (obuf); |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5422 return Qnil; |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5423 } |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5424 |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5425 |
34416
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5426 DEFUN ("window-text-height", Fwindow_text_height, Swindow_text_height, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5427 0, 1, 0, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5428 doc: /* Return the height in lines of the text display area of WINDOW. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5429 This doesn't include the mode-line (or header-line if any) or any |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5430 partial-height lines in the text display area. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5431 (window) |
34416
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5432 Lisp_Object window; |
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5433 { |
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5434 struct window *w = decode_window (window); |
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5435 int pixel_height = window_box_height (w); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5436 int line_height = pixel_height / FRAME_LINE_HEIGHT (XFRAME (w->frame)); |
34416
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5437 return make_number (line_height); |
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5438 } |
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5439 |
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5440 |
265 | 5441 |
5442 DEFUN ("move-to-window-line", Fmove_to_window_line, Smove_to_window_line, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5443 1, 1, "P", |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5444 doc: /* Position point relative to window. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5445 With no argument, position point at center of window. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5446 An argument specifies vertical position within the window; |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5447 zero means top of window, negative means relative to bottom of window. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5448 (arg) |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5449 Lisp_Object arg; |
265 | 5450 { |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5451 struct window *w = XWINDOW (selected_window); |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5452 int lines, start; |
6326
5e662ad3f594
(Fdelete_other_windows): Pass new arg to Fvertical_motion.
Richard M. Stallman <rms@gnu.org>
parents:
6269
diff
changeset
|
5453 Lisp_Object window; |
265 | 5454 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5455 window = selected_window; |
265 | 5456 start = marker_position (w->start); |
5457 if (start < BEGV || start > ZV) | |
5458 { | |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5459 int height = window_internal_height (w); |
6341
dfc758dd2b08
(window_scroll, Fmove_to_window_line): Avoid dividing negative numbers,
Karl Heuer <kwzh@gnu.org>
parents:
6326
diff
changeset
|
5460 Fvertical_motion (make_number (- (height / 2)), window); |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5461 set_marker_both (w->start, w->buffer, PT, PT_BYTE); |
265 | 5462 w->start_at_line_beg = Fbolp (); |
5463 w->force_start = Qt; | |
5464 } | |
5465 else | |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5466 Fgoto_char (w->start); |
265 | 5467 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5468 lines = displayed_window_lines (w); |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5469 if (NILP (arg)) |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5470 XSETFASTINT (arg, lines / 2); |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5471 else |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5472 { |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5473 arg = Fprefix_numeric_value (arg); |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5474 if (XINT (arg) < 0) |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5475 XSETINT (arg, XINT (arg) + lines); |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5476 } |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5477 |
36202
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5478 /* Skip past a partially visible first line. */ |
34384
9669bb49fca2
(Fmove_to_window_line): Skip past any partially visible first line.
Miles Bader <miles@gnu.org>
parents:
34381
diff
changeset
|
5479 if (w->vscroll) |
9669bb49fca2
(Fmove_to_window_line): Skip past any partially visible first line.
Miles Bader <miles@gnu.org>
parents:
34381
diff
changeset
|
5480 XSETINT (arg, XINT (arg) + 1); |
9669bb49fca2
(Fmove_to_window_line): Skip past any partially visible first line.
Miles Bader <miles@gnu.org>
parents:
34381
diff
changeset
|
5481 |
6326
5e662ad3f594
(Fdelete_other_windows): Pass new arg to Fvertical_motion.
Richard M. Stallman <rms@gnu.org>
parents:
6269
diff
changeset
|
5482 return Fvertical_motion (arg, window); |
265 | 5483 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5484 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5485 |
265 | 5486 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5487 /*********************************************************************** |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5488 Window Configuration |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5489 ***********************************************************************/ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5490 |
265 | 5491 struct save_window_data |
5492 { | |
15712
a272ccf6c225
(struct save_window_data, struct saved_window): First
Karl Heuer <kwzh@gnu.org>
parents:
15385
diff
changeset
|
5493 EMACS_INT size_from_Lisp_Vector_struct; |
265 | 5494 struct Lisp_Vector *next_from_Lisp_Vector_struct; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5495 Lisp_Object frame_cols, frame_lines, frame_menu_bar_lines; |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25540
diff
changeset
|
5496 Lisp_Object frame_tool_bar_lines; |
1325
f03e559aac3e
* window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents:
1280
diff
changeset
|
5497 Lisp_Object selected_frame; |
265 | 5498 Lisp_Object current_window; |
5499 Lisp_Object current_buffer; | |
5500 Lisp_Object minibuf_scroll_window; | |
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
5501 Lisp_Object minibuf_selected_window; |
265 | 5502 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
|
5503 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
|
5504 /* 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
|
5505 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
|
5506 Lisp_Object min_width, min_height; |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5507 /* A vector, each of whose elements is a struct saved_window |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5508 for one window. */ |
265 | 5509 Lisp_Object saved_windows; |
5510 }; | |
1326
709532b86646
* window.c (SAVE_WINDOW_DATA_SIZE): Define this using sizeof,
Jim Blandy <jimb@redhat.com>
parents:
1325
diff
changeset
|
5511 |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5512 /* This is saved as a Lisp_Vector */ |
265 | 5513 struct saved_window |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5514 { |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5515 /* these first two must agree with struct Lisp_Vector in lisp.h */ |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5516 EMACS_INT size_from_Lisp_Vector_struct; |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5517 struct Lisp_Vector *next_from_Lisp_Vector_struct; |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5518 |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5519 Lisp_Object window; |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5520 Lisp_Object buffer, start, pointm, mark; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5521 Lisp_Object left_col, top_line, total_cols, total_lines; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5522 Lisp_Object hscroll, min_hscroll; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5523 Lisp_Object parent, prev; |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5524 Lisp_Object start_at_line_beg; |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5525 Lisp_Object display_table; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5526 Lisp_Object orig_top_line, orig_total_lines; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5527 Lisp_Object left_margin_cols, right_margin_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5528 Lisp_Object left_fringe_width, right_fringe_width, fringes_outside_margins; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5529 Lisp_Object scroll_bar_width, vertical_scroll_bar_type; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5530 }; |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5531 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5532 #define SAVED_WINDOW_VECTOR_SIZE 24 /* Arg to Fmake_vector */ |
265 | 5533 |
5534 #define SAVED_WINDOW_N(swv,n) \ | |
5535 ((struct saved_window *) (XVECTOR ((swv)->contents[(n)]))) | |
5536 | |
5537 DEFUN ("window-configuration-p", Fwindow_configuration_p, Swindow_configuration_p, 1, 1, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5538 doc: /* Return t if OBJECT is a window-configuration object. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5539 (object) |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5540 Lisp_Object object; |
265 | 5541 { |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5542 if (WINDOW_CONFIGURATIONP (object)) |
265 | 5543 return Qt; |
5544 return Qnil; | |
5545 } | |
5546 | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5547 DEFUN ("window-configuration-frame", Fwindow_configuration_frame, Swindow_configuration_frame, 1, 1, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5548 doc: /* Return the frame that CONFIG, a window-configuration object, is about. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5549 (config) |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5550 Lisp_Object config; |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5551 { |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5552 register struct save_window_data *data; |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5553 struct Lisp_Vector *saved_windows; |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5554 |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5555 if (! WINDOW_CONFIGURATIONP (config)) |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5556 wrong_type_argument (Qwindow_configuration_p, config); |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5557 |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5558 data = (struct save_window_data *) XVECTOR (config); |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5559 saved_windows = XVECTOR (data->saved_windows); |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5560 return XWINDOW (SAVED_WINDOW_N (saved_windows, 0)->window)->frame; |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5561 } |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5562 |
2297
bb88d48c290f
(Fselect_window): Use Fhandle_switch_frame.
Richard M. Stallman <rms@gnu.org>
parents:
2210
diff
changeset
|
5563 DEFUN ("set-window-configuration", Fset_window_configuration, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5564 Sset_window_configuration, 1, 1, 0, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5565 doc: /* Set the configuration of windows and buffers as specified by CONFIGURATION. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5566 CONFIGURATION must be a value previously returned |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5567 by `current-window-configuration' (which see). |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5568 If CONFIGURATION was made from a frame that is now deleted, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5569 only frame-independent values can be restored. In this case, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5570 the return value is nil. Otherwise the value is t. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5571 (configuration) |
1016
817b0ce337d7
* window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents:
983
diff
changeset
|
5572 Lisp_Object configuration; |
265 | 5573 { |
5574 register struct save_window_data *data; | |
5575 struct Lisp_Vector *saved_windows; | |
5576 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
|
5577 Lisp_Object frame; |
769 | 5578 FRAME_PTR f; |
45835
aab759361c24
(Fset_window_configuration): Explicitly preserve
Richard M. Stallman <rms@gnu.org>
parents:
45645
diff
changeset
|
5579 int old_point = -1; |
265 | 5580 |
9105
984a4b1be1d1
(Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents:
9028
diff
changeset
|
5581 while (!WINDOW_CONFIGURATIONP (configuration)) |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5582 wrong_type_argument (Qwindow_configuration_p, configuration); |
265 | 5583 |
1016
817b0ce337d7
* window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents:
983
diff
changeset
|
5584 data = (struct save_window_data *) XVECTOR (configuration); |
265 | 5585 saved_windows = XVECTOR (data->saved_windows); |
5586 | |
5587 new_current_buffer = data->current_buffer; | |
485 | 5588 if (NILP (XBUFFER (new_current_buffer)->name)) |
265 | 5589 new_current_buffer = Qnil; |
45835
aab759361c24
(Fset_window_configuration): Explicitly preserve
Richard M. Stallman <rms@gnu.org>
parents:
45645
diff
changeset
|
5590 else |
48898
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
5591 { |
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
5592 if (XBUFFER (new_current_buffer) == current_buffer) |
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
5593 old_point = PT; |
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
5594 else |
61511
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5595 /* BUF_PT (XBUFFER (new_current_buffer)) gives us the position of |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5596 point in new_current_buffer as of the last time this buffer was |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5597 used. This can be non-deterministic since it can be changed by |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5598 things like jit-lock by mere temporary selection of some random |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5599 window that happens to show this buffer. |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5600 So if possible we want this arbitrary choice of "which point" to |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5601 be the one from the to-be-selected-window so as to prevent this |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5602 window's cursor from being copied from another window. */ |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5603 if (EQ (XWINDOW (data->current_window)->buffer, new_current_buffer) |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5604 /* If current_window = selected_window, its point is in BUF_PT. */ |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5605 && !EQ (selected_window, data->current_window)) |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5606 old_point = XMARKER (XWINDOW (data->current_window)->pointm)->charpos; |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5607 else |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5608 old_point = BUF_PT (XBUFFER (new_current_buffer)); |
48898
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
5609 } |
265 | 5610 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5611 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
|
5612 f = XFRAME (frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5613 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5614 /* 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
|
5615 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
|
5616 if (FRAME_LIVE_P (f)) |
265 | 5617 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5618 register struct window *w; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5619 register struct saved_window *p; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5620 struct window *root_window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5621 struct window **leaf_windows; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5622 int n_leaf_windows; |
33277
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5623 int k, i, n; |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5624 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5625 /* 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
|
5626 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
|
5627 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
|
5628 back. We keep track of the prevailing height in these variables. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5629 int previous_frame_lines = FRAME_LINES (f); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5630 int previous_frame_cols = FRAME_COLS (f); |
6099
19eaf70457d4
(Fset_window_configuration): Allow for menu-bar-lines to have changed since
Karl Heuer <kwzh@gnu.org>
parents:
5990
diff
changeset
|
5631 int previous_frame_menu_bar_lines = FRAME_MENU_BAR_LINES (f); |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25540
diff
changeset
|
5632 int previous_frame_tool_bar_lines = FRAME_TOOL_BAR_LINES (f); |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5633 |
18657 | 5634 /* The mouse highlighting code could get screwed up |
5635 if it runs during this. */ | |
5636 BLOCK_INPUT; | |
5637 | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5638 if (XFASTINT (data->frame_lines) != previous_frame_lines |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5639 || XFASTINT (data->frame_cols) != previous_frame_cols) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5640 change_frame_size (f, XFASTINT (data->frame_lines), |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5641 XFASTINT (data->frame_cols), 0, 0, 0); |
16051
ccf489f8596e
Removed support for !MULTI_FRAME.
Karl Heuer <kwzh@gnu.org>
parents:
16039
diff
changeset
|
5642 #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
|
5643 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
|
5644 != previous_frame_menu_bar_lines) |
21533
b7df83bf15ff
(Fset_window_configuration): Fix mixing of Lisp_Object
Andreas Schwab <schwab@suse.de>
parents:
21514
diff
changeset
|
5645 x_set_menu_bar_lines (f, data->frame_menu_bar_lines, make_number (0)); |
25115
2105537c5916
(Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25044
diff
changeset
|
5646 #ifdef HAVE_WINDOW_SYSTEM |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25540
diff
changeset
|
5647 if (XFASTINT (data->frame_tool_bar_lines) |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25540
diff
changeset
|
5648 != previous_frame_tool_bar_lines) |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25540
diff
changeset
|
5649 x_set_tool_bar_lines (f, data->frame_tool_bar_lines, make_number (0)); |
6852
5cc78dd8efc3
(Fset_window_configuration): Only call X fns if HAVE_X_WINDOWS.
Karl Heuer <kwzh@gnu.org>
parents:
6851
diff
changeset
|
5650 #endif |
25115
2105537c5916
(Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25044
diff
changeset
|
5651 #endif |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5652 |
61444 | 5653 /* "Swap out" point from the selected window's buffer |
5654 into the window itself. (Normally the pointm of the selected | |
5655 window holds garbage.) We do this now, before | |
27869
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
5656 restoring the window contents, and prevent it from |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
5657 being done later on when we select a new window. */ |
20627
0753fa7a67f3
(Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents:
20535
diff
changeset
|
5658 if (! NILP (XWINDOW (selected_window)->buffer)) |
0753fa7a67f3
(Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents:
20535
diff
changeset
|
5659 { |
0753fa7a67f3
(Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents:
20535
diff
changeset
|
5660 w = XWINDOW (selected_window); |
0753fa7a67f3
(Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents:
20535
diff
changeset
|
5661 set_marker_both (w->pointm, |
0753fa7a67f3
(Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents:
20535
diff
changeset
|
5662 w->buffer, |
0753fa7a67f3
(Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents:
20535
diff
changeset
|
5663 BUF_PT (XBUFFER (w->buffer)), |
0753fa7a67f3
(Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents:
20535
diff
changeset
|
5664 BUF_PT_BYTE (XBUFFER (w->buffer))); |
0753fa7a67f3
(Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents:
20535
diff
changeset
|
5665 } |
0753fa7a67f3
(Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents:
20535
diff
changeset
|
5666 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5667 windows_or_buffers_changed++; |
10666
e1dfb47b664e
(Fdelete_window, set_window_height, set_window_width)
Richard M. Stallman <rms@gnu.org>
parents:
10461
diff
changeset
|
5668 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
|
5669 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5670 /* Problem: Freeing all matrices and later allocating them again |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5671 is a serious redisplay flickering problem. What we would |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5672 really like to do is to free only those matrices not reused |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5673 below. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5674 root_window = XWINDOW (FRAME_ROOT_WINDOW (f)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5675 leaf_windows |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5676 = (struct window **) alloca (count_windows (root_window) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5677 * sizeof (struct window *)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5678 n_leaf_windows = get_leaf_windows (root_window, leaf_windows, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5679 |
8931
c64388cd7346
(struct saved_window_data): New slots min_width, min_height.
Richard M. Stallman <rms@gnu.org>
parents:
8536
diff
changeset
|
5680 /* 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
|
5681 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
|
5682 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
|
5683 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
|
5684 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5685 /* Kludge Alert! |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5686 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
|
5687 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
|
5688 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5689 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
|
5690 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
|
5691 dead. */ |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5692 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
|
5693 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5694 for (k = 0; k < saved_windows->size; k++) |
265 | 5695 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5696 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
|
5697 w = XWINDOW (p->window); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5698 w->next = Qnil; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5699 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5700 if (!NILP (p->parent)) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5701 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
|
5702 XFASTINT (p->parent))->window; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5703 else |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5704 w->parent = Qnil; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5705 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5706 if (!NILP (p->prev)) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5707 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5708 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
|
5709 XFASTINT (p->prev))->window; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5710 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
|
5711 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5712 else |
265 | 5713 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5714 w->prev = Qnil; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5715 if (!NILP (w->parent)) |
265 | 5716 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5717 if (EQ (p->total_cols, XWINDOW (w->parent)->total_cols)) |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5718 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5719 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
|
5720 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
|
5721 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5722 else |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5723 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5724 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
|
5725 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
|
5726 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5727 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5728 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5729 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5730 /* 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
|
5731 restore it now. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5732 if (BUFFERP (w->total_lines)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5733 w->buffer = w->total_lines; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5734 w->left_col = p->left_col; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5735 w->top_line = p->top_line; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5736 w->total_cols = p->total_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5737 w->total_lines = p->total_lines; |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5738 w->hscroll = p->hscroll; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5739 w->min_hscroll = p->min_hscroll; |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5740 w->display_table = p->display_table; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5741 w->orig_top_line = p->orig_top_line; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5742 w->orig_total_lines = p->orig_total_lines; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5743 w->left_margin_cols = p->left_margin_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5744 w->right_margin_cols = p->right_margin_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5745 w->left_fringe_width = p->left_fringe_width; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5746 w->right_fringe_width = p->right_fringe_width; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5747 w->fringes_outside_margins = p->fringes_outside_margins; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5748 w->scroll_bar_width = p->scroll_bar_width; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5749 w->vertical_scroll_bar_type = p->vertical_scroll_bar_type; |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
5750 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
|
5751 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
|
5752 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5753 /* 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
|
5754 if (NILP (p->buffer)) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5755 w->buffer = p->buffer; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5756 else |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5757 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5758 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
|
5759 /* 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
|
5760 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5761 w->buffer = p->buffer; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5762 w->start_at_line_beg = p->start_at_line_beg; |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5763 set_marker_restricted (w->start, p->start, w->buffer); |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5764 set_marker_restricted (w->pointm, p->pointm, w->buffer); |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5765 Fset_marker (XBUFFER (w->buffer)->mark, |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5766 p->mark, w->buffer); |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5767 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5768 /* As documented in Fcurrent_window_configuration, don't |
45584
5fd12f9027a3
(Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents:
45562
diff
changeset
|
5769 restore the location of point in the buffer which was |
5fd12f9027a3
(Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents:
45562
diff
changeset
|
5770 current 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
|
5771 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
|
5772 && 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
|
5773 Fgoto_char (w->pointm); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5774 } |
3535
581c09f72dbd
(Fset_window_configuration): If a window is supposed
Richard M. Stallman <rms@gnu.org>
parents:
3354
diff
changeset
|
5775 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
|
5776 /* 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
|
5777 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5778 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
|
5779 /* 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
|
5780 range. */ |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5781 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
|
5782 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
|
5783 w->start_at_line_beg = Qt; |
265 | 5784 } |
5785 else | |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5786 /* 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
|
5787 are real. */ |
265 | 5788 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5789 /* 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
|
5790 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
|
5791 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
|
5792 w->buffer); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5793 if (XMARKER (w->pointm)->buffer == 0) |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5794 set_marker_restricted_both (w->pointm, w->buffer, |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5795 BUF_PT (XBUFFER (w->buffer)), |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5796 BUF_PT_BYTE (XBUFFER (w->buffer))); |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5797 w->start_at_line_beg = Qt; |
265 | 5798 } |
5799 } | |
5800 } | |
1237
3929b2135e58
* window.c (delete_all_subwindows): Save the window's buffer in
Jim Blandy <jimb@redhat.com>
parents:
1123
diff
changeset
|
5801 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5802 FRAME_ROOT_WINDOW (f) = data->root_window; |
27869
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
5803 /* Prevent "swapping out point" in the old selected window |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
5804 using the buffer that has been restored into it. |
61444 | 5805 We already swapped out point that from that window's old buffer. */ |
27869
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
5806 selected_window = Qnil; |
61444 | 5807 |
5808 /* Arrange *not* to restore point in the buffer that was | |
5809 current when the window configuration was saved. */ | |
45584
5fd12f9027a3
(Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents:
45562
diff
changeset
|
5810 if (EQ (XWINDOW (data->current_window)->buffer, new_current_buffer)) |
5fd12f9027a3
(Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents:
45562
diff
changeset
|
5811 set_marker_restricted (XWINDOW (data->current_window)->pointm, |
45880
8108a2dd551c
(Fset_window_configuration): Lisp_Object/int mixup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45835
diff
changeset
|
5812 make_number (old_point), |
45584
5fd12f9027a3
(Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents:
45562
diff
changeset
|
5813 XWINDOW (data->current_window)->buffer); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5814 |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
5815 Fselect_window (data->current_window, Qnil); |
17678
c13cd575945a
(Fset_window_configuration): Set last_selected_window
Richard M. Stallman <rms@gnu.org>
parents:
17628
diff
changeset
|
5816 XBUFFER (XWINDOW (selected_window)->buffer)->last_selected_window |
c13cd575945a
(Fset_window_configuration): Set last_selected_window
Richard M. Stallman <rms@gnu.org>
parents:
17628
diff
changeset
|
5817 = selected_window; |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5818 |
1716
95db936d47c0
* keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents:
1685
diff
changeset
|
5819 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
|
5820 || (FRAMEP (data->focus_frame) |
1716
95db936d47c0
* keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents:
1685
diff
changeset
|
5821 && FRAME_LIVE_P (XFRAME (data->focus_frame)))) |
95db936d47c0
* keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents:
1685
diff
changeset
|
5822 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
|
5823 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5824 #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
|
5825 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
|
5826 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
|
5827 do_switch_frame (WINDOW_FRAME (XWINDOW (data->root_window)), |
36809
126bac1a4495
(Fset_window_configuration): Change call to
Gerd Moellmann <gerd@gnu.org>
parents:
36635
diff
changeset
|
5828 0, 0); |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5829 #endif |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5830 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5831 /* Set the screen height to the value it had before this function. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5832 if (previous_frame_lines != FRAME_LINES (f) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5833 || previous_frame_cols != FRAME_COLS (f)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5834 change_frame_size (f, previous_frame_lines, previous_frame_cols, |
25356
5db69f7aadca
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25315
diff
changeset
|
5835 0, 0, 0); |
16051
ccf489f8596e
Removed support for !MULTI_FRAME.
Karl Heuer <kwzh@gnu.org>
parents:
16039
diff
changeset
|
5836 #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
|
5837 if (previous_frame_menu_bar_lines != FRAME_MENU_BAR_LINES (f)) |
21533
b7df83bf15ff
(Fset_window_configuration): Fix mixing of Lisp_Object
Andreas Schwab <schwab@suse.de>
parents:
21514
diff
changeset
|
5838 x_set_menu_bar_lines (f, make_number (previous_frame_menu_bar_lines), |
b7df83bf15ff
(Fset_window_configuration): Fix mixing of Lisp_Object
Andreas Schwab <schwab@suse.de>
parents:
21514
diff
changeset
|
5839 make_number (0)); |
25115
2105537c5916
(Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25044
diff
changeset
|
5840 #ifdef HAVE_WINDOW_SYSTEM |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25540
diff
changeset
|
5841 if (previous_frame_tool_bar_lines != FRAME_TOOL_BAR_LINES (f)) |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25540
diff
changeset
|
5842 x_set_tool_bar_lines (f, make_number (previous_frame_tool_bar_lines), |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25540
diff
changeset
|
5843 make_number (0)); |
6852
5cc78dd8efc3
(Fset_window_configuration): Only call X fns if HAVE_X_WINDOWS.
Karl Heuer <kwzh@gnu.org>
parents:
6851
diff
changeset
|
5844 #endif |
25115
2105537c5916
(Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25044
diff
changeset
|
5845 #endif |
18657 | 5846 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5847 /* Now, free glyph matrices in windows that were not reused. */ |
33277
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5848 for (i = n = 0; i < n_leaf_windows; ++i) |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5849 { |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5850 if (NILP (leaf_windows[i]->buffer)) |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5851 { |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5852 /* Assert it's not reused as a combination. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5853 xassert (NILP (leaf_windows[i]->hchild) |
33277
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5854 && NILP (leaf_windows[i]->vchild)); |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5855 free_window_matrices (leaf_windows[i]); |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5856 } |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5857 else if (EQ (leaf_windows[i]->buffer, new_current_buffer)) |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5858 ++n; |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5859 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5860 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5861 adjust_glyphs (f); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5862 |
18657 | 5863 UNBLOCK_INPUT; |
21198
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
5864 |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
5865 /* Fselect_window will have made f the selected frame, so we |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
5866 reselect the proper frame here. Fhandle_switch_frame will change the |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
5867 selected window too, but that doesn't make the call to |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
5868 Fselect_window above totally superfluous; it still sets f's |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
5869 selected window. */ |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
5870 if (FRAME_LIVE_P (XFRAME (data->selected_frame))) |
36809
126bac1a4495
(Fset_window_configuration): Change call to
Gerd Moellmann <gerd@gnu.org>
parents:
36635
diff
changeset
|
5871 do_switch_frame (data->selected_frame, 0, 0); |
21198
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
5872 |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
5873 if (! NILP (Vwindow_configuration_change_hook) |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
5874 && ! NILP (Vrun_hooks)) |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
5875 call1 (Vrun_hooks, Qwindow_configuration_change_hook); |
265 | 5876 } |
5877 | |
1325
f03e559aac3e
* window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents:
1280
diff
changeset
|
5878 if (!NILP (new_current_buffer)) |
45584
5fd12f9027a3
(Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents:
45562
diff
changeset
|
5879 Fset_buffer (new_current_buffer); |
1325
f03e559aac3e
* window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents:
1280
diff
changeset
|
5880 |
21198
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
5881 /* Restore the minimum heights recorded in the configuration. */ |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
5882 window_min_height = XINT (data->min_height); |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
5883 window_min_width = XINT (data->min_width); |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
5884 |
265 | 5885 Vminibuf_scroll_window = data->minibuf_scroll_window; |
43594
23cddac4d0b7
(minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents:
43571
diff
changeset
|
5886 minibuf_selected_window = data->minibuf_selected_window; |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
5887 |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5888 return (FRAME_LIVE_P (f) ? Qt : Qnil); |
265 | 5889 } |
5890 | |
769 | 5891 /* Mark all windows now on frame as deleted |
265 | 5892 by setting their buffers to nil. */ |
5893 | |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5894 void |
265 | 5895 delete_all_subwindows (w) |
5896 register struct window *w; | |
5897 { | |
485 | 5898 if (!NILP (w->next)) |
265 | 5899 delete_all_subwindows (XWINDOW (w->next)); |
485 | 5900 if (!NILP (w->vchild)) |
265 | 5901 delete_all_subwindows (XWINDOW (w->vchild)); |
485 | 5902 if (!NILP (w->hchild)) |
265 | 5903 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
|
5904 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5905 w->total_lines = w->buffer; /* See Fset_window_configuration for excuse. */ |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
5906 |
16068
b19129a8c644
(unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
5907 if (!NILP (w->buffer)) |
b19129a8c644
(unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
5908 unshow_buffer (w); |
b19129a8c644
(unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
5909 |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
5910 /* 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
|
5911 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
|
5912 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
|
5913 vchild or hchild set. */ |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
5914 w->buffer = Qnil; |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
5915 w->vchild = Qnil; |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
5916 w->hchild = Qnil; |
30045
ff2db81c11c1
(delete_all_subwindows): Reset Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents:
30039
diff
changeset
|
5917 |
ff2db81c11c1
(delete_all_subwindows): Reset Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents:
30039
diff
changeset
|
5918 Vwindow_list = Qnil; |
265 | 5919 } |
5920 | |
5921 static int | |
5922 count_windows (window) | |
5923 register struct window *window; | |
5924 { | |
5925 register int count = 1; | |
485 | 5926 if (!NILP (window->next)) |
265 | 5927 count += count_windows (XWINDOW (window->next)); |
485 | 5928 if (!NILP (window->vchild)) |
265 | 5929 count += count_windows (XWINDOW (window->vchild)); |
485 | 5930 if (!NILP (window->hchild)) |
265 | 5931 count += count_windows (XWINDOW (window->hchild)); |
5932 return count; | |
5933 } | |
5934 | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5935 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5936 /* Fill vector FLAT with leaf windows under W, starting at index I. |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5937 Value is last index + 1. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5938 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5939 static int |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5940 get_leaf_windows (w, flat, i) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5941 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5942 struct window **flat; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5943 int i; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5944 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5945 while (w) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5946 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5947 if (!NILP (w->hchild)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5948 i = get_leaf_windows (XWINDOW (w->hchild), flat, i); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5949 else if (!NILP (w->vchild)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5950 i = get_leaf_windows (XWINDOW (w->vchild), flat, i); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5951 else |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5952 flat[i++] = w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5953 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5954 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5955 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5956 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5957 return i; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5958 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5959 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5960 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5961 /* Return a pointer to the glyph W's physical cursor is on. Value is |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5962 null if W's current matrix is invalid, so that no meaningfull glyph |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5963 can be returned. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5964 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5965 struct glyph * |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5966 get_phys_cursor_glyph (w) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5967 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5968 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5969 struct glyph_row *row; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5970 struct glyph *glyph; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5971 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5972 if (w->phys_cursor.vpos >= 0 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5973 && w->phys_cursor.vpos < w->current_matrix->nrows |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5974 && (row = MATRIX_ROW (w->current_matrix, w->phys_cursor.vpos), |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5975 row->enabled_p) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5976 && row->used[TEXT_AREA] > w->phys_cursor.hpos) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5977 glyph = row->glyphs[TEXT_AREA] + w->phys_cursor.hpos; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5978 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5979 glyph = NULL; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5980 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5981 return glyph; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5982 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5983 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5984 |
265 | 5985 static int |
5986 save_window_save (window, vector, i) | |
5987 Lisp_Object window; | |
5988 struct Lisp_Vector *vector; | |
5989 int i; | |
5990 { | |
5991 register struct saved_window *p; | |
5992 register struct window *w; | |
5993 register Lisp_Object tem; | |
5994 | |
485 | 5995 for (;!NILP (window); window = w->next) |
265 | 5996 { |
5997 p = SAVED_WINDOW_N (vector, i); | |
5998 w = XWINDOW (window); | |
5999 | |
58265
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
6000 XSETFASTINT (w->temslot, i); i++; |
265 | 6001 p->window = window; |
6002 p->buffer = w->buffer; | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6003 p->left_col = w->left_col; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6004 p->top_line = w->top_line; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6005 p->total_cols = w->total_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6006 p->total_lines = w->total_lines; |
265 | 6007 p->hscroll = w->hscroll; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
6008 p->min_hscroll = w->min_hscroll; |
265 | 6009 p->display_table = w->display_table; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6010 p->orig_top_line = w->orig_top_line; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6011 p->orig_total_lines = w->orig_total_lines; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6012 p->left_margin_cols = w->left_margin_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6013 p->right_margin_cols = w->right_margin_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6014 p->left_fringe_width = w->left_fringe_width; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6015 p->right_fringe_width = w->right_fringe_width; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6016 p->fringes_outside_margins = w->fringes_outside_margins; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6017 p->scroll_bar_width = w->scroll_bar_width; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6018 p->vertical_scroll_bar_type = w->vertical_scroll_bar_type; |
485 | 6019 if (!NILP (w->buffer)) |
265 | 6020 { |
6021 /* Save w's value of point in the window configuration. | |
6022 If w is the selected window, then get the value of point | |
6023 from the buffer; pointm is garbage in the selected window. */ | |
6024 if (EQ (window, selected_window)) | |
6025 { | |
6026 p->pointm = Fmake_marker (); | |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
6027 set_marker_both (p->pointm, w->buffer, |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
6028 BUF_PT (XBUFFER (w->buffer)), |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
6029 BUF_PT_BYTE (XBUFFER (w->buffer))); |
265 | 6030 } |
6031 else | |
12981
7a540e9cb21a
(save_window_save): Pass the new arg to Fcopy_marker.
Richard M. Stallman <rms@gnu.org>
parents:
12643
diff
changeset
|
6032 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
|
6033 |
7a540e9cb21a
(save_window_save): Pass the new arg to Fcopy_marker.
Richard M. Stallman <rms@gnu.org>
parents:
12643
diff
changeset
|
6034 p->start = Fcopy_marker (w->start, Qnil); |
265 | 6035 p->start_at_line_beg = w->start_at_line_beg; |
6036 | |
6037 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
|
6038 p->mark = Fcopy_marker (tem, Qnil); |
265 | 6039 } |
6040 else | |
6041 { | |
6042 p->pointm = Qnil; | |
6043 p->start = Qnil; | |
6044 p->mark = Qnil; | |
6045 p->start_at_line_beg = Qnil; | |
6046 } | |
6047 | |
485 | 6048 if (NILP (w->parent)) |
265 | 6049 p->parent = Qnil; |
6050 else | |
6051 p->parent = XWINDOW (w->parent)->temslot; | |
6052 | |
485 | 6053 if (NILP (w->prev)) |
265 | 6054 p->prev = Qnil; |
6055 else | |
6056 p->prev = XWINDOW (w->prev)->temslot; | |
6057 | |
485 | 6058 if (!NILP (w->vchild)) |
265 | 6059 i = save_window_save (w->vchild, vector, i); |
485 | 6060 if (!NILP (w->hchild)) |
265 | 6061 i = save_window_save (w->hchild, vector, i); |
6062 } | |
6063 | |
6064 return i; | |
6065 } | |
6066 | |
16485
9b919c5464a4
Reorganize function definitions so etags finds them.
Erik Naggum <erik@naggum.no>
parents:
16392
diff
changeset
|
6067 DEFUN ("current-window-configuration", Fcurrent_window_configuration, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6068 Scurrent_window_configuration, 0, 1, 0, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6069 doc: /* Return an object representing the current window configuration of FRAME. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6070 If FRAME is nil or omitted, use the selected frame. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6071 This describes the number of windows, their sizes and current buffers, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6072 and for each displayed buffer, where display starts, and the positions of |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6073 point and mark. An exception is made for point in the current buffer: |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6074 its value is -not- saved. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6075 This also records the currently selected frame, and FRAME's focus |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6076 redirection (see `redirect-frame-focus'). */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6077 (frame) |
769 | 6078 Lisp_Object frame; |
265 | 6079 { |
6080 register Lisp_Object tem; | |
6081 register int n_windows; | |
6082 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
|
6083 register struct Lisp_Vector *vec; |
265 | 6084 register int i; |
769 | 6085 FRAME_PTR f; |
265 | 6086 |
769 | 6087 if (NILP (frame)) |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6088 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
6089 CHECK_LIVE_FRAME (frame); |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6090 f = XFRAME (frame); |
358 | 6091 |
769 | 6092 n_windows = count_windows (XWINDOW (FRAME_ROOT_WINDOW (f))); |
36432
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
6093 vec = allocate_other_vector (VECSIZE (struct save_window_data)); |
9974
5cda62e4222a
(Fcurrent_window_configuration): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9970
diff
changeset
|
6094 data = (struct save_window_data *)vec; |
5cda62e4222a
(Fcurrent_window_configuration): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9970
diff
changeset
|
6095 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6096 XSETFASTINT (data->frame_cols, FRAME_COLS (f)); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6097 XSETFASTINT (data->frame_lines, FRAME_LINES (f)); |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
6098 XSETFASTINT (data->frame_menu_bar_lines, FRAME_MENU_BAR_LINES (f)); |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25540
diff
changeset
|
6099 XSETFASTINT (data->frame_tool_bar_lines, FRAME_TOOL_BAR_LINES (f)); |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6100 data->selected_frame = selected_frame; |
769 | 6101 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
|
6102 XSETBUFFER (data->current_buffer, current_buffer); |
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
6103 data->minibuf_scroll_window = minibuf_level > 0 ? Vminibuf_scroll_window : Qnil; |
43594
23cddac4d0b7
(minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents:
43571
diff
changeset
|
6104 data->minibuf_selected_window = minibuf_level > 0 ? minibuf_selected_window : Qnil; |
769 | 6105 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
|
6106 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
|
6107 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
|
6108 XSETINT (data->min_width, window_min_width); |
265 | 6109 tem = Fmake_vector (make_number (n_windows), Qnil); |
6110 data->saved_windows = tem; | |
6111 for (i = 0; i < n_windows; i++) | |
6112 XVECTOR (tem)->contents[i] | |
6113 = Fmake_vector (make_number (SAVED_WINDOW_VECTOR_SIZE), Qnil); | |
34090
7721faa485ea
(struct saved_window): Add members orig_top and
Gerd Moellmann <gerd@gnu.org>
parents:
33957
diff
changeset
|
6114 save_window_save (FRAME_ROOT_WINDOW (f), XVECTOR (tem), 0); |
9282
f4fa46f6a032
(Fminibuffer_window, Fwindow_at, Fwindow_end, Fnext_window, Fprevious_window,
Karl Heuer <kwzh@gnu.org>
parents:
9243
diff
changeset
|
6115 XSETWINDOW_CONFIGURATION (tem, data); |
265 | 6116 return (tem); |
6117 } | |
6118 | |
6119 DEFUN ("save-window-excursion", Fsave_window_excursion, Ssave_window_excursion, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6120 0, UNEVALLED, 0, |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
6121 doc: /* Execute BODY, preserving window sizes and contents. |
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
6122 Return the value of the last form in BODY. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6123 Restore which buffer appears in which window, where display starts, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6124 and the value of point and mark for each window. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6125 Also restore the choice of selected window. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6126 Also restore which buffer is current. |
40144
b4ffca20829f
(Fsave_window_excursion): Add usage: string to doc string.
Miles Bader <miles@gnu.org>
parents:
40103
diff
changeset
|
6127 Does not restore the value of point in current buffer. |
b4ffca20829f
(Fsave_window_excursion): Add usage: string to doc string.
Miles Bader <miles@gnu.org>
parents:
40103
diff
changeset
|
6128 usage: (save-window-excursion BODY ...) */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6129 (args) |
265 | 6130 Lisp_Object args; |
6131 { | |
6132 register Lisp_Object val; | |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
6133 register int count = SPECPDL_INDEX (); |
265 | 6134 |
6135 record_unwind_protect (Fset_window_configuration, | |
358 | 6136 Fcurrent_window_configuration (Qnil)); |
265 | 6137 val = Fprogn (args); |
6138 return unbind_to (count, val); | |
6139 } | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6140 |
265 | 6141 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6142 /*********************************************************************** |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6143 Marginal Areas |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6144 ***********************************************************************/ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6145 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6146 DEFUN ("set-window-margins", Fset_window_margins, Sset_window_margins, |
27553
49dd86912d71
(Fset_window_margins): Don't make interactive. Doc fix.
Dave Love <fx@gnu.org>
parents:
26873
diff
changeset
|
6147 2, 3, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6148 doc: /* Set width of marginal areas of window WINDOW. |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
6149 If WINDOW is nil, set margins of the currently selected window. |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
6150 Second arg LEFT-WIDTH specifies the number of character cells to |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
6151 reserve for the left marginal area. Optional third arg RIGHT-WIDTH |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
6152 does the same for the right marginal area. A nil width parameter |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
6153 means no margin. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6154 (window, left, right) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6155 Lisp_Object window, left, right; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6156 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6157 struct window *w = decode_window (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6158 |
52852
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6159 /* Translate negative or zero widths to nil. |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6160 Margins that are too wide have to be checked elsewhere. */ |
52852
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6161 |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6162 if (!NILP (left)) |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6163 { |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6164 CHECK_NUMBER (left); |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6165 if (XINT (left) <= 0) |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6166 left = Qnil; |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6167 } |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6168 |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6169 if (!NILP (right)) |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6170 { |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6171 CHECK_NUMBER (right); |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6172 if (XINT (right) <= 0) |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6173 right = Qnil; |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6174 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6175 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6176 if (!EQ (w->left_margin_cols, left) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6177 || !EQ (w->right_margin_cols, right)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6178 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6179 w->left_margin_cols = left; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6180 w->right_margin_cols = right; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6181 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6182 adjust_window_margins (w); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6183 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6184 ++windows_or_buffers_changed; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6185 adjust_glyphs (XFRAME (WINDOW_FRAME (w))); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6186 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6187 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6188 return Qnil; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6189 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6190 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6191 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6192 DEFUN ("window-margins", Fwindow_margins, Swindow_margins, |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6193 0, 1, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6194 doc: /* Get width of marginal areas of window WINDOW. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6195 If WINDOW is omitted or nil, use the currently selected window. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6196 Value is a cons of the form (LEFT-WIDTH . RIGHT-WIDTH). |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6197 If a marginal area does not exist, its width will be returned |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6198 as nil. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6199 (window) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6200 Lisp_Object window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6201 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6202 struct window *w = decode_window (window); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6203 return Fcons (w->left_margin_cols, w->right_margin_cols); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6204 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6205 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6206 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6207 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6208 /*********************************************************************** |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6209 Fringes |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6210 ***********************************************************************/ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6211 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6212 DEFUN ("set-window-fringes", Fset_window_fringes, Sset_window_fringes, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6213 2, 4, 0, |
52853
91a9da753e30
(Fset_window_fringes): Clarify docstring.
Lute Kamstra <lute@gnu.org>
parents:
52852
diff
changeset
|
6214 doc: /* Set the fringe widths of window WINDOW. |
91a9da753e30
(Fset_window_fringes): Clarify docstring.
Lute Kamstra <lute@gnu.org>
parents:
52852
diff
changeset
|
6215 If WINDOW is nil, set the fringe widths of the currently selected |
91a9da753e30
(Fset_window_fringes): Clarify docstring.
Lute Kamstra <lute@gnu.org>
parents:
52852
diff
changeset
|
6216 window. |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
6217 Second arg LEFT-WIDTH specifies the number of pixels to reserve for |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
6218 the left fringe. Optional third arg RIGHT-WIDTH specifies the right |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
6219 fringe width. If a fringe width arg is nil, that means to use the |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
6220 frame's default fringe width. Default fringe widths can be set with |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
6221 the command `set-fringe-style'. |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
6222 If optional fourth arg OUTSIDE-MARGINS is non-nil, draw the fringes |
52853
91a9da753e30
(Fset_window_fringes): Clarify docstring.
Lute Kamstra <lute@gnu.org>
parents:
52852
diff
changeset
|
6223 outside of the display margins. By default, fringes are drawn between |
91a9da753e30
(Fset_window_fringes): Clarify docstring.
Lute Kamstra <lute@gnu.org>
parents:
52852
diff
changeset
|
6224 display marginal areas and the text area. */) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6225 (window, left, right, outside_margins) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6226 Lisp_Object window, left, right, outside_margins; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6227 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6228 struct window *w = decode_window (window); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6229 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6230 if (!NILP (left)) |
57309
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
6231 CHECK_NATNUM (left); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6232 if (!NILP (right)) |
57309
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
6233 CHECK_NATNUM (right); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6234 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6235 if (!EQ (w->left_fringe_width, left) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6236 || !EQ (w->right_fringe_width, right) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6237 || !EQ (w->fringes_outside_margins, outside_margins)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6238 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6239 w->left_fringe_width = left; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6240 w->right_fringe_width = right; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6241 w->fringes_outside_margins = outside_margins; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6242 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6243 adjust_window_margins (w); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6244 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6245 clear_glyph_matrix (w->current_matrix); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6246 w->window_end_valid = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6247 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6248 ++windows_or_buffers_changed; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6249 adjust_glyphs (XFRAME (WINDOW_FRAME (w))); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6250 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6251 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6252 return Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6253 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6254 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6255 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6256 DEFUN ("window-fringes", Fwindow_fringes, Swindow_fringes, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6257 0, 1, 0, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6258 doc: /* Get width of fringes of window WINDOW. |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6259 If WINDOW is omitted or nil, use the currently selected window. |
53927 | 6260 Value is a list of the form (LEFT-WIDTH RIGHT-WIDTH OUTSIDE-MARGINS). */) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6261 (window) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6262 Lisp_Object window; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6263 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6264 struct window *w = decode_window (window); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6265 return Fcons (make_number (WINDOW_LEFT_FRINGE_WIDTH (w)), |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6266 Fcons (make_number (WINDOW_RIGHT_FRINGE_WIDTH (w)), |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6267 Fcons ((WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) ? |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6268 Qt : Qnil), Qnil))); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6269 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6270 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6271 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6272 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6273 /*********************************************************************** |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6274 Scroll bars |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6275 ***********************************************************************/ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6276 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6277 DEFUN ("set-window-scroll-bars", Fset_window_scroll_bars, Sset_window_scroll_bars, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6278 2, 4, 0, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6279 doc: /* Set width and type of scroll bars of window WINDOW. |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6280 If window is nil, set scroll bars of the currently selected window. |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6281 Second parameter WIDTH specifies the pixel width for the scroll bar; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6282 this is automatically adjusted to a multiple of the frame column width. |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6283 Third parameter VERTICAL-TYPE specifies the type of the vertical scroll |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6284 bar: left, right, or nil. |
52565
26d1a4665f6c
(Fset_window_scroll_bars): Validate the value of `vertical_type'.
Masatake YAMATO <jet@gyve.org>
parents:
52560
diff
changeset
|
6285 If WIDTH is nil, use the frame's scroll-bar width. |
26d1a4665f6c
(Fset_window_scroll_bars): Validate the value of `vertical_type'.
Masatake YAMATO <jet@gyve.org>
parents:
52560
diff
changeset
|
6286 If TYPE is t, use the frame's scroll-bar type. */) |
51223
c1daf1c22f97
(Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents:
51207
diff
changeset
|
6287 (window, width, vertical_type, horizontal_type) |
c1daf1c22f97
(Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents:
51207
diff
changeset
|
6288 Lisp_Object window, width, vertical_type, horizontal_type; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6289 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6290 struct window *w = decode_window (window); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6291 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6292 if (!NILP (width)) |
58448
f3a76c43ac80
(Fset_window_scroll_bars): Don't use XINT if it isn't int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58441
diff
changeset
|
6293 { |
f3a76c43ac80
(Fset_window_scroll_bars): Don't use XINT if it isn't int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58441
diff
changeset
|
6294 CHECK_NATNUM (width); |
f3a76c43ac80
(Fset_window_scroll_bars): Don't use XINT if it isn't int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58441
diff
changeset
|
6295 |
f3a76c43ac80
(Fset_window_scroll_bars): Don't use XINT if it isn't int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58441
diff
changeset
|
6296 if (XINT (width) == 0) |
f3a76c43ac80
(Fset_window_scroll_bars): Don't use XINT if it isn't int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58441
diff
changeset
|
6297 vertical_type = Qnil; |
f3a76c43ac80
(Fset_window_scroll_bars): Don't use XINT if it isn't int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58441
diff
changeset
|
6298 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6299 |
52565
26d1a4665f6c
(Fset_window_scroll_bars): Validate the value of `vertical_type'.
Masatake YAMATO <jet@gyve.org>
parents:
52560
diff
changeset
|
6300 if (!(EQ (vertical_type, Qnil) |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6301 || EQ (vertical_type, Qleft) |
52565
26d1a4665f6c
(Fset_window_scroll_bars): Validate the value of `vertical_type'.
Masatake YAMATO <jet@gyve.org>
parents:
52560
diff
changeset
|
6302 || EQ (vertical_type, Qright) |
26d1a4665f6c
(Fset_window_scroll_bars): Validate the value of `vertical_type'.
Masatake YAMATO <jet@gyve.org>
parents:
52560
diff
changeset
|
6303 || EQ (vertical_type, Qt))) |
26d1a4665f6c
(Fset_window_scroll_bars): Validate the value of `vertical_type'.
Masatake YAMATO <jet@gyve.org>
parents:
52560
diff
changeset
|
6304 error ("Invalid type of vertical scroll bar"); |
26d1a4665f6c
(Fset_window_scroll_bars): Validate the value of `vertical_type'.
Masatake YAMATO <jet@gyve.org>
parents:
52560
diff
changeset
|
6305 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6306 if (!EQ (w->scroll_bar_width, width) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6307 || !EQ (w->vertical_scroll_bar_type, vertical_type)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6308 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6309 w->scroll_bar_width = width; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6310 w->vertical_scroll_bar_type = vertical_type; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6311 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6312 adjust_window_margins (w); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6313 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6314 clear_glyph_matrix (w->current_matrix); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6315 w->window_end_valid = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6316 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6317 ++windows_or_buffers_changed; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6318 adjust_glyphs (XFRAME (WINDOW_FRAME (w))); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6319 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6320 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6321 return Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6322 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6323 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6324 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6325 DEFUN ("window-scroll-bars", Fwindow_scroll_bars, Swindow_scroll_bars, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6326 0, 1, 0, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6327 doc: /* Get width and type of scroll bars of window WINDOW. |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6328 If WINDOW is omitted or nil, use the currently selected window. |
52560
9a8ad8b87f32
(Fwindow_scroll_bars): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
6329 Value is a list of the form (WIDTH COLS VERTICAL-TYPE HORIZONTAL-TYPE). |
9a8ad8b87f32
(Fwindow_scroll_bars): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
6330 If WIDTH is nil or TYPE is t, the window is using the frame's corresponding |
9a8ad8b87f32
(Fwindow_scroll_bars): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
6331 value. */) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6332 (window) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6333 Lisp_Object window; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6334 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6335 struct window *w = decode_window (window); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6336 return Fcons (make_number ((WINDOW_CONFIG_SCROLL_BAR_WIDTH (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6337 ? WINDOW_CONFIG_SCROLL_BAR_WIDTH (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6338 : WINDOW_SCROLL_BAR_AREA_WIDTH (w))), |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6339 Fcons (make_number (WINDOW_SCROLL_BAR_COLS (w)), |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6340 Fcons (w->vertical_scroll_bar_type, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6341 Fcons (Qnil, Qnil)))); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6342 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6343 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6344 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6345 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6346 /*********************************************************************** |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6347 Smooth scrolling |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6348 ***********************************************************************/ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6349 |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6350 DEFUN ("window-vscroll", Fwindow_vscroll, Swindow_vscroll, 0, 2, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6351 doc: /* Return the amount by which WINDOW is scrolled vertically. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6352 Use the selected window if WINDOW is nil or omitted. |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6353 Normally, value is a multiple of the canonical character height of WINDOW; |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6354 optional second arg PIXELS_P means value is measured in pixels. */) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6355 (window, pixels_p) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6356 Lisp_Object window, pixels_p; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6357 { |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6358 Lisp_Object result; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6359 struct frame *f; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6360 struct window *w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6361 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6362 if (NILP (window)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6363 window = selected_window; |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6364 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
6365 CHECK_WINDOW (window); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6366 w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6367 f = XFRAME (w->frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6368 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6369 if (FRAME_WINDOW_P (f)) |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6370 result = (NILP (pixels_p) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6371 ? FRAME_CANON_Y_FROM_PIXEL_Y (f, -w->vscroll) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6372 : make_number (-w->vscroll)); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6373 else |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6374 result = make_number (0); |
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6375 return result; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6376 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6377 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6378 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6379 DEFUN ("set-window-vscroll", Fset_window_vscroll, Sset_window_vscroll, |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6380 2, 3, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6381 doc: /* Set amount by which WINDOW should be scrolled vertically to VSCROLL. |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6382 WINDOW nil means use the selected window. Normally, VSCROLL is a |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6383 non-negative multiple of the canonical character height of WINDOW; |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
6384 optional third arg PIXELS_P non-nil means that VSCROLL is in pixels. |
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
6385 If PIXELS-P is nil, VSCROLL may have to be rounded so that it |
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
6386 corresponds to an integral number of pixels. The return value is the |
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
6387 result of this rounding. |
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
6388 If PIXELS-P is non-nil, the return value is VSCROLL. */) |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6389 (window, vscroll, pixels_p) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6390 Lisp_Object window, vscroll, pixels_p; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6391 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6392 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6393 struct frame *f; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6394 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6395 if (NILP (window)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6396 window = selected_window; |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6397 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
6398 CHECK_WINDOW (window); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
6399 CHECK_NUMBER_OR_FLOAT (vscroll); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6400 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6401 w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6402 f = XFRAME (w->frame); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6403 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6404 if (FRAME_WINDOW_P (f)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6405 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6406 int old_dy = w->vscroll; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6407 |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6408 w->vscroll = - (NILP (pixels_p) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6409 ? FRAME_LINE_HEIGHT (f) * XFLOATINT (vscroll) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6410 : XFLOATINT (vscroll)); |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6411 w->vscroll = min (w->vscroll, 0); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6412 |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6413 if (w->vscroll != old_dy) |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6414 { |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6415 /* Adjust glyph matrix of the frame if the virtual display |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6416 area becomes larger than before. */ |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6417 if (w->vscroll < 0 && w->vscroll < old_dy) |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6418 adjust_glyphs (f); |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6419 |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6420 /* Prevent redisplay shortcuts. */ |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6421 XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1; |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6422 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6423 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6424 |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6425 return Fwindow_vscroll (window, pixels_p); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6426 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6427 |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6428 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6429 /* Call FN for all leaf windows on frame F. FN is called with the |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6430 first argument being a pointer to the leaf window, and with |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6431 additional argument USER_DATA. Stops when FN returns 0. */ |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6432 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6433 void |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6434 foreach_window (f, fn, user_data) |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6435 struct frame *f; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6436 int (* fn) P_ ((struct window *, void *)); |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6437 void *user_data; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6438 { |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6439 foreach_window_1 (XWINDOW (FRAME_ROOT_WINDOW (f)), fn, user_data); |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6440 } |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6441 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6442 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6443 /* Helper function for foreach_window. Call FN for all leaf windows |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6444 reachable from W. FN is called with the first argument being a |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6445 pointer to the leaf window, and with additional argument USER_DATA. |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6446 Stop when FN returns 0. Value is 0 if stopped by FN. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6447 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6448 static int |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6449 foreach_window_1 (w, fn, user_data) |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6450 struct window *w; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6451 int (* fn) P_ ((struct window *, void *)); |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6452 void *user_data; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6453 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6454 int cont; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6455 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6456 for (cont = 1; w && cont;) |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6457 { |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6458 if (!NILP (w->hchild)) |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6459 cont = foreach_window_1 (XWINDOW (w->hchild), fn, user_data); |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6460 else if (!NILP (w->vchild)) |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6461 cont = foreach_window_1 (XWINDOW (w->vchild), fn, user_data); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6462 else |
30366
8dd313fc287d
(foreach_window_1): Fix typo reversing an if-condition.
Gerd Moellmann <gerd@gnu.org>
parents:
30362
diff
changeset
|
6463 cont = fn (w, user_data); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6464 |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6465 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6466 } |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6467 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6468 return cont; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6469 } |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6470 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6471 |
39952 | 6472 /* Freeze or unfreeze the window start of W unless it is a |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6473 mini-window or the selected window. FREEZE_P non-null means freeze |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6474 the window start. */ |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6475 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6476 static int |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6477 freeze_window_start (w, freeze_p) |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6478 struct window *w; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6479 void *freeze_p; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6480 { |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6481 if (w == XWINDOW (selected_window) |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6482 || MINI_WINDOW_P (w) |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6483 || (MINI_WINDOW_P (XWINDOW (selected_window)) |
28726
5f7ccec488b5
(freeze_window_start): Check that minibuffer scroll window isn't nil before
Ken Raeburn <raeburn@raeburn.org>
parents:
28505
diff
changeset
|
6484 && ! NILP (Vminibuf_scroll_window) |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6485 && w == XWINDOW (Vminibuf_scroll_window))) |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6486 freeze_p = NULL; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6487 |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6488 w->frozen_window_start_p = freeze_p != NULL; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6489 return 1; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6490 } |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6491 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6492 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6493 /* Freeze or unfreeze the window starts of all leaf windows on frame |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6494 F, except the selected window and a mini-window. FREEZE_P non-zero |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6495 means freeze the window start. */ |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6496 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6497 void |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6498 freeze_window_starts (f, freeze_p) |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6499 struct frame *f; |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6500 int freeze_p; |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6501 { |
31903
3e0a1f91c149
(freeze_window_starts): Construct last argument for
Gerd Moellmann <gerd@gnu.org>
parents:
31829
diff
changeset
|
6502 foreach_window (f, freeze_window_start, (void *) (freeze_p ? f : 0)); |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6503 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6504 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6505 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6506 /*********************************************************************** |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6507 Initialization |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6508 ***********************************************************************/ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6509 |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6510 /* Return 1 if window configurations C1 and C2 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6511 describe the same state of affairs. This is used by Fequal. */ |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6512 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6513 int |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6514 compare_window_configurations (c1, c2, ignore_positions) |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6515 Lisp_Object c1, c2; |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6516 int ignore_positions; |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6517 { |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6518 register struct save_window_data *d1, *d2; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6519 struct Lisp_Vector *sw1, *sw2; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6520 int i; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6521 |
28505
b5a7eb24964c
(compare_window_configurations): Signal an error
Gerd Moellmann <gerd@gnu.org>
parents:
28463
diff
changeset
|
6522 if (!WINDOW_CONFIGURATIONP (c1)) |
b5a7eb24964c
(compare_window_configurations): Signal an error
Gerd Moellmann <gerd@gnu.org>
parents:
28463
diff
changeset
|
6523 wrong_type_argument (Qwindow_configuration_p, c1); |
b5a7eb24964c
(compare_window_configurations): Signal an error
Gerd Moellmann <gerd@gnu.org>
parents:
28463
diff
changeset
|
6524 if (!WINDOW_CONFIGURATIONP (c2)) |
b5a7eb24964c
(compare_window_configurations): Signal an error
Gerd Moellmann <gerd@gnu.org>
parents:
28463
diff
changeset
|
6525 wrong_type_argument (Qwindow_configuration_p, c2); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6526 |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6527 d1 = (struct save_window_data *) XVECTOR (c1); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6528 d2 = (struct save_window_data *) XVECTOR (c2); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6529 sw1 = XVECTOR (d1->saved_windows); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6530 sw2 = XVECTOR (d2->saved_windows); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6531 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6532 if (! EQ (d1->frame_cols, d2->frame_cols)) |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6533 return 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6534 if (! EQ (d1->frame_lines, d2->frame_lines)) |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6535 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6536 if (! EQ (d1->frame_menu_bar_lines, d2->frame_menu_bar_lines)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6537 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6538 if (! EQ (d1->selected_frame, d2->selected_frame)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6539 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6540 /* Don't compare the current_window field directly. |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6541 Instead see w1_is_current and w2_is_current, below. */ |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6542 if (! EQ (d1->current_buffer, d2->current_buffer)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6543 return 0; |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6544 if (! ignore_positions) |
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
6545 { |
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
6546 if (! EQ (d1->minibuf_scroll_window, d2->minibuf_scroll_window)) |
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
6547 return 0; |
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
6548 if (! EQ (d1->minibuf_selected_window, d2->minibuf_selected_window)) |
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
6549 return 0; |
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
6550 } |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6551 /* Don't compare the root_window field. |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6552 We don't require the two configurations |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6553 to use the same window object, |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6554 and the two root windows must be equivalent |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6555 if everything else compares equal. */ |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6556 if (! EQ (d1->focus_frame, d2->focus_frame)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6557 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6558 if (! EQ (d1->min_width, d2->min_width)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6559 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6560 if (! EQ (d1->min_height, d2->min_height)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6561 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6562 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6563 /* Verify that the two confis have the same number of windows. */ |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6564 if (sw1->size != sw2->size) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6565 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6566 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6567 for (i = 0; i < sw1->size; i++) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6568 { |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6569 struct saved_window *p1, *p2; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6570 int w1_is_current, w2_is_current; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6571 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6572 p1 = SAVED_WINDOW_N (sw1, i); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6573 p2 = SAVED_WINDOW_N (sw2, i); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6574 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6575 /* Verify that the current windows in the two |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6576 configurations correspond to each other. */ |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6577 w1_is_current = EQ (d1->current_window, p1->window); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6578 w2_is_current = EQ (d2->current_window, p2->window); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6579 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6580 if (w1_is_current != w2_is_current) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6581 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6582 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6583 /* Verify that the corresponding windows do match. */ |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6584 if (! EQ (p1->buffer, p2->buffer)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6585 return 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6586 if (! EQ (p1->left_col, p2->left_col)) |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6587 return 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6588 if (! EQ (p1->top_line, p2->top_line)) |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6589 return 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6590 if (! EQ (p1->total_cols, p2->total_cols)) |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6591 return 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6592 if (! EQ (p1->total_lines, p2->total_lines)) |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6593 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6594 if (! EQ (p1->display_table, p2->display_table)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6595 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6596 if (! EQ (p1->parent, p2->parent)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6597 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6598 if (! EQ (p1->prev, p2->prev)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6599 return 0; |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6600 if (! ignore_positions) |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6601 { |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6602 if (! EQ (p1->hscroll, p2->hscroll)) |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6603 return 0; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
6604 if (!EQ (p1->min_hscroll, p2->min_hscroll)) |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
6605 return 0; |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6606 if (! EQ (p1->start_at_line_beg, p2->start_at_line_beg)) |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6607 return 0; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6608 if (NILP (Fequal (p1->start, p2->start))) |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6609 return 0; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6610 if (NILP (Fequal (p1->pointm, p2->pointm))) |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6611 return 0; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6612 if (NILP (Fequal (p1->mark, p2->mark))) |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6613 return 0; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6614 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6615 if (! EQ (p1->left_margin_cols, p2->left_margin_cols)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6616 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6617 if (! EQ (p1->right_margin_cols, p2->right_margin_cols)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6618 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6619 if (! EQ (p1->left_fringe_width, p2->left_fringe_width)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6620 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6621 if (! EQ (p1->right_fringe_width, p2->right_fringe_width)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6622 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6623 if (! EQ (p1->fringes_outside_margins, p2->fringes_outside_margins)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6624 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6625 if (! EQ (p1->scroll_bar_width, p2->scroll_bar_width)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6626 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6627 if (! EQ (p1->vertical_scroll_bar_type, p2->vertical_scroll_bar_type)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6628 return 0; |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6629 } |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6630 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6631 return 1; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6632 } |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6633 |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6634 DEFUN ("compare-window-configurations", Fcompare_window_configurations, |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6635 Scompare_window_configurations, 2, 2, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6636 doc: /* Compare two window configurations as regards the structure of windows. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6637 This function ignores details such as the values of point and mark |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6638 and scrolling positions. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6639 (x, y) |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6640 Lisp_Object x, y; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6641 { |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6642 if (compare_window_configurations (x, y, 1)) |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6643 return Qt; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6644 return Qnil; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6645 } |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6646 |
21514 | 6647 void |
265 | 6648 init_window_once () |
6649 { | |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6650 struct frame *f = make_terminal_frame (); |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6651 XSETFRAME (selected_frame, f); |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6652 Vterminal_frame = selected_frame; |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6653 minibuf_window = f->minibuffer_window; |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6654 selected_window = f->selected_window; |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6655 last_nonminibuf_frame = f; |
14445
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
6656 |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
6657 window_initialized = 1; |
265 | 6658 } |
6659 | |
21514 | 6660 void |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6661 init_window () |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6662 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6663 Vwindow_list = Qnil; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6664 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6665 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6666 void |
265 | 6667 syms_of_window () |
6668 { | |
25540
2b4bdd114899
(Qwindow_size_fixed): Replaces Qfixed_window_size.
Gerd Moellmann <gerd@gnu.org>
parents:
25517
diff
changeset
|
6669 Qwindow_size_fixed = intern ("window-size-fixed"); |
2b4bdd114899
(Qwindow_size_fixed): Replaces Qfixed_window_size.
Gerd Moellmann <gerd@gnu.org>
parents:
25517
diff
changeset
|
6670 staticpro (&Qwindow_size_fixed); |
61755
71259596d397
(window_size_fixed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
61635
diff
changeset
|
6671 Fset (Qwindow_size_fixed, Qnil); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6672 |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
6673 staticpro (&Qwindow_configuration_change_hook); |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
6674 Qwindow_configuration_change_hook |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
6675 = intern ("window-configuration-change-hook"); |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
6676 |
265 | 6677 Qwindowp = intern ("windowp"); |
6678 staticpro (&Qwindowp); | |
6679 | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
6680 Qwindow_configuration_p = intern ("window-configuration-p"); |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
6681 staticpro (&Qwindow_configuration_p); |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
6682 |
2210
22d78dbb3cc7
Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents:
2190
diff
changeset
|
6683 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
|
6684 staticpro (&Qwindow_live_p); |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
6685 |
11405
645e3883da72
(temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents:
11307
diff
changeset
|
6686 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
|
6687 staticpro (&Qtemp_buffer_show_hook); |
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
6688 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6689 staticpro (&Vwindow_list); |
43597
8097923cfe85
(syms_of_window): Initialize minibuf_selected_window.
Kim F. Storm <storm@cua.dk>
parents:
43594
diff
changeset
|
6690 |
8097923cfe85
(syms_of_window): Initialize minibuf_selected_window.
Kim F. Storm <storm@cua.dk>
parents:
43594
diff
changeset
|
6691 minibuf_selected_window = Qnil; |
43594
23cddac4d0b7
(minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents:
43571
diff
changeset
|
6692 staticpro (&minibuf_selected_window); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6693 |
265 | 6694 DEFVAR_LISP ("temp-buffer-show-function", &Vtemp_buffer_show_function, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6695 doc: /* Non-nil means call as function to display a help buffer. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6696 The function is called with one argument, the buffer to be displayed. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6697 Used by `with-output-to-temp-buffer'. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6698 If this function is used, then it must do the entire job of showing |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6699 the buffer; `temp-buffer-show-hook' is not run unless this function runs it. */); |
265 | 6700 Vtemp_buffer_show_function = Qnil; |
6701 | |
6702 DEFVAR_LISP ("display-buffer-function", &Vdisplay_buffer_function, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6703 doc: /* If non-nil, function to call to handle `display-buffer'. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6704 It will receive two args, the buffer and a flag which if non-nil means |
56393
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
6705 that the currently selected window is not acceptable. |
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
6706 It should choose or create a window, display the specified buffer in it, |
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
6707 and return the window. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6708 Commands such as `switch-to-buffer-other-window' and `find-file-other-window' |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6709 work using this function. */); |
265 | 6710 Vdisplay_buffer_function = Qnil; |
6711 | |
34261
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
6712 DEFVAR_LISP ("even-window-heights", &Veven_window_heights, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6713 doc: /* *If non-nil, `display-buffer' should even the window heights. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6714 If nil, `display-buffer' will leave the window configuration alone. */); |
34261
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
6715 Veven_window_heights = Qt; |
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
6716 |
265 | 6717 DEFVAR_LISP ("minibuffer-scroll-window", &Vminibuf_scroll_window, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6718 doc: /* Non-nil means it is the window that C-M-v in minibuffer should scroll. */); |
265 | 6719 Vminibuf_scroll_window = Qnil; |
6720 | |
43281
a4ea76de57c9
(Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents:
43241
diff
changeset
|
6721 DEFVAR_BOOL ("mode-line-in-non-selected-windows", &mode_line_in_non_selected_windows, |
43241
5558e7582f1f
(Vmode_line_in_non_selected_windows): New variable.
Kim F. Storm <storm@cua.dk>
parents:
42875
diff
changeset
|
6722 doc: /* Non-nil means to use `mode-line-inactive' face in non-selected windows. |
43281
a4ea76de57c9
(Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents:
43241
diff
changeset
|
6723 If the minibuffer is active, the `minibuffer-scroll-window' mode line |
a4ea76de57c9
(Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents:
43241
diff
changeset
|
6724 is displayed in the `mode-line' face. */); |
a4ea76de57c9
(Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents:
43241
diff
changeset
|
6725 mode_line_in_non_selected_windows = 1; |
43241
5558e7582f1f
(Vmode_line_in_non_selected_windows): New variable.
Kim F. Storm <storm@cua.dk>
parents:
42875
diff
changeset
|
6726 |
265 | 6727 DEFVAR_LISP ("other-window-scroll-buffer", &Vother_window_scroll_buffer, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6728 doc: /* If non-nil, this is a buffer and \\[scroll-other-window] should scroll its window. */); |
265 | 6729 Vother_window_scroll_buffer = Qnil; |
6730 | |
769 | 6731 DEFVAR_BOOL ("pop-up-frames", &pop_up_frames, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6732 doc: /* *Non-nil means `display-buffer' should make a separate frame. */); |
769 | 6733 pop_up_frames = 0; |
265 | 6734 |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6735 DEFVAR_BOOL ("auto-window-vscroll", &auto_window_vscroll_p, |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6736 doc: /* *Non-nil means to automatically adjust `window-vscroll' to view tall lines. */); |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6737 auto_window_vscroll_p = 1; |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6738 |
30560
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
6739 DEFVAR_BOOL ("display-buffer-reuse-frames", &display_buffer_reuse_frames, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6740 doc: /* *Non-nil means `display-buffer' should reuse frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6741 If the buffer in question is already displayed in a frame, raise that frame. */); |
30560
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
6742 display_buffer_reuse_frames = 0; |
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
6743 |
769 | 6744 DEFVAR_LISP ("pop-up-frame-function", &Vpop_up_frame_function, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6745 doc: /* Function to call to handle automatic new frame creation. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6746 It is called with no arguments and should return a newly created frame. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6747 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6748 A typical value might be `(lambda () (new-frame pop-up-frame-alist))' |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6749 where `pop-up-frame-alist' would hold the default frame parameters. */); |
769 | 6750 Vpop_up_frame_function = Qnil; |
265 | 6751 |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
6752 DEFVAR_LISP ("special-display-buffer-names", &Vspecial_display_buffer_names, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6753 doc: /* *List of buffer names that should have their own special frames. |
61871
dd7b3da13b8f
(Fsame_window_p, Fspecial_display_p): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
61755
diff
changeset
|
6754 Displaying a buffer with `display-buffer' or `pop-to-buffer', |
dd7b3da13b8f
(Fsame_window_p, Fspecial_display_p): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
61755
diff
changeset
|
6755 if its name is in this list, makes a special frame for it |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6756 using `special-display-function'. See also `special-display-regexps'. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6757 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6758 An element of the list can be a list instead of just a string. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6759 There are two ways to use a list as an element: |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6760 (BUFFER FRAME-PARAMETERS...) (BUFFER FUNCTION OTHER-ARGS...) |
56174
7b713bd3dad4
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56089
diff
changeset
|
6761 In the first case, the FRAME-PARAMETERS are pairs of the form |
7b713bd3dad4
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56089
diff
changeset
|
6762 \(PARAMETER . VALUE); these parameter values are used to create the frame. |
7b713bd3dad4
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56089
diff
changeset
|
6763 In the second case, FUNCTION is called with BUFFER as the first argument, |
7b713bd3dad4
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56089
diff
changeset
|
6764 followed by the OTHER-ARGS--it can display BUFFER in any way it likes. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6765 All this is done by the function found in `special-display-function'. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6766 |
52836
a832ae359532
(Fset_window_margins): Allow only integers as args.
Richard M. Stallman <rms@gnu.org>
parents:
52831
diff
changeset
|
6767 If the specified frame parameters include (same-buffer . t), the |
a832ae359532
(Fset_window_margins): Allow only integers as args.
Richard M. Stallman <rms@gnu.org>
parents:
52831
diff
changeset
|
6768 buffer is displayed in the currently selected window. Otherwise, if |
a832ae359532
(Fset_window_margins): Allow only integers as args.
Richard M. Stallman <rms@gnu.org>
parents:
52831
diff
changeset
|
6769 they include (same-frame . t), the buffer is displayed in a new window |
a832ae359532
(Fset_window_margins): Allow only integers as args.
Richard M. Stallman <rms@gnu.org>
parents:
52831
diff
changeset
|
6770 in the currently selected frame. |
a832ae359532
(Fset_window_margins): Allow only integers as args.
Richard M. Stallman <rms@gnu.org>
parents:
52831
diff
changeset
|
6771 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6772 If this variable appears \"not to work\", because you add a name to it |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6773 but that buffer still appears in the selected window, look at the |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6774 values of `same-window-buffer-names' and `same-window-regexps'. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6775 Those variables take precedence over this one. */); |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
6776 Vspecial_display_buffer_names = Qnil; |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
6777 |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
6778 DEFVAR_LISP ("special-display-regexps", &Vspecial_display_regexps, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6779 doc: /* *List of regexps saying which buffers should have their own special frames. |
61871
dd7b3da13b8f
(Fsame_window_p, Fspecial_display_p): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
61755
diff
changeset
|
6780 When displaying a buffer with `display-buffer' or `pop-to-buffer', |
dd7b3da13b8f
(Fsame_window_p, Fspecial_display_p): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
61755
diff
changeset
|
6781 if any regexp in this list matches the buffer name, it makes a |
dd7b3da13b8f
(Fsame_window_p, Fspecial_display_p): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
61755
diff
changeset
|
6782 special frame for the buffer by calling `special-display-function'. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6783 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6784 An element of the list can be a list instead of just a string. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6785 There are two ways to use a list as an element: |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6786 (REGEXP FRAME-PARAMETERS...) (REGEXP FUNCTION OTHER-ARGS...) |
56174
7b713bd3dad4
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56089
diff
changeset
|
6787 In the first case, the FRAME-PARAMETERS are pairs of the form |
7b713bd3dad4
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56089
diff
changeset
|
6788 \(PARAMETER . VALUE); these parameter values are used to create the frame. |
7b713bd3dad4
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56089
diff
changeset
|
6789 In the second case, FUNCTION is called with BUFFER as the first argument, |
7b713bd3dad4
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56089
diff
changeset
|
6790 followed by the OTHER-ARGS--it can display the buffer in any way it likes. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6791 All this is done by the function found in `special-display-function'. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6792 |
52836
a832ae359532
(Fset_window_margins): Allow only integers as args.
Richard M. Stallman <rms@gnu.org>
parents:
52831
diff
changeset
|
6793 If the specified frame parameters include (same-buffer . t), the |
a832ae359532
(Fset_window_margins): Allow only integers as args.
Richard M. Stallman <rms@gnu.org>
parents:
52831
diff
changeset
|
6794 buffer is displayed in the currently selected window. Otherwise, if |
a832ae359532
(Fset_window_margins): Allow only integers as args.
Richard M. Stallman <rms@gnu.org>
parents:
52831
diff
changeset
|
6795 they include (same-frame . t), the buffer is displayed in a new window |
a832ae359532
(Fset_window_margins): Allow only integers as args.
Richard M. Stallman <rms@gnu.org>
parents:
52831
diff
changeset
|
6796 in the currently selected frame. |
a832ae359532
(Fset_window_margins): Allow only integers as args.
Richard M. Stallman <rms@gnu.org>
parents:
52831
diff
changeset
|
6797 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6798 If this variable appears \"not to work\", because you add a regexp to it |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6799 but the matching buffers still appear in the selected window, look at the |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6800 values of `same-window-buffer-names' and `same-window-regexps'. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6801 Those variables take precedence over this one. */); |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
6802 Vspecial_display_regexps = Qnil; |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
6803 |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
6804 DEFVAR_LISP ("special-display-function", &Vspecial_display_function, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6805 doc: /* Function to call to make a new frame for a special buffer. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6806 It is called with two arguments, the buffer and optional buffer specific |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6807 data, and should return a window displaying that buffer. |
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
6808 The default value normally makes a separate frame for the buffer, |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
6809 using `special-display-frame-alist' to specify the frame parameters. |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
6810 But if the buffer specific data includes (same-buffer . t) then the |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
6811 buffer is displayed in the current selected window. |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
6812 Otherwise if it includes (same-frame . t) then the buffer is displayed in |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
6813 a new window in the currently selected frame. |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
6814 |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
6815 A buffer is special if it is listed in `special-display-buffer-names' |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6816 or matches a regexp in `special-display-regexps'. */); |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
6817 Vspecial_display_function = Qnil; |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
6818 |
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
6819 DEFVAR_LISP ("same-window-buffer-names", &Vsame_window_buffer_names, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6820 doc: /* *List of buffer names that should appear in the selected window. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6821 Displaying one of these buffers using `display-buffer' or `pop-to-buffer' |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6822 switches to it in the selected window, rather than making it appear |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6823 in some other window. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6824 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6825 An element of the list can be a cons cell instead of just a string. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6826 Then the car must be a string, which specifies the buffer name. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6827 This is for compatibility with `special-display-buffer-names'; |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6828 the cdr of the cons cell is ignored. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6829 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6830 See also `same-window-regexps'. */); |
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
6831 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
|
6832 |
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
6833 DEFVAR_LISP ("same-window-regexps", &Vsame_window_regexps, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6834 doc: /* *List of regexps saying which buffers should appear in the selected window. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6835 If a buffer name matches one of these regexps, then displaying it |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6836 using `display-buffer' or `pop-to-buffer' switches to it |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6837 in the selected window, rather than making it appear in some other window. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6838 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6839 An element of the list can be a cons cell instead of just a string. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6840 Then the car must be a string, which specifies the buffer name. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6841 This is for compatibility with `special-display-buffer-names'; |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6842 the cdr of the cons cell is ignored. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6843 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6844 See also `same-window-buffer-names'. */); |
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
6845 Vsame_window_regexps = Qnil; |
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
6846 |
265 | 6847 DEFVAR_BOOL ("pop-up-windows", &pop_up_windows, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6848 doc: /* *Non-nil means display-buffer should make new windows. */); |
265 | 6849 pop_up_windows = 1; |
6850 | |
6851 DEFVAR_INT ("next-screen-context-lines", &next_screen_context_lines, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6852 doc: /* *Number of lines of continuity when scrolling by screenfuls. */); |
265 | 6853 next_screen_context_lines = 2; |
6854 | |
6855 DEFVAR_INT ("split-height-threshold", &split_height_threshold, | |
55563
a58f6db8bf3d
(Fdisplay_buffer, Fsplit_window, split-height-threshold): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
55402
diff
changeset
|
6856 doc: /* *A window must be at least this tall to be eligible for splitting by `display-buffer'. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6857 If there is only one window, it is split regardless of this value. */); |
265 | 6858 split_height_threshold = 500; |
6859 | |
6860 DEFVAR_INT ("window-min-height", &window_min_height, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6861 doc: /* *Delete any window less than this tall (including its mode line). */); |
265 | 6862 window_min_height = 4; |
6863 | |
6864 DEFVAR_INT ("window-min-width", &window_min_width, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6865 doc: /* *Delete any window less than this wide. */); |
265 | 6866 window_min_width = 10; |
6867 | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6868 DEFVAR_LISP ("scroll-preserve-screen-position", |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6869 &Vscroll_preserve_screen_position, |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
6870 doc: /* *Non-nil means scroll commands move point to keep its screen line unchanged. |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
6871 This is only when it is impossible to keep point fixed and still |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
6872 scroll as specified. */); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6873 Vscroll_preserve_screen_position = Qnil; |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
6874 |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
6875 DEFVAR_LISP ("window-configuration-change-hook", |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
6876 &Vwindow_configuration_change_hook, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6877 doc: /* Functions to call when window configuration changes. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6878 The selected frame is the one whose configuration has changed. */); |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
6879 Vwindow_configuration_change_hook = Qnil; |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
6880 |
265 | 6881 defsubr (&Sselected_window); |
6882 defsubr (&Sminibuffer_window); | |
6883 defsubr (&Swindow_minibuffer_p); | |
6884 defsubr (&Swindowp); | |
2210
22d78dbb3cc7
Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents:
2190
diff
changeset
|
6885 defsubr (&Swindow_live_p); |
265 | 6886 defsubr (&Spos_visible_in_window_p); |
6887 defsubr (&Swindow_buffer); | |
6888 defsubr (&Swindow_height); | |
6889 defsubr (&Swindow_width); | |
6890 defsubr (&Swindow_hscroll); | |
6891 defsubr (&Sset_window_hscroll); | |
13457
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
6892 defsubr (&Swindow_redisplay_end_trigger); |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
6893 defsubr (&Sset_window_redisplay_end_trigger); |
265 | 6894 defsubr (&Swindow_edges); |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
6895 defsubr (&Swindow_pixel_edges); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
6896 defsubr (&Swindow_inside_edges); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
6897 defsubr (&Swindow_inside_pixel_edges); |
432 | 6898 defsubr (&Scoordinates_in_window_p); |
6899 defsubr (&Swindow_at); | |
265 | 6900 defsubr (&Swindow_point); |
6901 defsubr (&Swindow_start); | |
6902 defsubr (&Swindow_end); | |
6903 defsubr (&Sset_window_point); | |
6904 defsubr (&Sset_window_start); | |
6905 defsubr (&Swindow_dedicated_p); | |
722
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
6906 defsubr (&Sset_window_dedicated_p); |
265 | 6907 defsubr (&Swindow_display_table); |
6908 defsubr (&Sset_window_display_table); | |
6909 defsubr (&Snext_window); | |
6910 defsubr (&Sprevious_window); | |
6911 defsubr (&Sother_window); | |
6912 defsubr (&Sget_lru_window); | |
6913 defsubr (&Sget_largest_window); | |
6914 defsubr (&Sget_buffer_window); | |
6915 defsubr (&Sdelete_other_windows); | |
6916 defsubr (&Sdelete_windows_on); | |
6917 defsubr (&Sreplace_buffer_in_windows); | |
6918 defsubr (&Sdelete_window); | |
6919 defsubr (&Sset_window_buffer); | |
6920 defsubr (&Sselect_window); | |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
6921 defsubr (&Sspecial_display_p); |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
6922 defsubr (&Ssame_window_p); |
265 | 6923 defsubr (&Sdisplay_buffer); |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
6924 defsubr (&Sforce_window_update); |
265 | 6925 defsubr (&Ssplit_window); |
6926 defsubr (&Senlarge_window); | |
6927 defsubr (&Sshrink_window); | |
6928 defsubr (&Sscroll_up); | |
6929 defsubr (&Sscroll_down); | |
6930 defsubr (&Sscroll_left); | |
6931 defsubr (&Sscroll_right); | |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
6932 defsubr (&Sother_window_for_scrolling); |
265 | 6933 defsubr (&Sscroll_other_window); |
43624
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
6934 defsubr (&Sminibuffer_selected_window); |
265 | 6935 defsubr (&Srecenter); |
34416
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
6936 defsubr (&Swindow_text_height); |
265 | 6937 defsubr (&Smove_to_window_line); |
6938 defsubr (&Swindow_configuration_p); | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
6939 defsubr (&Swindow_configuration_frame); |
265 | 6940 defsubr (&Sset_window_configuration); |
6941 defsubr (&Scurrent_window_configuration); | |
6942 defsubr (&Ssave_window_excursion); | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6943 defsubr (&Sset_window_margins); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6944 defsubr (&Swindow_margins); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6945 defsubr (&Sset_window_fringes); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6946 defsubr (&Swindow_fringes); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6947 defsubr (&Sset_window_scroll_bars); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6948 defsubr (&Swindow_scroll_bars); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6949 defsubr (&Swindow_vscroll); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6950 defsubr (&Sset_window_vscroll); |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6951 defsubr (&Scompare_window_configurations); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6952 defsubr (&Swindow_list); |
265 | 6953 } |
6954 | |
21514 | 6955 void |
265 | 6956 keys_of_window () |
6957 { | |
6958 initial_define_key (control_x_map, '1', "delete-other-windows"); | |
6959 initial_define_key (control_x_map, '2', "split-window"); | |
6960 initial_define_key (control_x_map, '0', "delete-window"); | |
6961 initial_define_key (control_x_map, 'o', "other-window"); | |
6962 initial_define_key (control_x_map, '^', "enlarge-window"); | |
6963 initial_define_key (control_x_map, '<', "scroll-left"); | |
6964 initial_define_key (control_x_map, '>', "scroll-right"); | |
6965 | |
6966 initial_define_key (global_map, Ctl ('V'), "scroll-up"); | |
6967 initial_define_key (meta_map, Ctl ('V'), "scroll-other-window"); | |
6968 initial_define_key (meta_map, 'v', "scroll-down"); | |
6969 | |
6970 initial_define_key (global_map, Ctl('L'), "recenter"); | |
6971 initial_define_key (meta_map, 'r', "move-to-window-line"); | |
6972 } | |
52401 | 6973 |
6974 /* arch-tag: 90a9c576-0590-48f1-a5f1-6c96a0452d9f | |
6975 (do not change this comment) */ |