Mercurial > emacs
annotate src/window.c @ 57355:333180b73b52
configure.in (HAVE_RANDOM_HEAPSTART): Move output of warning message to end
of configure run.
author | Jan Djärv <jan.h.d@swipnet.se> |
---|---|
date | Wed, 06 Oct 2004 12:28:31 +0000 |
parents | d039bbffafbc |
children | 22f6e207e697 d83f49cefda3 ff0e824afa37 |
rev | line source |
---|---|
265 | 1 /* Window creation, deletion and examination for GNU Emacs. |
2 Does not include redisplay. | |
55402
5896445199fd
(Fset_window_buffer): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55027
diff
changeset
|
3 Copyright (C) 1985,86,87, 1993,94,95,96,97,98, 2000,01,02,03,04 |
34261
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
4 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 |
35396
980c3ba545f9
(window_size_fixed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
35341
diff
changeset
|
82 /* The value of `window-size-fixed'. */ |
980c3ba545f9
(window_size_fixed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
35341
diff
changeset
|
83 |
980c3ba545f9
(window_size_fixed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
35341
diff
changeset
|
84 int window_size_fixed; |
980c3ba545f9
(window_size_fixed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
35341
diff
changeset
|
85 |
265 | 86 /* This is the window in which the terminal's cursor should |
87 be left when nothing is being done with it. This must | |
88 always be a leaf window, and its buffer is selected by | |
89 the top level editing loop at the end of each command. | |
90 | |
91 This value is always the same as | |
769 | 92 FRAME_SELECTED_WINDOW (selected_frame). */ |
265 | 93 |
94 Lisp_Object selected_window; | |
95 | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
96 /* 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
|
97 Functions creating or deleting windows should invalidate this cache |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
98 by setting it to nil. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
99 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
100 Lisp_Object Vwindow_list; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
101 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
102 /* The mini-buffer window of the selected frame. |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
103 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
|
104 by comparing against this; but you can test for mini-bufferness of |
265 | 105 the selected window. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
106 |
265 | 107 Lisp_Object minibuf_window; |
108 | |
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
109 /* 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
|
110 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
|
111 |
43594
23cddac4d0b7
(minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents:
43571
diff
changeset
|
112 Lisp_Object minibuf_selected_window; |
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
113 |
265 | 114 /* 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
|
115 when the mini-buffer is selected. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
116 |
265 | 117 Lisp_Object Vminibuf_scroll_window; |
118 | |
119 /* 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
|
120 |
265 | 121 Lisp_Object Vother_window_scroll_buffer; |
122 | |
123 /* 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
|
124 |
265 | 125 Lisp_Object Vtemp_buffer_show_function; |
126 | |
43281
a4ea76de57c9
(Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents:
43241
diff
changeset
|
127 /* 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
|
128 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
|
129 minibuffer is active. */ |
a4ea76de57c9
(Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents:
43241
diff
changeset
|
130 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
|
131 |
265 | 132 /* 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
|
133 |
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
|
134 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
|
135 EMACS_INT window_min_width; |
265 | 136 |
137 /* Nonzero implies Fdisplay_buffer should create windows. */ | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
138 |
265 | 139 int pop_up_windows; |
140 | |
769 | 141 /* Nonzero implies make new frames for Fdisplay_buffer. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
142 |
769 | 143 int pop_up_frames; |
265 | 144 |
30560
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
145 /* Nonzero means reuse existing frames for displaying buffers. */ |
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
146 |
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
147 int display_buffer_reuse_frames; |
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
148 |
265 | 149 /* 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
|
150 |
769 | 151 Lisp_Object Vpop_up_frame_function; |
265 | 152 |
153 /* Function to call to handle Fdisplay_buffer. */ | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
154 |
265 | 155 Lisp_Object Vdisplay_buffer_function; |
156 | |
34261
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
157 /* 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
|
158 |
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
159 Lisp_Object Veven_window_heights; |
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
160 |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
161 /* 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
|
162 |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
163 Lisp_Object Vspecial_display_buffer_names; |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
164 |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
165 /* 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
|
166 |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
167 Lisp_Object Vspecial_display_regexps; |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
168 |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
169 /* Function to pop up a special frame. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
170 |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
171 Lisp_Object Vspecial_display_function; |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
172 |
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
173 /* 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
|
174 |
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
175 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
|
176 |
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
177 /* 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
|
178 |
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
179 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
|
180 |
10461
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
181 /* 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
|
182 |
10461
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
183 Lisp_Object Qtemp_buffer_show_hook; |
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
184 |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
185 /* Fdisplay_buffer always splits the largest window |
265 | 186 if that window is more than this high. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
187 |
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
|
188 EMACS_INT split_height_threshold; |
265 | 189 |
190 /* 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
|
191 |
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
|
192 EMACS_INT next_screen_context_lines; |
265 | 193 |
194 /* Incremented for each window created. */ | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
195 |
265 | 196 static int sequence_number; |
197 | |
14445
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
198 /* Nonzero after init_window_once has finished. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
199 |
14445
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
200 static int window_initialized; |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
201 |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
202 /* Hook to run when window config changes. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
203 |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
204 Lisp_Object Qwindow_configuration_change_hook; |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
205 Lisp_Object Vwindow_configuration_change_hook; |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
206 |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
207 /* Nonzero means scroll commands try to put point |
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
208 at the same screen height as previously. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
209 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
210 Lisp_Object Vscroll_preserve_screen_position; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
211 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
212 #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
|
213 /* 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
|
214 static int inhibit_frame_unsplittable; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
215 #endif /* 0 */ |
17540
eb82c4de9dea
(frame_allow_splitting): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17365
diff
changeset
|
216 |
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
|
217 extern EMACS_INT scroll_margin; |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
218 |
14149
0d67df27dc2a
(Fset_window_buffer): Call the window-scroll-functions.
Richard M. Stallman <rms@gnu.org>
parents:
14089
diff
changeset
|
219 extern Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions; |
265 | 220 |
221 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
|
222 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
|
223 (object) |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
224 Lisp_Object object; |
265 | 225 { |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
226 return WINDOWP (object) ? Qt : Qnil; |
265 | 227 } |
228 | |
2210
22d78dbb3cc7
Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents:
2190
diff
changeset
|
229 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
|
230 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
|
231 (object) |
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
232 Lisp_Object object; |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
233 { |
35398
ef34ddc12a7d
* window.c (Fwindow_live_p): Use WINDOW_LIVE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
35396
diff
changeset
|
234 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
|
235 } |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
236 |
265 | 237 Lisp_Object |
238 make_window () | |
239 { | |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
240 Lisp_Object val; |
265 | 241 register struct window *p; |
36432
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
242 |
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
243 p = allocate_window (); |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
244 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
|
245 XSETFASTINT (p->left_col, 0); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
246 XSETFASTINT (p->top_line, 0); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
247 XSETFASTINT (p->total_lines, 0); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
248 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
|
249 XSETFASTINT (p->hscroll, 0); |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
250 XSETFASTINT (p->min_hscroll, 0); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
251 p->orig_top_line = p->orig_total_lines = Qnil; |
265 | 252 p->start = Fmake_marker (); |
253 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
|
254 XSETFASTINT (p->use_time, 0); |
769 | 255 p->frame = Qnil; |
265 | 256 p->display_table = Qnil; |
257 p->dedicated = Qnil; | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
258 p->pseudo_window_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
259 bzero (&p->cursor, sizeof (p->cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
260 bzero (&p->last_cursor, sizeof (p->last_cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
261 bzero (&p->phys_cursor, sizeof (p->phys_cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
262 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
|
263 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
|
264 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
|
265 p->phys_cursor_width = -1; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
266 p->must_be_updated_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
267 XSETFASTINT (p->window_end_vpos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
268 XSETFASTINT (p->window_end_pos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
269 p->window_end_valid = Qnil; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
270 p->vscroll = 0; |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
271 XSETWINDOW (val, p); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
272 XSETFASTINT (p->last_point, 0); |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
273 p->frozen_window_start_p = 0; |
44744
8c52c2bf3b3f
(make_window): Initialize height_fixed_p,
Richard M. Stallman <rms@gnu.org>
parents:
44649
diff
changeset
|
274 p->height_fixed_p = 0; |
8c52c2bf3b3f
(make_window): Initialize height_fixed_p,
Richard M. Stallman <rms@gnu.org>
parents:
44649
diff
changeset
|
275 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
|
276 p->left_margin_cols = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
277 p->right_margin_cols = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
278 p->left_fringe_width = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
279 p->right_fringe_width = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
280 p->fringes_outside_margins = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
281 p->scroll_bar_width = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
282 p->vertical_scroll_bar_type = Qt; |
54229
87fa8d221274
(make_window): Initialize overlay_arrow_bitmap.
Kim F. Storm <storm@cua.dk>
parents:
54178
diff
changeset
|
283 p->overlay_arrow_bitmap = 0; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
284 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
285 Vwindow_list = Qnil; |
265 | 286 return val; |
287 } | |
288 | |
289 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
|
290 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
|
291 () |
265 | 292 { |
293 return selected_window; | |
294 } | |
295 | |
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
296 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
|
297 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
|
298 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
|
299 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
|
300 (frame) |
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
301 Lisp_Object frame; |
265 | 302 { |
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
303 if (NILP (frame)) |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
304 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
305 CHECK_LIVE_FRAME (frame); |
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
306 return FRAME_MINIBUF_WINDOW (XFRAME (frame)); |
265 | 307 } |
308 | |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
309 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
|
310 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
|
311 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
|
312 (window) |
265 | 313 Lisp_Object window; |
314 { | |
315 struct window *w = decode_window (window); | |
32871
361743be1fa8
(pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
32824
diff
changeset
|
316 return MINI_WINDOW_P (w) ? Qt : Qnil; |
32710
cd7dca826a03
(pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents:
32426
diff
changeset
|
317 } |
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 |
265 | 320 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
|
321 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
|
322 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
|
323 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
|
324 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
|
325 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
|
326 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
|
327 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
|
328 |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
329 If POS is visible, return t if PARTIALLY is nil; if PARTIALLY is non-nil, |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
330 return value is a list (X Y FULLY) where X and Y are the pixel coordinates |
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
331 relative to the top left corner of the window, and FULLY is t if the |
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
332 character after POS is fully visible and nil otherwise. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
333 (pos, window, partially) |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
334 Lisp_Object pos, window, partially; |
265 | 335 { |
336 register struct window *w; | |
337 register int posint; | |
338 register struct buffer *buf; | |
25300
096b78b6cc2e
(Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
25268
diff
changeset
|
339 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
|
340 Lisp_Object in_window = Qnil; |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
341 int fully_p = 1; |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
342 int x, y; |
265 | 343 |
32937 | 344 w = decode_window (window); |
345 buf = XBUFFER (w->buffer); | |
346 SET_TEXT_POS_FROM_MARKER (top, w->start); | |
347 | |
348 if (!NILP (pos)) | |
265 | 349 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
350 CHECK_NUMBER_COERCE_MARKER (pos); |
265 | 351 posint = XINT (pos); |
352 } | |
32937 | 353 else if (w == XWINDOW (selected_window)) |
354 posint = PT; | |
355 else | |
356 posint = XMARKER (w->pointm)->charpos; | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
357 |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
358 /* 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
|
359 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
|
360 if (posint >= CHARPOS (top) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
361 && posint <= BUF_ZV (buf) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
362 && 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
|
363 && CHARPOS (top) <= BUF_ZV (buf) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
364 && pos_visible_p (w, posint, &fully_p, &x, &y, NILP (partially)) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
365 && (!NILP (partially) || fully_p)) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
366 in_window = Qt; |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
367 |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
368 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
|
369 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
|
370 Fcons (make_number (y), |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
371 Fcons (fully_p ? Qt : Qnil, Qnil))); |
25300
096b78b6cc2e
(Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
25268
diff
changeset
|
372 return in_window; |
265 | 373 } |
32871
361743be1fa8
(pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
32824
diff
changeset
|
374 |
265 | 375 |
376 static struct window * | |
377 decode_window (window) | |
378 register Lisp_Object window; | |
379 { | |
485 | 380 if (NILP (window)) |
265 | 381 return XWINDOW (selected_window); |
382 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
383 CHECK_LIVE_WINDOW (window); |
265 | 384 return XWINDOW (window); |
385 } | |
386 | |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
387 static struct window * |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
388 decode_any_window (window) |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
389 register Lisp_Object window; |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
390 { |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
391 if (NILP (window)) |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
392 return XWINDOW (selected_window); |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
393 |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
394 CHECK_WINDOW (window); |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
395 return XWINDOW (window); |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
396 } |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
397 |
265 | 398 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
|
399 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
|
400 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
|
401 (window) |
265 | 402 Lisp_Object window; |
403 { | |
404 return decode_window (window)->buffer; | |
405 } | |
406 | |
407 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
|
408 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
|
409 (window) |
265 | 410 Lisp_Object window; |
411 { | |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
412 return decode_any_window (window)->total_lines; |
265 | 413 } |
414 | |
415 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
|
416 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
|
417 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
|
418 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
|
419 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
|
420 (window) |
265 | 421 Lisp_Object window; |
422 { | |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
423 return make_number (window_box_text_cols (decode_any_window (window))); |
265 | 424 } |
425 | |
426 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
|
427 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
|
428 (window) |
265 | 429 Lisp_Object window; |
430 { | |
431 return decode_window (window)->hscroll; | |
432 } | |
433 | |
434 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
|
435 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
|
436 Return NCOL. NCOL should be zero or positive. |
45645
6e2471fb2c1c
(Fset_window_hscroll): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
45584
diff
changeset
|
437 |
6e2471fb2c1c
(Fset_window_hscroll): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
45584
diff
changeset
|
438 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
|
439 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
|
440 (window, ncol) |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
441 Lisp_Object window, ncol; |
265 | 442 { |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
443 struct window *w = decode_window (window); |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
444 int hscroll; |
265 | 445 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
446 CHECK_NUMBER (ncol); |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
447 hscroll = max (0, XINT (ncol)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
448 |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
449 /* Prevent redisplay shortcuts when changing the hscroll. */ |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
450 if (XINT (w->hscroll) != hscroll) |
25375 | 451 XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
452 |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
453 w->hscroll = make_number (hscroll); |
265 | 454 return ncol; |
455 } | |
456 | |
13457
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
457 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
|
458 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
|
459 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
|
460 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
|
461 (window) |
13457
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
462 Lisp_Object window; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
463 { |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
464 return decode_window (window)->redisplay_end_trigger; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
465 } |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
466 |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
467 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
|
468 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
|
469 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
|
470 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
|
471 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
|
472 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
|
473 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
|
474 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
|
475 (window, value) |
13457
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
476 register Lisp_Object window, value; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
477 { |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
478 register struct window *w; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
479 |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
480 w = decode_window (window); |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
481 w->redisplay_end_trigger = value; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
482 return value; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
483 } |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
484 |
265 | 485 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
|
486 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
|
487 \(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
|
488 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
|
489 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
|
490 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
|
491 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
|
492 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
|
493 (window) |
265 | 494 Lisp_Object window; |
495 { | |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
496 register struct window *w = decode_any_window (window); |
265 | 497 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
498 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
|
499 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
|
500 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
|
501 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
|
502 Qnil)))); |
265 | 503 } |
504 | |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
505 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
|
506 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
|
507 \(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
|
508 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
|
509 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
|
510 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
|
511 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
|
512 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
|
513 (window) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
514 Lisp_Object window; |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
515 { |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
516 register struct window *w = decode_any_window (window); |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
517 |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
518 return Fcons (make_number (WINDOW_LEFT_EDGE_X (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
519 Fcons (make_number (WINDOW_TOP_EDGE_Y (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
520 Fcons (make_number (WINDOW_RIGHT_EDGE_X (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
521 Fcons (make_number (WINDOW_BOTTOM_EDGE_Y (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
522 Qnil)))); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
523 } |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
524 |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
525 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
|
526 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
|
527 \(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
|
528 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
|
529 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
|
530 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
|
531 display margins, fringes, header line, and/or mode line. */) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
532 (window) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
533 Lisp_Object window; |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
534 { |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
535 register struct window *w = decode_any_window (window); |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
536 |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
537 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
|
538 + WINDOW_LEFT_MARGIN_COLS (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
539 + WINDOW_LEFT_FRINGE_COLS (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
540 make_number (WINDOW_TOP_EDGE_LINE (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
541 + WINDOW_HEADER_LINE_LINES (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
542 make_number (WINDOW_RIGHT_EDGE_COL (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
543 - WINDOW_RIGHT_MARGIN_COLS (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
544 - WINDOW_RIGHT_FRINGE_COLS (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
545 make_number (WINDOW_BOTTOM_EDGE_LINE (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
546 - WINDOW_MODE_LINE_LINES (w))); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
547 } |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
548 |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
549 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
|
550 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
|
551 \(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
|
552 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
|
553 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
|
554 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
|
555 display margins, fringes, header line, and/or mode line. */) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
556 (window) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
557 Lisp_Object window; |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
558 { |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
559 register struct window *w = decode_any_window (window); |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
560 |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
561 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
|
562 + WINDOW_LEFT_MARGIN_WIDTH (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
563 + WINDOW_LEFT_FRINGE_WIDTH (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
564 make_number (WINDOW_TOP_EDGE_Y (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
565 + WINDOW_HEADER_LINE_HEIGHT (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
566 make_number (WINDOW_RIGHT_EDGE_X (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
567 - WINDOW_RIGHT_MARGIN_WIDTH (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
568 - WINDOW_RIGHT_FRINGE_WIDTH (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
569 make_number (WINDOW_BOTTOM_EDGE_Y (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
570 - WINDOW_MODE_LINE_HEIGHT (w))); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
571 } |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
572 |
25315
79bb4978ab2e
(Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents:
25300
diff
changeset
|
573 /* 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
|
574 If it is not, return ON_NOTHING; |
432 | 575 if it is in the window's text area, |
576 set *x and *y to its location relative to the upper left corner | |
577 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
|
578 return ON_TEXT; |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
579 if it is on the window's modeline, return ON_MODE_LINE; |
432 | 580 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
|
581 return ON_VERTICAL_BORDER. |
56542
6d2d9477f39e
(coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents:
56540
diff
changeset
|
582 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
|
583 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
|
584 if it is on the window's top line, return ON_HEADER_LINE; |
41127 | 585 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
|
586 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
|
587 to window-relative coordinates; |
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
588 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
|
589 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
|
590 to window-relative coordinates. |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
591 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
592 X and Y are frame relative pixel coordinates. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
593 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
594 static enum window_part |
432 | 595 coordinates_in_window (w, x, y) |
596 register struct window *w; | |
597 register int *x, *y; | |
598 { | |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
599 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
600 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
|
601 enum window_part part; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
602 int ux = FRAME_COLUMN_WIDTH (f); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
603 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
|
604 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
|
605 /* 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
|
606 (Between mode lines for instance. */ |
f03dfbb443ce
(coordinates_in_window): Increase width of area
Gerd Moellmann <gerd@gnu.org>
parents:
36068
diff
changeset
|
607 int grabbable_width = ux; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
608 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
|
609 |
28918
e42cd428f056
(coordinates_in_window): Subtract 1 when computing right_x.
Eli Zaretskii <eliz@gnu.org>
parents:
28726
diff
changeset
|
610 /* 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
|
611 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
|
612 if (w->pseudo_window_p) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
613 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
614 left_x = 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
615 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
|
616 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
|
617 bottom_y = WINDOW_BOTTOM_EDGE_Y (w); |
24997
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 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
620 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
621 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
|
622 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
|
623 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
|
624 bottom_y = WINDOW_BOTTOM_EDGE_Y (w); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
625 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
626 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
627 /* Outside any interesting row? */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
628 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
|
629 return ON_NOTHING; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
630 |
33957
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
631 /* 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
|
632 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
|
633 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
|
634 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
|
635 scroll bars. */ |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
636 |
33957
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
637 if (WINDOW_WANTS_MODELINE_P (w) |
53129
070325c3884d
(coordinates_in_window): Remove redundant tests.
Kim F. Storm <storm@cua.dk>
parents:
52853
diff
changeset
|
638 && *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
|
639 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
640 part = ON_MODE_LINE; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
641 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
642 header_vertical_border_check: |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
643 /* 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
|
644 between mode lines of horizontally adjacent mode lines |
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
645 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
|
646 return the right window. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
647 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
|
648 || WINDOW_RIGHTMOST_P (w)) |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
649 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
650 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
|
651 return ON_VERTICAL_BORDER; |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
652 } |
51223
c1daf1c22f97
(Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents:
51207
diff
changeset
|
653 else |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
654 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
655 if (abs (*x - x1) < 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; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
657 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
658 |
57309
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
659 if (*x < x0 || *x >= x1) |
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
660 return ON_NOTHING; |
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
661 |
51477
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
662 /* 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
|
663 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
|
664 *x -= x0; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
665 *y -= top_y; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
666 return part; |
33957
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
667 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
668 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
669 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
|
670 && *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
|
671 { |
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
672 part = ON_HEADER_LINE; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
673 goto header_vertical_border_check; |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
674 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
675 |
57309
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
676 if (*x < x0 || *x >= x1) |
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
677 return ON_NOTHING; |
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
678 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
679 /* Outside any interesting column? */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
680 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
|
681 return ON_SCROLL_BAR; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
682 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
683 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
|
684 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
|
685 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
686 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
|
687 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
|
688 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
689 if (FRAME_WINDOW_P (f)) |
25315
79bb4978ab2e
(Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents:
25300
diff
changeset
|
690 { |
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
691 if (!w->pseudo_window_p |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
692 && !WINDOW_HAS_VERTICAL_SCROLL_BAR (w) |
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
693 && !WINDOW_RIGHTMOST_P (w) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
694 && (abs (*x - right_x) < grabbable_width)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
695 return ON_VERTICAL_BORDER; |
25315
79bb4978ab2e
(Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents:
25300
diff
changeset
|
696 } |
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
697 else |
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
698 { |
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
699 /* 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
|
700 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
|
701 if (!w->pseudo_window_p |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
702 && !WINDOW_RIGHTMOST_P (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
703 && *x > right_x - ux) |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
704 { |
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
705 /* 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
|
706 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
|
707 return ON_VERTICAL_BORDER; |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
708 } |
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
709 } |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
710 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
711 if (*x < text_left) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
712 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
713 if (lmargin_width > 0 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
714 && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
715 ? (*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
|
716 : (*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
|
717 { |
53129
070325c3884d
(coordinates_in_window): Remove redundant tests.
Kim F. Storm <storm@cua.dk>
parents:
52853
diff
changeset
|
718 *x -= left_x; |
51477
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
719 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
|
720 *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
|
721 *y -= top_y; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
722 return ON_LEFT_MARGIN; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
723 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
724 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
725 /* 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
|
726 *x -= left_x; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
727 *y -= top_y; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
728 return ON_LEFT_FRINGE; |
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 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
731 if (*x >= text_right) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
732 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
733 if (rmargin_width > 0 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
734 && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
735 ? (*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
|
736 : (*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
|
737 { |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
738 *x -= right_x; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
739 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
|
740 *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
|
741 *y -= top_y; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
742 return ON_RIGHT_MARGIN; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
743 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
744 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
745 /* 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
|
746 *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
|
747 *y -= top_y; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
748 return ON_RIGHT_FRINGE; |
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 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
751 /* 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
|
752 *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
|
753 *y -= top_y; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
754 return ON_TEXT; |
432 | 755 } |
756 | |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
757 |
432 | 758 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
|
759 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
|
760 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
|
761 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
|
762 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
|
763 \(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
|
764 frame. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
765 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
|
766 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
|
767 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
|
768 If they are in the top mode line of WINDOW, `header-line' is returned. |
41127 | 769 If they are in the left fringe of WINDOW, `left-fringe' is returned. |
770 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
|
771 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
|
772 `vertical-line' is returned. |
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
773 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
|
774 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
|
775 (coordinates, window) |
432 | 776 register Lisp_Object coordinates, window; |
777 { | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
778 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
779 struct frame *f; |
432 | 780 int x, y; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
781 Lisp_Object lx, ly; |
432 | 782 |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
783 CHECK_WINDOW (window); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
784 w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
785 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
|
786 CHECK_CONS (coordinates); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
787 lx = Fcar (coordinates); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
788 ly = Fcdr (coordinates); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
789 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
|
790 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
|
791 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
|
792 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
|
793 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
794 switch (coordinates_in_window (w, &x, &y)) |
432 | 795 { |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
796 case ON_NOTHING: |
432 | 797 return Qnil; |
798 | |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
799 case ON_TEXT: |
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
800 /* 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
|
801 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
|
802 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
|
803 FRAME_CANON_Y_FROM_PIXEL_Y (f, y)); |
432 | 804 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
805 case ON_MODE_LINE: |
432 | 806 return Qmode_line; |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
807 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
808 case ON_VERTICAL_BORDER: |
732 | 809 return Qvertical_line; |
432 | 810 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
811 case ON_HEADER_LINE: |
25546 | 812 return Qheader_line; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
813 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
814 case ON_LEFT_FRINGE: |
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
815 return Qleft_fringe; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
816 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
817 case ON_RIGHT_FRINGE: |
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
818 return Qright_fringe; |
25315
79bb4978ab2e
(Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents:
25300
diff
changeset
|
819 |
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
820 case ON_LEFT_MARGIN: |
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
821 return Qleft_margin; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
822 |
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
823 case ON_RIGHT_MARGIN: |
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
824 return Qright_margin; |
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
825 |
56542
6d2d9477f39e
(coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents:
56540
diff
changeset
|
826 case ON_SCROLL_BAR: |
6d2d9477f39e
(coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents:
56540
diff
changeset
|
827 /* 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
|
828 return Qnil; |
6d2d9477f39e
(coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents:
56540
diff
changeset
|
829 |
432 | 830 default: |
831 abort (); | |
832 } | |
833 } | |
834 | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
835 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
836 /* 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
|
837 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
|
838 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
|
839 |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
840 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
|
841 does, return W in *CW->window, as Lisp_Object, and return in |
30777 | 842 *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
|
843 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
|
844 |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
845 struct check_window_data |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
846 { |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
847 Lisp_Object *window; |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
848 int *x, *y; |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
849 enum window_part *part; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
850 }; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
851 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
852 static int |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
853 check_window_containing (w, user_data) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
854 struct window *w; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
855 void *user_data; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
856 { |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
857 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
|
858 enum window_part found; |
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
859 int continue_p = 1; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
860 |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
861 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
|
862 if (found != ON_NOTHING) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
863 { |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
864 *cw->part = found; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
865 XSETWINDOW (*cw->window, w); |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
866 continue_p = 0; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
867 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
868 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
869 return continue_p; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
870 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
871 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
872 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
873 /* 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
|
874 return it as a Lisp_Object. |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
875 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
876 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
|
877 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
|
878 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
|
879 |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
880 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
|
881 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
|
882 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
883 This function was previously implemented with a loop cycling over |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
884 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
|
885 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
|
886 implementation of next_window using Vwindow_list, because |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
887 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
|
888 tree of F when this function is called asynchronously from |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
889 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
|
890 case. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
891 |
265 | 892 Lisp_Object |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
893 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
|
894 struct frame *f; |
265 | 895 int x, y; |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
896 enum window_part *part; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
897 int *wx, *wy; |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25540
diff
changeset
|
898 int tool_bar_p; |
265 | 899 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
900 Lisp_Object window; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
901 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
|
902 enum window_part dummy; |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
903 |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
904 if (part == 0) |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
905 part = &dummy; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
906 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
907 window = Qnil; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
908 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
|
909 foreach_window (f, check_window_containing, &cw); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
910 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
911 /* 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
|
912 bar exists. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
913 if (NILP (window) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
914 && tool_bar_p |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
915 && WINDOWP (f->tool_bar_window) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
916 && 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
|
917 && (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
|
918 != ON_NOTHING)) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
919 { |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
920 *part = ON_TEXT; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
921 window = f->tool_bar_window; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
922 } |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
923 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
924 if (wx) *wx = x; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
925 if (wy) *wy = y; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
926 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
927 return window; |
265 | 928 } |
929 | |
681
026f978690be
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
555
diff
changeset
|
930 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
|
931 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
|
932 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
|
933 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
|
934 column 0. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
935 (x, y, frame) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
936 Lisp_Object x, y, frame; |
265 | 937 { |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
938 struct frame *f; |
265 | 939 |
769 | 940 if (NILP (frame)) |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
941 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
942 CHECK_LIVE_FRAME (frame); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
943 f = XFRAME (frame); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
944 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
945 /* 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
|
946 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
|
947 CHECK_NUMBER_OR_FLOAT (y); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
948 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
949 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
|
950 (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
|
951 + 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
|
952 (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
|
953 + FRAME_INTERNAL_BORDER_WIDTH (f)), |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
954 0, 0, 0, 0); |
265 | 955 } |
956 | |
957 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
|
958 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
|
959 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
|
960 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
|
961 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
962 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
|
963 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
|
964 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
|
965 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
|
966 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
|
967 (window) |
265 | 968 Lisp_Object window; |
969 { | |
970 register struct window *w = decode_window (window); | |
971 | |
972 if (w == XWINDOW (selected_window) | |
973 && current_buffer == XBUFFER (w->buffer)) | |
974 return Fpoint (); | |
975 return Fmarker_position (w->pointm); | |
976 } | |
977 | |
978 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
|
979 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
|
980 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
|
981 (window) |
265 | 982 Lisp_Object window; |
983 { | |
984 return Fmarker_position (decode_window (window)->start); | |
985 } | |
986 | |
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
987 /* 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
|
988 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
989 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
|
990 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
|
991 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
|
992 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
|
993 (save-excursion |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
994 (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
|
995 (vertical-motion (1- (window-height window)) window) |
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
996 (point))") */ |
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
997 |
21198
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
998 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
|
999 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
|
1000 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
|
1001 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
|
1002 does not update this value. |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
1003 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
|
1004 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
|
1005 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
|
1006 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
|
1007 (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
|
1008 Lisp_Object window, update; |
265 | 1009 { |
1010 Lisp_Object value; | |
1011 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
|
1012 Lisp_Object buf; |
990f6ee7f527
(Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents:
4145
diff
changeset
|
1013 |
990f6ee7f527
(Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents:
4145
diff
changeset
|
1014 buf = w->buffer; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1015 CHECK_BUFFER (buf); |
4292
990f6ee7f527
(Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents:
4145
diff
changeset
|
1016 |
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
1017 #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
|
1018 /* 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
|
1019 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
|
1020 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
|
1021 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
|
1022 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
|
1023 return Qnil; |
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
1024 #endif |
8492
865daa7a9faf
(Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
8486
diff
changeset
|
1025 |
21198
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
1026 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
|
1027 && ! (! 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
|
1028 && 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
|
1029 { |
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1030 struct text_pos startp; |
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1031 struct it it; |
36231
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1032 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
|
1033 |
af8d605cbcf1
(Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
1034 /* 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
|
1035 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
|
1036 `-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
|
1037 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
|
1038 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
|
1039 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
|
1040 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
|
1041 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
|
1042 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
|
1043 else |
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1044 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
|
1045 |
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1046 /* 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
|
1047 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
|
1048 if (b != current_buffer) |
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1049 { |
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1050 old_buffer = current_buffer; |
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1051 set_buffer_internal (b); |
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1052 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1053 |
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1054 start_display (&it, w, startp); |
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1055 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
|
1056 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
|
1057 move_it_past_eol (&it); |
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1058 value = make_number (IT_CHARPOS (it)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1059 |
36231
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1060 if (old_buffer) |
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1061 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
|
1062 } |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
1063 else |
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1064 XSETINT (value, BUF_Z (XBUFFER (buf)) - XFASTINT (w->window_end_pos)); |
265 | 1065 |
1066 return value; | |
1067 } | |
1068 | |
1069 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
|
1070 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
|
1071 Return POS. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1072 (window, pos) |
265 | 1073 Lisp_Object window, pos; |
1074 { | |
1075 register struct window *w = decode_window (window); | |
1076 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1077 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
|
1078 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
|
1079 && XBUFFER (w->buffer) == current_buffer) |
265 | 1080 Fgoto_char (pos); |
1081 else | |
1082 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
|
1083 |
34615
a8944d7e6773
(Fset_window_point): Remove test for
Gerd Moellmann <gerd@gnu.org>
parents:
34499
diff
changeset
|
1084 /* 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
|
1085 the new value of point. */ |
a8944d7e6773
(Fset_window_point): Remove test for
Gerd Moellmann <gerd@gnu.org>
parents:
34499
diff
changeset
|
1086 if (!EQ (window, selected_window)) |
34491
f9d400d4653a
(Fset_window_point): If displaying cursors in windows
Gerd Moellmann <gerd@gnu.org>
parents:
34417
diff
changeset
|
1087 ++windows_or_buffers_changed; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1088 |
265 | 1089 return pos; |
1090 } | |
1091 | |
1092 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
|
1093 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
|
1094 Return POS. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1095 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
|
1096 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
|
1097 (window, pos, noforce) |
265 | 1098 Lisp_Object window, pos, noforce; |
1099 { | |
1100 register struct window *w = decode_window (window); | |
1101 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1102 CHECK_NUMBER_COERCE_MARKER (pos); |
265 | 1103 set_marker_restricted (w->start, pos, w->buffer); |
1104 /* this is not right, but much easier than doing what is right. */ | |
1105 w->start_at_line_beg = Qnil; | |
485 | 1106 if (NILP (noforce)) |
265 | 1107 w->force_start = Qt; |
1108 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
|
1109 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
|
1110 XSETFASTINT (w->last_overlay_modified, 0); |
338 | 1111 if (!EQ (window, selected_window)) |
1112 windows_or_buffers_changed++; | |
25387
df0083768b79
(Fset_window_point): Reset Vresize_mini_config.
Gerd Moellmann <gerd@gnu.org>
parents:
25375
diff
changeset
|
1113 |
265 | 1114 return pos; |
1115 } | |
1116 | |
1117 DEFUN ("window-dedicated-p", Fwindow_dedicated_p, Swindow_dedicated_p, | |
1118 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
|
1119 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
|
1120 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
|
1121 (window) |
265 | 1122 Lisp_Object window; |
1123 { | |
1124 return decode_window (window)->dedicated; | |
1125 } | |
1126 | |
722
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
1127 DEFUN ("set-window-dedicated-p", Fset_window_dedicated_p, |
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
1128 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
|
1129 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
|
1130 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
|
1131 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
|
1132 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
|
1133 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
|
1134 (window, arg) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1135 Lisp_Object window, arg; |
265 | 1136 { |
1137 register struct window *w = decode_window (window); | |
1138 | |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
1139 w->dedicated = arg; |
265 | 1140 |
1141 return w->dedicated; | |
1142 } | |
1143 | |
1144 DEFUN ("window-display-table", Fwindow_display_table, Swindow_display_table, | |
1145 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
|
1146 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
|
1147 (window) |
265 | 1148 Lisp_Object window; |
1149 { | |
1150 return decode_window (window)->display_table; | |
1151 } | |
1152 | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1153 /* 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
|
1154 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
|
1155 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
|
1156 return 0. */ |
265 | 1157 |
13187
1a4cee562d33
(window_display_table): Use DISP_TABLE_P. Return type
Richard M. Stallman <rms@gnu.org>
parents:
13126
diff
changeset
|
1158 struct Lisp_Char_Table * |
265 | 1159 window_display_table (w) |
1160 struct window *w; | |
1161 { | |
30446
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1162 struct Lisp_Char_Table *dp = NULL; |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1163 |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1164 if (DISP_TABLE_P (w->display_table)) |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1165 dp = XCHAR_TABLE (w->display_table); |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1166 else if (BUFFERP (w->buffer)) |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1167 { |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1168 struct buffer *b = XBUFFER (w->buffer); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1169 |
30446
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1170 if (DISP_TABLE_P (b->display_table)) |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1171 dp = XCHAR_TABLE (b->display_table); |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1172 else if (DISP_TABLE_P (Vstandard_display_table)) |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1173 dp = XCHAR_TABLE (Vstandard_display_table); |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1174 } |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1175 |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1176 return dp; |
265 | 1177 } |
1178 | |
555 | 1179 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
|
1180 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
|
1181 (window, table) |
265 | 1182 register Lisp_Object window, table; |
1183 { | |
1184 register struct window *w; | |
1185 | |
1186 w = decode_window (window); | |
1187 w->display_table = table; | |
1188 return table; | |
1189 } | |
1190 | |
1191 /* Record info on buffer window w is displaying | |
1192 when it is about to cease to display that buffer. */ | |
21514 | 1193 static void |
265 | 1194 unshow_buffer (w) |
1195 register struct window *w; | |
1196 { | |
6517
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1197 Lisp_Object buf; |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1198 struct buffer *b; |
6517
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1199 |
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1200 buf = w->buffer; |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1201 b = XBUFFER (buf); |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1202 if (b != XMARKER (w->pointm)->buffer) |
265 | 1203 abort (); |
1204 | |
5990
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
1205 #if 0 |
265 | 1206 if (w == XWINDOW (selected_window) |
1207 || ! EQ (buf, XWINDOW (selected_window)->buffer)) | |
1208 /* Do this except when the selected window's buffer | |
1209 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
|
1210 #endif |
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
1211 /* 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
|
1212 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
|
1213 Now that this statement is unconditional, |
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
1214 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
|
1215 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
|
1216 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
|
1217 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
|
1218 b->last_window_start = marker_position (w->start); |
265 | 1219 |
1220 /* Point in the selected window's buffer | |
1221 is actually stored in that buffer, and the window's pointm isn't used. | |
1222 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
|
1223 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
|
1224 /* 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
|
1225 && !(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
|
1226 && 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
|
1227 && 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
|
1228 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
|
1229 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
|
1230 XMARKER (w->pointm)->charpos, |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1231 BUF_ZV (b)), |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1232 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
|
1233 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
|
1234 BUF_ZV_BYTE (b))); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1235 |
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28104
diff
changeset
|
1236 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
|
1237 && 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
|
1238 b->last_selected_window = Qnil; |
265 | 1239 } |
1240 | |
1241 /* Put replacement into the window structure in place of old. */ | |
21514 | 1242 static void |
265 | 1243 replace_window (old, replacement) |
1244 Lisp_Object old, replacement; | |
1245 { | |
1246 register Lisp_Object tem; | |
1247 register struct window *o = XWINDOW (old), *p = XWINDOW (replacement); | |
1248 | |
769 | 1249 /* If OLD is its frame's root_window, then replacement is the new |
1250 root_window for that frame. */ | |
265 | 1251 |
1525
f79a22ad87d0
* window.c (Fwindow_width, Fset_window_hscroll): Use accessors on
Jim Blandy <jimb@redhat.com>
parents:
1444
diff
changeset
|
1252 if (EQ (old, FRAME_ROOT_WINDOW (XFRAME (o->frame)))) |
769 | 1253 FRAME_ROOT_WINDOW (XFRAME (o->frame)) = replacement; |
265 | 1254 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1255 p->left_col = o->left_col; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1256 p->top_line = o->top_line; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1257 p->total_cols = o->total_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1258 p->total_lines = o->total_lines; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1259 p->desired_matrix = p->current_matrix = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1260 p->vscroll = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1261 bzero (&p->cursor, sizeof (p->cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1262 bzero (&p->last_cursor, sizeof (p->last_cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1263 bzero (&p->phys_cursor, sizeof (p->phys_cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1264 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
|
1265 p->phys_cursor_width = -1; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1266 p->must_be_updated_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1267 p->pseudo_window_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1268 XSETFASTINT (p->window_end_vpos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1269 XSETFASTINT (p->window_end_pos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1270 p->window_end_valid = Qnil; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
1271 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
|
1272 p->orig_top_line = p->orig_total_lines = Qnil; |
265 | 1273 |
1274 p->next = tem = o->next; | |
485 | 1275 if (!NILP (tem)) |
265 | 1276 XWINDOW (tem)->prev = replacement; |
1277 | |
1278 p->prev = tem = o->prev; | |
485 | 1279 if (!NILP (tem)) |
265 | 1280 XWINDOW (tem)->next = replacement; |
1281 | |
1282 p->parent = tem = o->parent; | |
485 | 1283 if (!NILP (tem)) |
265 | 1284 { |
1285 if (EQ (XWINDOW (tem)->vchild, old)) | |
1286 XWINDOW (tem)->vchild = replacement; | |
1287 if (EQ (XWINDOW (tem)->hchild, old)) | |
1288 XWINDOW (tem)->hchild = replacement; | |
1289 } | |
1290 | |
1291 /*** Here, if replacement is a vertical combination | |
1292 and so is its new parent, we should make replacement's | |
1293 children be children of that parent instead. ***/ | |
1294 } | |
1295 | |
1296 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
|
1297 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
|
1298 (window) |
265 | 1299 register Lisp_Object window; |
1300 { | |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1301 delete_window (window); |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1302 |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1303 if (! NILP (Vwindow_configuration_change_hook) |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1304 && ! NILP (Vrun_hooks)) |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1305 call1 (Vrun_hooks, Qwindow_configuration_change_hook); |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1306 |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1307 return Qnil; |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1308 } |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1309 |
20351 | 1310 void |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1311 delete_window (window) |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1312 register Lisp_Object window; |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1313 { |
265 | 1314 register Lisp_Object tem, parent, sib; |
1315 register struct window *p; | |
1316 register struct window *par; | |
34819
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1317 struct frame *f; |
265 | 1318 |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1319 /* 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
|
1320 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
|
1321 so we can't decode_window here. */ |
485 | 1322 if (NILP (window)) |
265 | 1323 window = selected_window; |
1324 else | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1325 CHECK_WINDOW (window); |
265 | 1326 p = XWINDOW (window); |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1327 |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1328 /* 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
|
1329 if (NILP (p->buffer) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1330 && NILP (p->hchild) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1331 && NILP (p->vchild)) |
17365
fc2ec9ced22f
(delete_window): Don't return value from void function.
Karl Heuer <kwzh@gnu.org>
parents:
17281
diff
changeset
|
1332 return; |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1333 |
265 | 1334 parent = p->parent; |
485 | 1335 if (NILP (parent)) |
265 | 1336 error ("Attempt to delete minibuffer or sole ordinary window"); |
1337 par = XWINDOW (parent); | |
1338 | |
1339 windows_or_buffers_changed++; | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1340 Vwindow_list = Qnil; |
34819
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1341 f = XFRAME (WINDOW_FRAME (p)); |
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1342 FRAME_WINDOW_SIZES_CHANGED (f) = 1; |
265 | 1343 |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1344 /* 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
|
1345 { |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1346 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
|
1347 |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
1348 /* 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
|
1349 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
|
1350 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
|
1351 swindow = FRAME_SELECTED_WINDOW (f); |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1352 |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1353 while (1) |
3723
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
1354 { |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1355 pwindow = swindow; |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1356 while (!NILP (pwindow)) |
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 if (EQ (window, pwindow)) |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1359 break; |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1360 pwindow = XWINDOW (pwindow)->parent; |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1361 } |
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 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
|
1364 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
|
1365 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
|
1366 break; |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1367 /* 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
|
1368 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
|
1369 |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1370 /* 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
|
1371 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
|
1372 so we cannot delete. */ |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1373 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
|
1374 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
|
1375 } |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
1376 |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1377 /* 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
|
1378 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
|
1379 { |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1380 /* 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
|
1381 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
|
1382 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
|
1383 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
|
1384 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
|
1385 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
|
1386 Fselect_window (swindow, Qnil); |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1387 else |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1388 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
|
1389 } |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1390 } |
265 | 1391 |
1392 tem = p->buffer; | |
1393 /* tem is null for dummy parent windows | |
1394 (which have inferiors but not any contents themselves) */ | |
485 | 1395 if (!NILP (tem)) |
265 | 1396 { |
1397 unshow_buffer (p); | |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
1398 unchain_marker (XMARKER (p->pointm)); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
1399 unchain_marker (XMARKER (p->start)); |
265 | 1400 } |
1401 | |
26761
c15c2756ec0f
(delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents:
26635
diff
changeset
|
1402 /* 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
|
1403 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
|
1404 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
|
1405 processed while we are changing them. */ |
c15c2756ec0f
(delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents:
26635
diff
changeset
|
1406 BLOCK_INPUT; |
34819
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1407 free_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f))); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1408 |
265 | 1409 tem = p->next; |
485 | 1410 if (!NILP (tem)) |
265 | 1411 XWINDOW (tem)->prev = p->prev; |
1412 | |
1413 tem = p->prev; | |
485 | 1414 if (!NILP (tem)) |
265 | 1415 XWINDOW (tem)->next = p->next; |
1416 | |
1417 if (EQ (window, par->hchild)) | |
1418 par->hchild = p->next; | |
1419 if (EQ (window, par->vchild)) | |
1420 par->vchild = p->next; | |
1421 | |
1422 /* Find one of our siblings to give our space to. */ | |
1423 sib = p->prev; | |
485 | 1424 if (NILP (sib)) |
265 | 1425 { |
1426 /* If p gives its space to its next sibling, that sibling needs | |
1427 to have its top/left side pulled back to where p's is. | |
1428 set_window_{height,width} will re-position the sibling's | |
1429 children. */ | |
1430 sib = p->next; | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1431 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
|
1432 XWINDOW (sib)->left_col = p->left_col; |
265 | 1433 } |
1434 | |
1435 /* Stretch that sibling. */ | |
485 | 1436 if (!NILP (par->vchild)) |
265 | 1437 set_window_height (sib, |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1438 XFASTINT (XWINDOW (sib)->total_lines) + XFASTINT (p->total_lines), |
265 | 1439 1); |
485 | 1440 if (!NILP (par->hchild)) |
265 | 1441 set_window_width (sib, |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1442 XFASTINT (XWINDOW (sib)->total_cols) + XFASTINT (p->total_cols), |
265 | 1443 1); |
1444 | |
1445 /* If parent now has only one child, | |
1446 put the child into the parent's place. */ | |
1447 tem = par->hchild; | |
485 | 1448 if (NILP (tem)) |
265 | 1449 tem = par->vchild; |
485 | 1450 if (NILP (XWINDOW (tem)->next)) |
265 | 1451 replace_window (parent, tem); |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1452 |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1453 /* 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
|
1454 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
|
1455 if (! NILP (p->hchild)) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1456 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
|
1457 else if (! NILP (p->vchild)) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1458 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
|
1459 |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1460 /* Mark this window as deleted. */ |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1461 p->buffer = p->hchild = p->vchild = Qnil; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1462 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1463 /* Adjust glyph matrices. */ |
34819
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1464 adjust_glyphs (f); |
26761
c15c2756ec0f
(delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents:
26635
diff
changeset
|
1465 UNBLOCK_INPUT; |
265 | 1466 } |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1467 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1468 |
265 | 1469 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1470 /*********************************************************************** |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1471 Window List |
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 |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1474 /* 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
|
1475 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
|
1476 function window_list. */ |
30037
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 static int |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1479 add_window_to_list (w, user_data) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1480 struct window *w; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1481 void *user_data; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1482 { |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1483 Lisp_Object *list = (Lisp_Object *) user_data; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1484 Lisp_Object window; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1485 XSETWINDOW (window, w); |
30039
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1486 *list = Fcons (window, *list); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1487 return 1; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1488 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1489 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1490 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1491 /* 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
|
1492 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
|
1493 list, cache it in Vwindow_list, and return that. */ |
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 static Lisp_Object |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1496 window_list () |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1497 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1498 if (!CONSP (Vwindow_list)) |
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 Lisp_Object tail; |
30039
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1501 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1502 Vwindow_list = Qnil; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1503 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
|
1504 { |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1505 Lisp_Object args[2]; |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1506 |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1507 /* 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
|
1508 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
|
1509 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
|
1510 args[1] = Qnil; |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1511 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
|
1512 args[0] = Vwindow_list; |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1513 args[1] = Fnreverse (args[1]); |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1514 Vwindow_list = Fnconc (2, args); |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1515 } |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1516 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1517 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1518 return Vwindow_list; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1519 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1520 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1521 |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1522 /* 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
|
1523 OWINDOW, MINIBUF and ALL_FRAMES. |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1524 |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1525 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
|
1526 `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
|
1527 a window means a specific minibuffer window |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1528 |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1529 ALL_FRAMES t means search all frames, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1530 nil means search just current frame, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1531 `visible' means search just visible frames, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1532 0 means search visible and iconified frames, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1533 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
|
1534 a frame means consider windows on that frame, only. */ |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1535 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1536 static int |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1537 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
|
1538 Lisp_Object window, owindow, minibuf, all_frames; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1539 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1540 struct window *w = XWINDOW (window); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1541 struct frame *f = XFRAME (w->frame); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1542 int candidate_p = 1; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1543 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1544 if (!BUFFERP (w->buffer)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1545 candidate_p = 0; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1546 else if (MINI_WINDOW_P (w) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1547 && (EQ (minibuf, Qlambda) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1548 || (WINDOWP (minibuf) && !EQ (minibuf, window)))) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1549 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1550 /* If MINIBUF is `lambda' don't consider any mini-windows. |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1551 If it is a window, consider only that one. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1552 candidate_p = 0; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1553 } |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1554 else if (EQ (all_frames, Qt)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1555 candidate_p = 1; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1556 else if (NILP (all_frames)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1557 { |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1558 xassert (WINDOWP (owindow)); |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1559 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
|
1560 } |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1561 else if (EQ (all_frames, Qvisible)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1562 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1563 FRAME_SAMPLE_VISIBILITY (f); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1564 candidate_p = FRAME_VISIBLE_P (f); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1565 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1566 else if (INTEGERP (all_frames) && XINT (all_frames) == 0) |
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) || FRAME_ICONIFIED_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 (WINDOWP (all_frames)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1572 candidate_p = (EQ (FRAME_MINIBUF_WINDOW (f), all_frames) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1573 || EQ (XWINDOW (all_frames)->frame, w->frame) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1574 || 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
|
1575 else if (FRAMEP (all_frames)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1576 candidate_p = EQ (all_frames, w->frame); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1577 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1578 return candidate_p; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1579 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1580 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1581 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1582 /* Decode arguments as allowed by Fnext_window, Fprevious_window, and |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1583 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
|
1584 ALL_FRAMES. */ |
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 static void |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1587 decode_next_window_args (window, minibuf, all_frames) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1588 Lisp_Object *window, *minibuf, *all_frames; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1589 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1590 if (NILP (*window)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1591 *window = selected_window; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1592 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1593 CHECK_LIVE_WINDOW (*window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1594 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1595 /* 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
|
1596 does. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1597 if (NILP (*minibuf)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1598 *minibuf = minibuf_level ? minibuf_window : Qlambda; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1599 else if (!EQ (*minibuf, Qt)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1600 *minibuf = Qlambda; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1601 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1602 /* Now *MINIBUF can be t => count all minibuffer windows, `lambda' |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1603 => count none of them, or a specific minibuffer window (the |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1604 active one) to count. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1605 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1606 /* ALL_FRAMES nil doesn't specify which frames to include. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1607 if (NILP (*all_frames)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1608 *all_frames = (!EQ (*minibuf, Qlambda) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1609 ? FRAME_MINIBUF_WINDOW (XFRAME (XWINDOW (*window)->frame)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1610 : Qnil); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1611 else if (EQ (*all_frames, Qvisible)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1612 ; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1613 else if (XFASTINT (*all_frames) == 0) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1614 ; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1615 else if (FRAMEP (*all_frames)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1616 ; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1617 else if (!EQ (*all_frames, Qt)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1618 *all_frames = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1619 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1620 /* 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
|
1621 search just current frame, `visible' meaning search just visible |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1622 frames, 0 meaning search visible and iconified frames, or a |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1623 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
|
1624 frame, meaning consider windows on that frame, only. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1625 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1626 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1627 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1628 /* 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
|
1629 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
|
1630 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
|
1631 ALL_FRAMES. */ |
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 static Lisp_Object |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1634 next_window (window, minibuf, all_frames, next_p) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1635 Lisp_Object window, minibuf, all_frames; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1636 int next_p; |
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 decode_next_window_args (&window, &minibuf, &all_frames); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1639 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1640 /* 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
|
1641 return the first window on the frame. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1642 if (FRAMEP (all_frames) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1643 && !EQ (all_frames, XWINDOW (window)->frame)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1644 return Fframe_first_window (all_frames); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1645 |
30039
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1646 if (next_p) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1647 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1648 Lisp_Object list; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1649 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1650 /* Find WINDOW in the list of all windows. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1651 list = Fmemq (window, window_list ()); |
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 /* 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
|
1654 if (CONSP (list)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1655 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
|
1656 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
|
1657 break; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1658 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1659 /* 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
|
1660 if (!CONSP (list)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1661 for (list = Vwindow_list; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1662 CONSP (list) && !EQ (XCAR (list), window); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1663 list = XCDR (list)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1664 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
|
1665 break; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1666 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1667 if (CONSP (list)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1668 window = XCAR (list); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1669 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1670 else |
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 Lisp_Object candidate, list; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1673 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1674 /* 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
|
1675 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
|
1676 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
|
1677 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
|
1678 candidate = Qnil; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1679 for (list = window_list (); CONSP (list); list = XCDR (list)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1680 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1681 if (EQ (XCAR (list), window)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1682 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1683 if (WINDOWP (candidate)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1684 break; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1685 } |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1686 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
|
1687 all_frames)) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1688 candidate = XCAR (list); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1689 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1690 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1691 if (WINDOWP (candidate)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1692 window = candidate; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1693 } |
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 return window; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1696 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1697 |
432 | 1698 |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1699 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
|
1700 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
|
1701 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
|
1702 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1703 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
|
1704 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
|
1705 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
|
1706 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
|
1707 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1708 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
|
1709 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
|
1710 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
|
1711 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
|
1712 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
|
1713 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1714 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
|
1715 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
|
1716 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
|
1717 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
|
1718 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
|
1719 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
|
1720 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1721 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
|
1722 `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
|
1723 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
|
1724 `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
|
1725 (window, minibuf, all_frames) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1726 Lisp_Object window, minibuf, all_frames; |
265 | 1727 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1728 return next_window (window, minibuf, all_frames, 1); |
265 | 1729 } |
1730 | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1731 |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1732 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
|
1733 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
|
1734 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
|
1735 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1736 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
|
1737 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
|
1738 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
|
1739 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
|
1740 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1741 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
|
1742 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
|
1743 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
|
1744 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
|
1745 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
|
1746 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1747 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
|
1748 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
|
1749 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
|
1750 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
|
1751 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
|
1752 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
|
1753 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1754 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
|
1755 `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
|
1756 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
|
1757 `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
|
1758 (window, minibuf, all_frames) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1759 Lisp_Object window, minibuf, all_frames; |
265 | 1760 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1761 return next_window (window, minibuf, all_frames, 0); |
265 | 1762 } |
1763 | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1764 |
338 | 1765 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
|
1766 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
|
1767 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
|
1768 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
|
1769 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
|
1770 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
|
1771 (arg, all_frames) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1772 Lisp_Object arg, all_frames; |
265 | 1773 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1774 Lisp_Object window; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1775 int i; |
265 | 1776 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1777 CHECK_NUMBER (arg); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1778 window = selected_window; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1779 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1780 for (i = XINT (arg); i > 0; --i) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1781 window = Fnext_window (window, Qnil, all_frames); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1782 for (; i < 0; ++i) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1783 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
|
1784 |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
1785 Fselect_window (window, Qnil); |
265 | 1786 return Qnil; |
1787 } | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1788 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1789 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1790 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
|
1791 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
|
1792 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
|
1793 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
|
1794 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
|
1795 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
|
1796 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
|
1797 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
|
1798 (frame, minibuf, window) |
33619
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1799 Lisp_Object frame, minibuf, window; |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1800 { |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1801 if (NILP (window)) |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1802 window = selected_window; |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1803 if (NILP (frame)) |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1804 frame = selected_frame; |
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 (!EQ (frame, XWINDOW (window)->frame)) |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1807 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
|
1808 |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1809 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
|
1810 } |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1811 |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1812 |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1813 /* 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
|
1814 for `next-window'. */ |
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 static Lisp_Object |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1817 window_list_1 (window, minibuf, all_frames) |
30265
9b1c8eafe4dc
(Fwindow_list): Declare arg `window'.
Dave Love <fx@gnu.org>
parents:
30102
diff
changeset
|
1818 Lisp_Object window, minibuf, all_frames; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1819 { |
56456
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1820 Lisp_Object tail, list, rest; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1821 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1822 decode_next_window_args (&window, &minibuf, &all_frames); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1823 list = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1824 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1825 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
|
1826 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
|
1827 list = Fcons (XCAR (tail), list); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1828 |
56456
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1829 /* 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
|
1830 list = Fnreverse (list); |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1831 rest = Fmemq (window, list); |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1832 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
|
1833 { |
56616
76bd0e931318
(window_list_1): YAILOM.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56585
diff
changeset
|
1834 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
|
1835 ; |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1836 XSETCDR (tail, Qnil); |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1837 list = nconc2 (rest, list); |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1838 } |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1839 return list; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1840 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1841 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1842 |
265 | 1843 |
1844 /* Look at all windows, performing an operation specified by TYPE | |
1845 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
|
1846 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
|
1847 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
|
1848 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
|
1849 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
|
1850 If MINI is non-zero, perform the operation on minibuffer windows too. */ |
265 | 1851 |
1852 enum window_loop | |
1853 { | |
1854 WINDOW_LOOP_UNUSED, | |
1855 GET_BUFFER_WINDOW, /* Arg is buffer */ | |
1856 GET_LRU_WINDOW, /* Arg is t for full-width windows only */ | |
1857 DELETE_OTHER_WINDOWS, /* Arg is window not to delete */ | |
1858 DELETE_BUFFER_WINDOWS, /* Arg is buffer */ | |
1859 GET_LARGEST_WINDOW, | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
1860 UNSHOW_BUFFER, /* Arg is buffer */ |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
1861 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
|
1862 CHECK_ALL_WINDOWS |
265 | 1863 }; |
1864 | |
1865 static Lisp_Object | |
769 | 1866 window_loop (type, obj, mini, frames) |
265 | 1867 enum window_loop type; |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1868 Lisp_Object obj, frames; |
265 | 1869 int mini; |
1870 { | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1871 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
|
1872 struct frame *f; |
30102
9406cb07bac7
(window_loop): Add missing gcpro1 local variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30093
diff
changeset
|
1873 struct gcpro gcpro1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1874 |
769 | 1875 /* If we're only looping through windows on a particular frame, |
1876 frame points to that frame. If we're looping through windows | |
1877 on all frames, frame is 0. */ | |
1878 if (FRAMEP (frames)) | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1879 f = XFRAME (frames); |
769 | 1880 else if (NILP (frames)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1881 f = SELECTED_FRAME (); |
265 | 1882 else |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1883 f = NULL; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1884 |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1885 if (f) |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1886 frame_arg = Qlambda; |
8167
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
1887 else if (XFASTINT (frames) == 0) |
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
1888 frame_arg = frames; |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1889 else if (EQ (frames, Qvisible)) |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1890 frame_arg = frames; |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1891 else |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1892 frame_arg = Qt; |
265 | 1893 |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1894 /* 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
|
1895 Qvisible to consider all visible frames, |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1896 or Qt otherwise. */ |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1897 |
265 | 1898 /* 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
|
1899 if (WINDOWP (obj)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1900 window = obj; |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1901 else if (f) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1902 window = FRAME_SELECTED_WINDOW (f); |
265 | 1903 else |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1904 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
|
1905 |
33619
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1906 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
|
1907 GCPRO1 (windows); |
265 | 1908 best_window = Qnil; |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1909 |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1910 for (; CONSP (windows); windows = CDR (windows)) |
265 | 1911 { |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1912 struct window *w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1913 |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1914 window = XCAR (windows); |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1915 w = XWINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1916 |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1917 /* 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
|
1918 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
|
1919 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
|
1920 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
|
1921 /* 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
|
1922 || type == UNSHOW_BUFFER |
265 | 1923 || (mini && minibuf_level > 0)) |
1924 switch (type) | |
1925 { | |
1926 case GET_BUFFER_WINDOW: | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1927 if (EQ (w->buffer, obj) |
16522
63ca7c6ceeff
(window_loop, case GET_BUFFER_WINDOW):
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
1928 /* Don't find any minibuffer window |
63ca7c6ceeff
(window_loop, case GET_BUFFER_WINDOW):
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
1929 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
|
1930 && (MINI_WINDOW_P (w) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1931 ? EQ (window, minibuf_window) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1932 : 1)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1933 { |
36068
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
1934 if (NILP (best_window)) |
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
1935 best_window = window; |
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
1936 else if (EQ (window, selected_window)) |
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
1937 /* 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
|
1938 selected-window. */ |
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
1939 best_window = window; |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1940 } |
265 | 1941 break; |
1942 | |
1943 case GET_LRU_WINDOW: | |
1944 /* 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
|
1945 if (!NILP (obj) && !WINDOW_FULL_WIDTH_P (w)) |
265 | 1946 break; |
1947 /* 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
|
1948 if (MINI_WINDOW_P (w) || EQ (w->dedicated, Qt)) |
265 | 1949 break; |
485 | 1950 if (NILP (best_window) |
265 | 1951 || (XFASTINT (XWINDOW (best_window)->use_time) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1952 > XFASTINT (w->use_time))) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1953 best_window = window; |
265 | 1954 break; |
1955 | |
1956 case DELETE_OTHER_WINDOWS: | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1957 if (!EQ (window, obj)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1958 Fdelete_window (window); |
265 | 1959 break; |
1960 | |
1961 case DELETE_BUFFER_WINDOWS: | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1962 if (EQ (w->buffer, obj)) |
265 | 1963 { |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1964 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
|
1965 |
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
1966 /* 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
|
1967 kill the frame. */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1968 if (EQ (window, FRAME_ROOT_WINDOW (f)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1969 && !NILP (w->dedicated) |
10808
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
1970 && other_visible_frames (f)) |
265 | 1971 { |
10808
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
1972 /* 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
|
1973 There might be one, the minibuffer! */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1974 while (CONSP (XCDR (windows)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1975 && EQ (XWINDOW (XCAR (windows))->frame, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1976 XWINDOW (XCAR (XCDR (windows)))->frame)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1977 windows = XCDR (windows); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1978 |
10808
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
1979 /* 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
|
1980 Fdelete_frame (w->frame, Qnil); |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1981 } |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1982 else if (NILP (w->parent)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1983 { |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1984 /* 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
|
1985 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
|
1986 display there. */ |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1987 Lisp_Object buffer; |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1988 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
|
1989 Fset_window_buffer (window, buffer, Qnil); |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1990 if (EQ (window, selected_window)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1991 Fset_buffer (w->buffer); |
265 | 1992 } |
1993 else | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1994 Fdelete_window (window); |
265 | 1995 } |
1996 break; | |
1997 | |
1998 case GET_LARGEST_WINDOW: | |
1999 { | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2000 /* 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
|
2001 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
|
2002 break; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2003 |
31393
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2004 if (NILP (best_window)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2005 best_window = window; |
31393
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2006 else |
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2007 { |
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2008 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
|
2009 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
|
2010 > 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
|
2011 best_window = window; |
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2012 } |
265 | 2013 } |
2014 break; | |
2015 | |
2016 case UNSHOW_BUFFER: | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2017 if (EQ (w->buffer, obj)) |
265 | 2018 { |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2019 Lisp_Object buffer; |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2020 struct frame *f = XFRAME (w->frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2021 |
265 | 2022 /* 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
|
2023 buffer = Fother_buffer (obj, Qnil, w->frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2024 |
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2025 /* 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
|
2026 kill the frame. */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2027 if (EQ (window, FRAME_ROOT_WINDOW (f)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2028 && !NILP (w->dedicated) |
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2029 && other_visible_frames (f)) |
8536
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2030 { |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2031 /* Skip the other windows on this frame. |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2032 There might be one, the minibuffer! */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2033 while (CONSP (XCDR (windows)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2034 && EQ (XWINDOW (XCAR (windows))->frame, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2035 XWINDOW (XCAR (XCDR (windows)))->frame)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2036 windows = XCDR (windows); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2037 |
8536
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2038 /* 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
|
2039 Fdelete_frame (w->frame, Qnil); |
8536
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2040 } |
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2041 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
|
2042 { |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2043 Lisp_Object window; |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2044 XSETWINDOW (window, w); |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2045 /* 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
|
2046 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
|
2047 Fdelete_window (window); |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2048 } |
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2049 else |
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2050 { |
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2051 /* 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
|
2052 w->dedicated = Qnil; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2053 Fset_window_buffer (window, buffer, Qnil); |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2054 if (EQ (window, selected_window)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2055 Fset_buffer (w->buffer); |
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2056 } |
265 | 2057 } |
2058 break; | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2059 |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2060 case REDISPLAY_BUFFER_WINDOWS: |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2061 if (EQ (w->buffer, obj)) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2062 { |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2063 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
|
2064 w->update_mode_line = Qt; |
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
2065 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
|
2066 ++update_mode_lines; |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2067 best_window = window; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2068 } |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2069 break; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2070 |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2071 /* 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
|
2072 case CHECK_ALL_WINDOWS: |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2073 if (! NILP (w->buffer) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2074 && NILP (XBUFFER (w->buffer)->name)) |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2075 abort (); |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2076 break; |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
2077 |
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
2078 case WINDOW_LOOP_UNUSED: |
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
2079 break; |
265 | 2080 } |
2081 } | |
2082 | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2083 UNGCPRO; |
265 | 2084 return best_window; |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
2085 } |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
2086 |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2087 /* 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
|
2088 |
25268 | 2089 void |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2090 check_all_windows () |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2091 { |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2092 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
|
2093 } |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2094 |
265 | 2095 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
|
2096 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
|
2097 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
|
2098 A minibuffer window is never a candidate. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2099 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
|
2100 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
|
2101 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
|
2102 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
|
2103 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
|
2104 (frame) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2105 Lisp_Object frame; |
265 | 2106 { |
2107 register Lisp_Object w; | |
2108 /* 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
|
2109 w = window_loop (GET_LRU_WINDOW, Qt, 0, frame); |
485 | 2110 if (!NILP (w) && !EQ (w, selected_window)) |
265 | 2111 return w; |
2112 /* 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
|
2113 return window_loop (GET_LRU_WINDOW, Qnil, 0, frame); |
265 | 2114 } |
2115 | |
2116 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
|
2117 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
|
2118 A minibuffer window is never a candidate. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2119 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
|
2120 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
|
2121 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
|
2122 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
|
2123 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
|
2124 (frame) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2125 Lisp_Object frame; |
265 | 2126 { |
2127 return window_loop (GET_LARGEST_WINDOW, Qnil, 0, | |
769 | 2128 frame); |
265 | 2129 } |
2130 | |
2131 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
|
2132 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
|
2133 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
|
2134 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
|
2135 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
|
2136 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
|
2137 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
|
2138 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
|
2139 (buffer, frame) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2140 Lisp_Object buffer, frame; |
265 | 2141 { |
2142 buffer = Fget_buffer (buffer); | |
9105
984a4b1be1d1
(Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents:
9028
diff
changeset
|
2143 if (BUFFERP (buffer)) |
769 | 2144 return window_loop (GET_BUFFER_WINDOW, buffer, 1, frame); |
265 | 2145 else |
2146 return Qnil; | |
2147 } | |
2148 | |
2149 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
|
2150 0, 1, "", |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2151 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
|
2152 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
|
2153 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
|
2154 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
|
2155 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
|
2156 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
|
2157 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
|
2158 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
|
2159 (window) |
265 | 2160 Lisp_Object window; |
2161 { | |
2162 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
|
2163 int startpos; |
35038
ac8eb6b4eee6
(Fdelete_other_windows): Set window's window_end_valid
Gerd Moellmann <gerd@gnu.org>
parents:
35024
diff
changeset
|
2164 int top, new_top; |
265 | 2165 |
485 | 2166 if (NILP (window)) |
265 | 2167 window = selected_window; |
2168 else | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
2169 CHECK_LIVE_WINDOW (window); |
265 | 2170 w = XWINDOW (window); |
9028
74119e5602eb
(Fdelete_other_windows): Nice error if WINDOW is minibuf.
Richard M. Stallman <rms@gnu.org>
parents:
8991
diff
changeset
|
2171 |
7348
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2172 startpos = marker_position (w->start); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2173 top = WINDOW_TOP_EDGE_LINE (w) - FRAME_TOP_MARGIN (XFRAME (WINDOW_FRAME (w))); |
265 | 2174 |
9028
74119e5602eb
(Fdelete_other_windows): Nice error if WINDOW is minibuf.
Richard M. Stallman <rms@gnu.org>
parents:
8991
diff
changeset
|
2175 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
|
2176 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
|
2177 |
2190
482c7827b968
(Fdelete_other_windows): Handle FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
2178 window_loop (DELETE_OTHER_WINDOWS, window, 0, WINDOW_FRAME (w)); |
265 | 2179 |
7348
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2180 /* 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
|
2181 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
|
2182 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
|
2183 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
|
2184 not current, due to typeahead). */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2185 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
|
2186 if (new_top != top |
ac8eb6b4eee6
(Fdelete_other_windows): Set window's window_end_valid
Gerd Moellmann <gerd@gnu.org>
parents:
35024
diff
changeset
|
2187 && 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
|
2188 && 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
|
2189 { |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2190 struct position pos; |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2191 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
|
2192 |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2193 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
|
2194 /* 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
|
2195 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
|
2196 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
|
2197 |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
2198 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
|
2199 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
|
2200 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
|
2201 || 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
|
2202 : Qnil); |
13198
43d90596da34
(Fdelete_other_windows): Set w->force_start.
Richard M. Stallman <rms@gnu.org>
parents:
13187
diff
changeset
|
2203 /* 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
|
2204 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
|
2205 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
|
2206 |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2207 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
|
2208 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2209 |
265 | 2210 return Qnil; |
2211 } | |
2212 | |
2213 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
|
2214 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
|
2215 doc: /* Delete all windows showing BUFFER. |
56393
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
2216 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
|
2217 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
|
2218 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
|
2219 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
|
2220 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
|
2221 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
|
2222 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
|
2223 (buffer, frame) |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
2224 Lisp_Object buffer, frame; |
265 | 2225 { |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
2226 /* 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
|
2227 expects. */ |
22223
5d15aed3a37c
(Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents:
22187
diff
changeset
|
2228 if (NILP (frame)) |
5d15aed3a37c
(Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents:
22187
diff
changeset
|
2229 frame = Qt; |
5d15aed3a37c
(Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents:
22187
diff
changeset
|
2230 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
|
2231 frame = Qnil; |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
2232 |
485 | 2233 if (!NILP (buffer)) |
265 | 2234 { |
2235 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
|
2236 CHECK_BUFFER (buffer); |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
2237 window_loop (DELETE_BUFFER_WINDOWS, buffer, 0, frame); |
265 | 2238 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2239 |
265 | 2240 return Qnil; |
2241 } | |
2242 | |
2243 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
|
2244 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
|
2245 1, 1, "bReplace buffer in windows: ", |
56393
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
2246 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
|
2247 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
|
2248 (buffer) |
265 | 2249 Lisp_Object buffer; |
2250 { | |
485 | 2251 if (!NILP (buffer)) |
265 | 2252 { |
2253 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
|
2254 CHECK_BUFFER (buffer); |
265 | 2255 window_loop (UNSHOW_BUFFER, buffer, 0, Qt); |
2256 } | |
2257 return Qnil; | |
2258 } | |
13918
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2259 |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2260 /* 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
|
2261 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
|
2262 |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2263 void |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2264 replace_buffer_in_all_windows (buffer) |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2265 Lisp_Object buffer; |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2266 { |
14204
c0b44d3a8312
(replace_buffer_in_all_windows): Don't change selected
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
2267 #ifdef MULTI_KBOARD |
13918
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2268 Lisp_Object tail, frame; |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2269 |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2270 /* 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
|
2271 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
|
2272 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
|
2273 FOR_EACH_FRAME (tail, frame) |
20066
affc9c857428
(replace_buffer_in_all_windows):
Karl Heuer <kwzh@gnu.org>
parents:
20046
diff
changeset
|
2274 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
|
2275 #else |
20066
affc9c857428
(replace_buffer_in_all_windows):
Karl Heuer <kwzh@gnu.org>
parents:
20046
diff
changeset
|
2276 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
|
2277 #endif |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2278 } |
265 | 2279 |
2280 /* 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
|
2281 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2282 /* 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
|
2283 might crash Emacs. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2284 |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2285 #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
|
2286 #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
|
2287 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2288 /* 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
|
2289 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
|
2290 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2291 static void |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2292 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
|
2293 { |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2294 /* 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
|
2295 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
|
2296 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
|
2297 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
|
2298 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
|
2299 } |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2300 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2301 /* 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
|
2302 minimum allowable size. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2303 |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
2304 void |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2305 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
|
2306 FRAME_PTR frame; |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
2307 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
|
2308 { |
4347
d6b289b1a6dc
* window.c (check_frame_size): Include the menu bar height in the
Jim Blandy <jimb@redhat.com>
parents:
4292
diff
changeset
|
2309 /* 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
|
2310 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
|
2311 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
|
2312 int min_height |
87fe94f01b8e
(check_frame_size): Fix minimum height calculation.
Richard M. Stallman <rms@gnu.org>
parents:
42862
diff
changeset
|
2313 = ((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
|
2314 ? MIN_SAFE_WINDOW_HEIGHT |
87fe94f01b8e
(check_frame_size): Fix minimum height calculation.
Richard M. Stallman <rms@gnu.org>
parents:
42862
diff
changeset
|
2315 : 2 * MIN_SAFE_WINDOW_HEIGHT); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2316 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2317 if (FRAME_TOP_MARGIN (frame) > 0) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2318 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
|
2319 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2320 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
|
2321 *rows = min_height; |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2322 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
|
2323 *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
|
2324 } |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2325 |
25254 | 2326 |
25268 | 2327 /* Value is non-zero if window W is fixed-size. WIDTH_P non-zero means |
2328 check if W's width can be changed, otherwise check W's height. | |
2329 CHECK_SIBLINGS_P non-zero means check resizablity of WINDOW's | |
2330 siblings, too. If none of the siblings is resizable, WINDOW isn't | |
2331 either. */ | |
2332 | |
2333 static int | |
2334 window_fixed_size_p (w, width_p, check_siblings_p) | |
2335 struct window *w; | |
2336 int width_p, check_siblings_p; | |
2337 { | |
2338 int fixed_p; | |
2339 struct window *c; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2340 |
25268 | 2341 if (!NILP (w->hchild)) |
2342 { | |
2343 c = XWINDOW (w->hchild); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2344 |
25268 | 2345 if (width_p) |
2346 { | |
2347 /* A horiz. combination is fixed-width if all of if its | |
2348 children are. */ | |
2349 while (c && window_fixed_size_p (c, width_p, 0)) | |
2350 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2351 fixed_p = c == NULL; | |
2352 } | |
2353 else | |
2354 { | |
2355 /* A horiz. combination is fixed-height if one of if its | |
2356 children is. */ | |
2357 while (c && !window_fixed_size_p (c, width_p, 0)) | |
2358 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2359 fixed_p = c != NULL; | |
2360 } | |
2361 } | |
2362 else if (!NILP (w->vchild)) | |
2363 { | |
2364 c = XWINDOW (w->vchild); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2365 |
25268 | 2366 if (width_p) |
2367 { | |
2368 /* A vert. combination is fixed-width if one of if its | |
2369 children is. */ | |
2370 while (c && !window_fixed_size_p (c, width_p, 0)) | |
2371 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2372 fixed_p = c != NULL; | |
2373 } | |
2374 else | |
2375 { | |
2376 /* A vert. combination is fixed-height if all of if its | |
2377 children are. */ | |
2378 while (c && window_fixed_size_p (c, width_p, 0)) | |
2379 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2380 fixed_p = c == NULL; | |
2381 } | |
2382 } | |
2383 else if (BUFFERP (w->buffer)) | |
2384 { | |
25739
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2385 if (w->height_fixed_p && !width_p) |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2386 fixed_p = 1; |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2387 else |
25268 | 2388 { |
25739
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2389 struct buffer *old = current_buffer; |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2390 Lisp_Object val; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2391 |
25739
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2392 current_buffer = XBUFFER (w->buffer); |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2393 val = find_symbol_value (Qwindow_size_fixed); |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2394 current_buffer = old; |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2395 |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2396 fixed_p = 0; |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2397 if (!EQ (val, Qunbound)) |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2398 { |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2399 fixed_p = !NILP (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 if (fixed_p |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2402 && ((EQ (val, Qheight) && width_p) |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2403 || (EQ (val, Qwidth) && !width_p))) |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2404 fixed_p = 0; |
a4321ad412ba
(Fset_window_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25676
diff
changeset
|
2405 } |
25268 | 2406 } |
2407 | |
2408 /* Can't tell if this one is resizable without looking at | |
2409 siblings. If all siblings are fixed-size this one is too. */ | |
2410 if (!fixed_p && check_siblings_p && WINDOWP (w->parent)) | |
2411 { | |
2412 Lisp_Object child; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2413 |
25268 | 2414 for (child = w->prev; !NILP (child); child = XWINDOW (child)->prev) |
2415 if (!window_fixed_size_p (XWINDOW (child), width_p, 0)) | |
2416 break; | |
2417 | |
2418 if (NILP (child)) | |
2419 for (child = w->next; !NILP (child); child = XWINDOW (child)->next) | |
2420 if (!window_fixed_size_p (XWINDOW (child), width_p, 0)) | |
2421 break; | |
2422 | |
2423 if (NILP (child)) | |
2424 fixed_p = 1; | |
2425 } | |
2426 } | |
2427 else | |
2428 fixed_p = 1; | |
2429 | |
2430 return fixed_p; | |
2431 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2432 |
25268 | 2433 |
2434 /* Return the minimum size of window W, not taking fixed-width windows | |
2435 into account. WIDTH_P non-zero means return the minimum width, | |
2436 otherwise return the minimum height. If W is a combination window, | |
2437 compute the minimum size from the minimum sizes of W's children. */ | |
2438 | |
2439 static int | |
2440 window_min_size_1 (w, width_p) | |
25254 | 2441 struct window *w; |
2442 int width_p; | |
2443 { | |
25268 | 2444 struct window *c; |
25254 | 2445 int size; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2446 |
25268 | 2447 if (!NILP (w->hchild)) |
2448 { | |
2449 c = XWINDOW (w->hchild); | |
2450 size = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2451 |
25268 | 2452 if (width_p) |
2453 { | |
2454 /* The min width of a horizontal combination is | |
2455 the sum of the min widths of its children. */ | |
2456 while (c) | |
2457 { | |
2458 size += window_min_size_1 (c, width_p); | |
2459 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2460 } | |
2461 } | |
2462 else | |
2463 { | |
2464 /* The min height a horizontal combination equals | |
2465 the maximum of all min height of its children. */ | |
2466 while (c) | |
2467 { | |
2468 int min_size = window_min_size_1 (c, width_p); | |
2469 size = max (min_size, size); | |
2470 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2471 } | |
2472 } | |
2473 } | |
2474 else if (!NILP (w->vchild)) | |
2475 { | |
2476 c = XWINDOW (w->vchild); | |
2477 size = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2478 |
25268 | 2479 if (width_p) |
2480 { | |
2481 /* The min width of a vertical combination is | |
2482 the maximum of the min widths of its children. */ | |
2483 while (c) | |
2484 { | |
2485 int min_size = window_min_size_1 (c, width_p); | |
2486 size = max (min_size, size); | |
2487 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2488 } | |
2489 } | |
2490 else | |
2491 { | |
2492 /* The min height of a vertical combination equals | |
2493 the sum of the min height of its children. */ | |
2494 while (c) | |
2495 { | |
2496 size += window_min_size_1 (c, width_p); | |
2497 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2498 } | |
2499 } | |
2500 } | |
25254 | 2501 else |
2502 { | |
25268 | 2503 if (width_p) |
2504 size = window_min_width; | |
25254 | 2505 else |
25268 | 2506 { |
2507 if (MINI_WINDOW_P (w) | |
2508 || (!WINDOW_WANTS_MODELINE_P (w) | |
25546 | 2509 && !WINDOW_WANTS_HEADER_LINE_P (w))) |
25268 | 2510 size = 1; |
2511 else | |
2512 size = window_min_height; | |
2513 } | |
25254 | 2514 } |
2515 | |
2516 return size; | |
2517 } | |
2518 | |
2519 | |
25268 | 2520 /* Return the minimum size of window W, taking fixed-size windows into |
2521 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
|
2522 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
|
2523 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
|
2524 unless FIXED is null. */ |
25268 | 2525 |
2526 static int | |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2527 window_min_size (w, width_p, ignore_fixed_p, fixed) |
25268 | 2528 struct window *w; |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2529 int width_p, ignore_fixed_p, *fixed; |
25268 | 2530 { |
2531 int size, fixed_p; | |
2532 | |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2533 if (ignore_fixed_p) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2534 fixed_p = 0; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2535 else |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2536 fixed_p = window_fixed_size_p (w, width_p, 1); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2537 |
25268 | 2538 if (fixed) |
2539 *fixed = fixed_p; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2540 |
25268 | 2541 if (fixed_p) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2542 size = width_p ? XFASTINT (w->total_cols) : XFASTINT (w->total_lines); |
25268 | 2543 else |
2544 size = window_min_size_1 (w, width_p); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2545 |
25268 | 2546 return size; |
2547 } | |
2548 | |
2549 | |
51223
c1daf1c22f97
(Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents:
51207
diff
changeset
|
2550 /* 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
|
2551 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
|
2552 is still too narrow. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2553 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2554 static int |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2555 adjust_window_margins (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2556 struct window *w; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2557 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2558 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
|
2559 - WINDOW_FRINGE_COLS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2560 - WINDOW_SCROLL_BAR_COLS (w)); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2561 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
|
2562 + WINDOW_RIGHT_MARGIN_COLS (w)); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2563 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2564 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
|
2565 return 1; |
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 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
|
2568 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2569 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2570 /* 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
|
2571 margins will fix that. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2572 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
|
2573 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
|
2574 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2575 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
|
2576 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
|
2577 = make_number (margin_cols/2); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2578 else |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2579 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
|
2580 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2581 else |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2582 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
|
2583 return 1; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2584 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2585 |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2586 /* 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
|
2587 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
|
2588 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
|
2589 can shrink is SHRINKABLE. |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2590 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
|
2591 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
|
2592 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
|
2593 shrinking rows. |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2594 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2595 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
|
2596 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
|
2597 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
|
2598 the second, and so on. |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2599 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2600 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
|
2601 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
|
2602 delete that window). |
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 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
|
2605 shrink more than smaller windows. */ |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2606 static int * |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2607 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
|
2608 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
|
2609 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
|
2610 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
|
2611 Lisp_Object forward; |
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 int available_resize = 0; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2614 int *new_sizes; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2615 struct window *c; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2616 Lisp_Object child; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2617 int smallest = total; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2618 int total_removed = 0; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2619 int total_shrink = total - size; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2620 int i; |
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 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
|
2623 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2624 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
|
2625 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2626 int child_size; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2627 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2628 c = XWINDOW (child); |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2629 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
|
2630 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2631 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
|
2632 new_sizes[i] = -1; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2633 else |
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 new_sizes[i] = child_size; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2636 if (child_size > min_size) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2637 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
|
2638 } |
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 /* 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
|
2641 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
|
2642 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2643 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
|
2644 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2645 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
|
2646 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
|
2647 smallest = new_sizes[i]; |
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 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
|
2650 if (new_sizes[i] == smallest) |
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 /* 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
|
2653 new_sizes[i] = 0; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2654 if (smallest > min_size) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2655 available_resize -= smallest - min_size; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2656 available_resize += smallest; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2657 --shrinkable; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2658 total_removed += smallest; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2659 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2660 /* 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
|
2661 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
|
2662 break; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2663 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2664 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2665 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2666 /* 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
|
2667 proportional to its size. */ |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2668 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
|
2669 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2670 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
|
2671 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2672 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
|
2673 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
|
2674 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
|
2675 new_sizes[i] -= to_shrink; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2676 total_removed += to_shrink; |
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 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2679 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2680 /* 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
|
2681 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
|
2682 while (total_shrink > total_removed) |
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 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
|
2685 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
|
2686 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2687 --new_sizes[i]; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2688 ++total_removed; |
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 /* 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
|
2691 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
|
2692 break; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2693 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2694 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2695 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2696 return new_sizes; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2697 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2698 |
25268 | 2699 /* Set WINDOW's height or width to SIZE. WIDTH_P non-zero means set |
2700 WINDOW's width. Resize WINDOW's children, if any, so that they | |
2701 keep their proportionate size relative to WINDOW. Propagate | |
2702 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
|
2703 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
|
2704 |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2705 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
|
2706 too small, even if they were too small before! */ |
25268 | 2707 |
2708 static void | |
2709 size_window (window, size, width_p, nodelete_p) | |
2710 Lisp_Object window; | |
2711 int size, width_p, nodelete_p; | |
2712 { | |
2713 struct window *w = XWINDOW (window); | |
2714 struct window *c; | |
2715 Lisp_Object child, *forward, *sideward; | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2716 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
|
2717 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2718 /* 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
|
2719 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
|
2720 if (nodelete_p == 2) |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2721 nodelete_p = 0; |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2722 |
25268 | 2723 check_min_window_sizes (); |
32824
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
2724 size = max (0, size); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2725 |
25268 | 2726 /* If the window has been "too small" at one point, |
2727 don't delete it for being "too small" in the future. | |
2728 Preserve it as long as that is at all possible. */ | |
2729 if (width_p) | |
2730 { | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2731 old_size = WINDOW_TOTAL_COLS (w); |
25268 | 2732 min_size = window_min_width; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2733 /* 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
|
2734 We may reduce display margins though. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2735 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
|
2736 + WINDOW_FRINGE_COLS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2737 + WINDOW_SCROLL_BAR_COLS (w)); |
25268 | 2738 } |
2739 else | |
2740 { | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2741 old_size = XINT (w->total_lines); |
25268 | 2742 min_size = window_min_height; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2743 safe_min_size = MIN_SAFE_WINDOW_HEIGHT; |
25268 | 2744 } |
42603
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 (old_size < min_size && nodelete_p != 2) |
25268 | 2747 w->too_small_ok = Qt; |
2748 | |
2749 /* 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
|
2750 if (nodelete_p != 1 && !NILP (w->parent)) |
25268 | 2751 { |
2752 if (!MINI_WINDOW_P (w) && !NILP (w->too_small_ok)) | |
2753 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
|
2754 if (min_size < safe_min_size) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2755 min_size = safe_min_size; |
25268 | 2756 if (size < min_size) |
2757 { | |
2758 delete_window (window); | |
2759 return; | |
2760 } | |
2761 } | |
2762 | |
2763 /* Set redisplay hints. */ | |
32824
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
2764 w->last_modified = make_number (0); |
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
2765 w->last_overlay_modified = make_number (0); |
25268 | 2766 windows_or_buffers_changed++; |
32824
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
2767 FRAME_WINDOW_SIZES_CHANGED (XFRAME (w->frame)) = 1; |
25268 | 2768 |
2769 if (width_p) | |
2770 { | |
2771 sideward = &w->vchild; | |
2772 forward = &w->hchild; | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2773 w->total_cols = make_number (size); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2774 adjust_window_margins (w); |
25268 | 2775 } |
2776 else | |
2777 { | |
2778 sideward = &w->hchild; | |
2779 forward = &w->vchild; | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2780 w->total_lines = make_number (size); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2781 w->orig_total_lines = Qnil; |
25268 | 2782 } |
2783 | |
2784 if (!NILP (*sideward)) | |
2785 { | |
2786 for (child = *sideward; !NILP (child); child = c->next) | |
2787 { | |
2788 c = XWINDOW (child); | |
2789 if (width_p) | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2790 c->left_col = w->left_col; |
25268 | 2791 else |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2792 c->top_line = w->top_line; |
25268 | 2793 size_window (child, size, width_p, nodelete_p); |
2794 } | |
2795 } | |
2796 else if (!NILP (*forward)) | |
2797 { | |
2798 int fixed_size, each, extra, n; | |
2799 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
|
2800 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
|
2801 int *new_sizes = NULL; |
25268 | 2802 |
2803 /* Determine the fixed-size portion of the this window, and the | |
2804 number of child windows. */ | |
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
2805 fixed_size = nchildren = nfixed = total = 0; |
25268 | 2806 for (child = *forward; !NILP (child); child = c->next, ++nchildren) |
2807 { | |
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
2808 int child_size; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2809 |
25268 | 2810 c = XWINDOW (child); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2811 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
|
2812 total += child_size; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2813 |
25268 | 2814 if (window_fixed_size_p (c, width_p, 0)) |
2815 { | |
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
2816 fixed_size += child_size; |
25268 | 2817 ++nfixed; |
2818 } | |
2819 } | |
2820 | |
2821 /* If the new size is smaller than fixed_size, or if there | |
2822 aren't any resizable windows, allow resizing fixed-size | |
2823 windows. */ | |
2824 resize_fixed_p = nfixed == nchildren || size < fixed_size; | |
2825 | |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2826 /* Compute how many lines/columns to add/remove to each child. The |
25268 | 2827 value of extra takes care of rounding errors. */ |
2828 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
|
2829 if (size < total && n > 1) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2830 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
|
2831 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
|
2832 else |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2833 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2834 each = (size - total) / n; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2835 extra = (size - total) - n * each; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2836 } |
25268 | 2837 |
2838 /* 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
|
2839 first_pos = width_p ? XINT (w->left_col) : XINT (w->top_line); |
25268 | 2840 last_pos = first_pos; |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2841 for (n = 0, child = *forward; !NILP (child); child = c->next, ++n) |
25268 | 2842 { |
2843 int new_size, old_size; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2844 |
25268 | 2845 c = XWINDOW (child); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2846 old_size = width_p ? XFASTINT (c->total_cols) : XFASTINT (c->total_lines); |
25268 | 2847 new_size = old_size; |
2848 | |
2849 /* The top or left edge position of this child equals the | |
2850 bottom or right edge of its predecessor. */ | |
2851 if (width_p) | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2852 c->left_col = make_number (last_pos); |
25268 | 2853 else |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2854 c->top_line = make_number (last_pos); |
25268 | 2855 |
2856 /* If this child can be resized, do it. */ | |
2857 if (resize_fixed_p || !window_fixed_size_p (c, width_p, 0)) | |
2858 { | |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2859 new_size = new_sizes ? new_sizes[n] : old_size + each + extra; |
25268 | 2860 extra = 0; |
2861 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2862 |
25268 | 2863 /* Set new height. Note that size_window also propagates |
2864 edge positions to children, so it's not a no-op if we | |
2865 didn't change the child's size. */ | |
2866 size_window (child, new_size, width_p, 1); | |
2867 | |
2868 /* Remember the bottom/right edge position of this child; it | |
2869 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
|
2870 last_pos += new_size; |
25268 | 2871 } |
2872 | |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2873 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
|
2874 |
25268 | 2875 /* We should have covered the parent exactly with child windows. */ |
2876 xassert (size == last_pos - first_pos); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2877 |
25268 | 2878 /* Now delete any children that became too small. */ |
2879 if (!nodelete_p) | |
2880 for (child = *forward; !NILP (child); child = c->next) | |
2881 { | |
2882 int child_size; | |
2883 c = XWINDOW (child); | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2884 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
|
2885 size_window (child, child_size, width_p, 2); |
25268 | 2886 } |
2887 } | |
2888 } | |
2889 | |
2890 /* Set WINDOW's height to HEIGHT, and recursively change the height of | |
2891 WINDOW's children. NODELETE non-zero means don't delete windows | |
2892 that become too small in the process. (The caller should check | |
2893 later and do so if appropriate.) */ | |
265 | 2894 |
20351 | 2895 void |
265 | 2896 set_window_height (window, height, nodelete) |
2897 Lisp_Object window; | |
2898 int height; | |
2899 int nodelete; | |
2900 { | |
25268 | 2901 size_window (window, height, 0, nodelete); |
265 | 2902 } |
2903 | |
25268 | 2904 |
2905 /* Set WINDOW's width to WIDTH, and recursively change the width of | |
2906 WINDOW's children. NODELETE non-zero means don't delete windows | |
2907 that become too small in the process. (The caller should check | |
2908 later and do so if appropriate.) */ | |
265 | 2909 |
20351 | 2910 void |
265 | 2911 set_window_width (window, width, nodelete) |
2912 Lisp_Object window; | |
2913 int width; | |
2914 int nodelete; | |
2915 { | |
25268 | 2916 size_window (window, width, 1, nodelete); |
265 | 2917 } |
25268 | 2918 |
50367
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2919 /* 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
|
2920 |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2921 void |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2922 change_window_heights (window, n) |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2923 Lisp_Object window; |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2924 int n; |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2925 { |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2926 struct window *w = XWINDOW (window); |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2927 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2928 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
|
2929 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
|
2930 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2931 if (INTEGERP (w->orig_top_line)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2932 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
|
2933 if (INTEGERP (w->orig_total_lines)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2934 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
|
2935 |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2936 /* 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
|
2937 if (!NILP (w->vchild)) |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2938 change_window_heights (w->vchild, n); |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2939 |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2940 /* 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
|
2941 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
|
2942 { |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2943 w = XWINDOW (window); |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2944 change_window_heights (window, n); |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2945 } |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2946 } |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
2947 |
265 | 2948 |
362 | 2949 int window_select_count; |
265 | 2950 |
14445
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
2951 Lisp_Object |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
2952 Fset_window_buffer_unwind (obuf) |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
2953 Lisp_Object obuf; |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
2954 { |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
2955 Fset_buffer (obuf); |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
2956 return Qnil; |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
2957 } |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
2958 |
51240
1fe905dd5836
(Fset_window_buffer): Add type of `keep_margins' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51223
diff
changeset
|
2959 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
|
2960 EXFUN (Fset_window_scroll_bars, 4); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2961 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2962 /* 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
|
2963 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
|
2964 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
|
2965 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
|
2966 reset from the buffer's local settings. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2967 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2968 void |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2969 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
|
2970 Lisp_Object window, buffer; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2971 int run_hooks_p, keep_margins_p; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2972 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2973 struct window *w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2974 struct buffer *b = XBUFFER (buffer); |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
2975 int count = SPECPDL_INDEX (); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2976 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2977 w->buffer = buffer; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2978 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2979 if (EQ (window, selected_window)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2980 b->last_selected_window = window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2981 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2982 /* Update time stamps of buffer display. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2983 if (INTEGERP (b->display_count)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2984 XSETINT (b->display_count, XINT (b->display_count) + 1); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2985 b->display_time = Fcurrent_time (); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2986 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2987 XSETFASTINT (w->window_end_pos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2988 XSETFASTINT (w->window_end_vpos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2989 bzero (&w->last_cursor, sizeof w->last_cursor); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2990 w->window_end_valid = Qnil; |
36133
6eb00bee0989
(set_window_buffer): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36131
diff
changeset
|
2991 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
|
2992 w->vscroll = 0; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2993 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
|
2994 set_marker_restricted (w->start, |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2995 make_number (b->last_window_start), |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2996 buffer); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2997 w->start_at_line_beg = Qnil; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2998 w->force_start = Qnil; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2999 XSETFASTINT (w->last_modified, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3000 XSETFASTINT (w->last_overlay_modified, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3001 windows_or_buffers_changed++; |
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 /* 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
|
3004 If WINDOW is selected, switch permanently. |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3005 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
|
3006 if (EQ (window, selected_window)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3007 Fset_buffer (buffer); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3008 /* We can't check ! NILP (Vwindow_scroll_functions) here |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3009 because that might itself be a local variable. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3010 else if (window_initialized) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3011 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3012 record_unwind_protect (Fset_window_buffer_unwind, Fcurrent_buffer ()); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3013 Fset_buffer (buffer); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3014 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3015 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3016 if (!keep_margins_p) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3017 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3018 /* 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
|
3019 |
51223
c1daf1c22f97
(Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents:
51207
diff
changeset
|
3020 /* 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
|
3021 temporarily disable window margins. */ |
52617
f8adaf14f570
(set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents:
52565
diff
changeset
|
3022 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
|
3023 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
|
3024 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3025 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
|
3026 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3027 Fset_window_fringes (window, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3028 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
|
3029 b->fringes_outside_margins); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3030 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3031 Fset_window_scroll_bars (window, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3032 b->scroll_bar_width, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3033 b->vertical_scroll_bar_type, Qnil); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3034 |
52617
f8adaf14f570
(set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents:
52565
diff
changeset
|
3035 w->left_margin_cols = save_left; |
f8adaf14f570
(set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents:
52565
diff
changeset
|
3036 w->right_margin_cols = save_right; |
f8adaf14f570
(set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents:
52565
diff
changeset
|
3037 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3038 Fset_window_margins (window, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3039 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
|
3040 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3041 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3042 if (run_hooks_p) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3043 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3044 if (! NILP (Vwindow_scroll_functions)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3045 run_hook_with_args_2 (Qwindow_scroll_functions, window, |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3046 Fmarker_position (w->start)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3047 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3048 if (! NILP (Vwindow_configuration_change_hook) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3049 && ! NILP (Vrun_hooks)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3050 call1 (Vrun_hooks, Qwindow_configuration_change_hook); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3051 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3052 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3053 unbind_to (count, Qnil); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3054 } |
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 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3057 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
|
3058 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
|
3059 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
|
3060 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
|
3061 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
|
3062 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
|
3063 defaults. |
0730ef55b4d8
(Fset_window_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56616
diff
changeset
|
3064 |
0730ef55b4d8
(Fset_window_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56616
diff
changeset
|
3065 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
|
3066 (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
|
3067 register Lisp_Object window, buffer, keep_margins; |
265 | 3068 { |
3069 register Lisp_Object tem; | |
3070 register struct window *w = decode_window (window); | |
3071 | |
27848
27b993d2ea05
(Fset_window_buffer): Set WINDOW to the window
Gerd Moellmann <gerd@gnu.org>
parents:
27699
diff
changeset
|
3072 XSETWINDOW (window, w); |
265 | 3073 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
|
3074 CHECK_BUFFER (buffer); |
265 | 3075 |
485 | 3076 if (NILP (XBUFFER (buffer)->name)) |
265 | 3077 error ("Attempt to display deleted buffer"); |
3078 | |
3079 tem = w->buffer; | |
485 | 3080 if (NILP (tem)) |
265 | 3081 error ("Window is deleted"); |
3082 else if (! EQ (tem, Qt)) /* w->buffer is t when the window | |
3083 is first being set up. */ | |
3084 { | |
485 | 3085 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
|
3086 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
|
3087 SDATA (XBUFFER (tem)->name)); |
265 | 3088 |
3089 unshow_buffer (w); | |
3090 } | |
3091 | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3092 set_window_buffer (window, buffer, 1, !NILP (keep_margins)); |
265 | 3093 return Qnil; |
3094 } | |
3095 | |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3096 /* Note that selected_window can be nil |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3097 when this is called from Fset_window_configuration. */ |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3098 |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3099 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
|
3100 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
|
3101 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
|
3102 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
|
3103 Optional second arg NORECORD non-nil means |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3104 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
|
3105 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3106 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
|
3107 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
|
3108 (window, norecord) |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3109 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
|
3110 { |
265 | 3111 register struct window *w; |
27869
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3112 register struct window *ow; |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3113 struct frame *sf; |
265 | 3114 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3115 CHECK_LIVE_WINDOW (window); |
265 | 3116 |
3117 w = XWINDOW (window); | |
39953
3a1666ed16b8
(select_window_1): Unfreeze window start. Remove a
Gerd Moellmann <gerd@gnu.org>
parents:
39952
diff
changeset
|
3118 w->frozen_window_start_p = 0; |
265 | 3119 |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
3120 XSETFASTINT (w->use_time, ++window_select_count); |
265 | 3121 if (EQ (window, selected_window)) |
3122 return window; | |
3123 | |
27869
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3124 if (!NILP (selected_window)) |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3125 { |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3126 ow = XWINDOW (selected_window); |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3127 if (! NILP (ow->buffer)) |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3128 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
|
3129 BUF_PT (XBUFFER (ow->buffer)), |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3130 BUF_PT_BYTE (XBUFFER (ow->buffer))); |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3131 } |
265 | 3132 |
3133 selected_window = window; | |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3134 sf = SELECTED_FRAME (); |
48927
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
3135 if (XFRAME (WINDOW_FRAME (w)) != sf) |
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
3136 { |
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
3137 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
|
3138 /* 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
|
3139 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
|
3140 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
|
3141 frame is active. */ |
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
3142 Fselect_frame (WINDOW_FRAME (w), Qnil); |
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
3143 } |
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
3144 else |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3145 sf->selected_window = window; |
265 | 3146 |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3147 if (NILP (norecord)) |
22187
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
3148 record_buffer (w->buffer); |
265 | 3149 Fset_buffer (w->buffer); |
3150 | |
16068
b19129a8c644
(unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
3151 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
|
3152 |
265 | 3153 /* Go to the point recorded in the window. |
3154 This is important when the buffer is in more | |
3155 than one window. It also matters when | |
3156 redisplay_window has altered point after scrolling, | |
3157 because it makes the change only in the window. */ | |
3158 { | |
3159 register int new_point = marker_position (w->pointm); | |
3160 if (new_point < BEGV) | |
3161 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
|
3162 else if (new_point > ZV) |
265 | 3163 SET_PT (ZV); |
3164 else | |
3165 SET_PT (new_point); | |
3166 } | |
3167 | |
3168 windows_or_buffers_changed++; | |
3169 return window; | |
3170 } | |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3171 |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3172 static Lisp_Object |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3173 select_window_norecord (window) |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3174 Lisp_Object window; |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3175 { |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3176 return Fselect_window (window, Qt); |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3177 } |
22187
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
3178 |
14175
ace33b55f549
(display_buffer_1): Don't deiconify the selected frame.
Richard M. Stallman <rms@gnu.org>
parents:
14166
diff
changeset
|
3179 /* 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
|
3180 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
|
3181 then return WINDOW. |
ace33b55f549
(display_buffer_1): Don't deiconify the selected frame.
Richard M. Stallman <rms@gnu.org>
parents:
14166
diff
changeset
|
3182 |
ace33b55f549
(display_buffer_1): Don't deiconify the selected frame.
Richard M. Stallman <rms@gnu.org>
parents:
14166
diff
changeset
|
3183 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
|
3184 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
|
3185 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
|
3186 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
|
3187 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
|
3188 |
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3189 static Lisp_Object |
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3190 display_buffer_1 (window) |
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3191 Lisp_Object window; |
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3192 { |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3193 Lisp_Object frame = XWINDOW (window)->frame; |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3194 FRAME_PTR f = XFRAME (frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3195 |
13619
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3196 FRAME_SAMPLE_VISIBILITY (f); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3197 |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3198 if (EQ (frame, selected_frame)) |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3199 ; /* Assume the selected frame is already visible enough. */ |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3200 else if (minibuf_level > 0 |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3201 && MINI_WINDOW_P (XWINDOW (selected_window)) |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3202 && WINDOW_LIVE_P (minibuf_selected_window) |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3203 && EQ (frame, WINDOW_FRAME (XWINDOW (minibuf_selected_window)))) |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3204 ; /* 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
|
3205 else |
14535
8ca7e641c144
(display_buffer_1): Raise the frame if already visible.
Richard M. Stallman <rms@gnu.org>
parents:
14445
diff
changeset
|
3206 { |
8ca7e641c144
(display_buffer_1): Raise the frame if already visible.
Richard M. Stallman <rms@gnu.org>
parents:
14445
diff
changeset
|
3207 if (FRAME_ICONIFIED_P (f)) |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3208 Fmake_frame_visible (frame); |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
3209 else if (FRAME_VISIBLE_P (f)) |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3210 Fraise_frame (frame); |
14535
8ca7e641c144
(display_buffer_1): Raise the frame if already visible.
Richard M. Stallman <rms@gnu.org>
parents:
14445
diff
changeset
|
3211 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3212 |
13619
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3213 return window; |
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3214 } |
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3215 |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3216 DEFUN ("special-display-p", Fspecial_display_p, Sspecial_display_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
|
3217 doc: /* Returns non-nil if a buffer named BUFFER-NAME would be created specially. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3218 The value is actually t if the frame should be called with default frame |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3219 parameters, and a list of frame parameters if they were specified. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3220 See `special-display-buffer-names', and `special-display-regexps'. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3221 (buffer_name) |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3222 Lisp_Object buffer_name; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3223 { |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3224 Lisp_Object tem; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3225 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3226 CHECK_STRING (buffer_name); |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3227 |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3228 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
|
3229 if (!NILP (tem)) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3230 return Qt; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3231 |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3232 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
|
3233 if (!NILP (tem)) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3234 return XCDR (tem); |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3235 |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3236 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
|
3237 { |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3238 Lisp_Object car = XCAR (tem); |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3239 if (STRINGP (car) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3240 && 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
|
3241 return Qt; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3242 else if (CONSP (car) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3243 && STRINGP (XCAR (car)) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3244 && 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
|
3245 return XCDR (car); |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3246 } |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3247 return Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3248 } |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3249 |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3250 DEFUN ("same-window-p", Fsame_window_p, Ssame_window_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
|
3251 doc: /* Returns non-nil if a new buffer named BUFFER-NAME would use the same window. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3252 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
|
3253 (buffer_name) |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3254 Lisp_Object buffer_name; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3255 { |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3256 Lisp_Object tem; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3257 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3258 CHECK_STRING (buffer_name); |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3259 |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3260 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
|
3261 if (!NILP (tem)) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3262 return Qt; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3263 |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3264 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
|
3265 if (!NILP (tem)) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3266 return Qt; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3267 |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3268 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
|
3269 { |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3270 Lisp_Object car = XCAR (tem); |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3271 if (STRINGP (car) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3272 && 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
|
3273 return Qt; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3274 else if (CONSP (car) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3275 && STRINGP (XCAR (car)) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3276 && 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
|
3277 return Qt; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3278 } |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3279 return Qnil; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3280 } |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3281 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3282 /* 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
|
3283 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
|
3284 "BDisplay buffer: \nP", |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3285 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
|
3286 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
|
3287 a buffer. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3288 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
|
3289 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
|
3290 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
|
3291 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
|
3292 Returns the window displaying BUFFER. |
44155
d94cb7b3b165
(Fdisplay_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43713
diff
changeset
|
3293 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
|
3294 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
|
3295 |
54267
bd5ef1fde279
(Fdisplay_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
54229
diff
changeset
|
3296 The variables `special-display-buffer-names', |
bd5ef1fde279
(Fdisplay_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
54229
diff
changeset
|
3297 `special-display-regexps', `same-window-buffer-names', and |
bd5ef1fde279
(Fdisplay_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
54229
diff
changeset
|
3298 `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
|
3299 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
|
3300 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3301 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
|
3302 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
|
3303 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
|
3304 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
|
3305 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
|
3306 (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
|
3307 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
|
3308 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
|
3309 |
55563
a58f6db8bf3d
(Fdisplay_buffer, Fsplit_window, split-height-threshold): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
55402
diff
changeset
|
3310 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
|
3311 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
|
3312 `split-height-threshold'. |
a58f6db8bf3d
(Fdisplay_buffer, Fsplit_window, split-height-threshold): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
55402
diff
changeset
|
3313 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3314 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
|
3315 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
|
3316 displayed. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3317 (buffer, not_this_window, frame) |
20867
fccf74829150
(Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
20777
diff
changeset
|
3318 register Lisp_Object buffer, not_this_window, frame; |
265 | 3319 { |
25182
ef79ee0ceedd
(display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents:
25115
diff
changeset
|
3320 register Lisp_Object window, tem, swp; |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3321 struct frame *f; |
25182
ef79ee0ceedd
(display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents:
25115
diff
changeset
|
3322 |
ef79ee0ceedd
(display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents:
25115
diff
changeset
|
3323 swp = Qnil; |
265 | 3324 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
|
3325 CHECK_BUFFER (buffer); |
265 | 3326 |
485 | 3327 if (!NILP (Vdisplay_buffer_function)) |
265 | 3328 return call2 (Vdisplay_buffer_function, buffer, not_this_window); |
3329 | |
485 | 3330 if (NILP (not_this_window) |
265 | 3331 && 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
|
3332 return display_buffer_1 (selected_window); |
265 | 3333 |
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
3334 /* 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
|
3335 in the selected window. */ |
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
3336 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
|
3337 { |
25182
ef79ee0ceedd
(display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents:
25115
diff
changeset
|
3338 swp = Fsame_window_p (XBUFFER (buffer)->name); |
ef79ee0ceedd
(display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents:
25115
diff
changeset
|
3339 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
|
3340 { |
71304a70d0f6
(Fdisplay_buffer): Fix prev change--return selected window.
Richard M. Stallman <rms@gnu.org>
parents:
10958
diff
changeset
|
3341 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
|
3342 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
|
3343 } |
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
3344 } |
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
3345 |
44155
d94cb7b3b165
(Fdisplay_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43713
diff
changeset
|
3346 /* 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
|
3347 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
|
3348 Otherwise search only the current frame. */ |
20867
fccf74829150
(Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
20777
diff
changeset
|
3349 if (! NILP (frame)) |
fccf74829150
(Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
20777
diff
changeset
|
3350 tem = frame; |
30560
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
3351 else if (pop_up_frames |
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
3352 || display_buffer_reuse_frames |
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
3353 || last_nonminibuf_frame == 0) |
11427
c4ee56df7173
(Fdisplay_buffer): Search the proper frame when the
Karl Heuer <kwzh@gnu.org>
parents:
11405
diff
changeset
|
3354 XSETFASTINT (tem, 0); |
c4ee56df7173
(Fdisplay_buffer): Search the proper frame when the
Karl Heuer <kwzh@gnu.org>
parents:
11405
diff
changeset
|
3355 else |
c4ee56df7173
(Fdisplay_buffer): Search the proper frame when the
Karl Heuer <kwzh@gnu.org>
parents:
11405
diff
changeset
|
3356 XSETFRAME (tem, last_nonminibuf_frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3357 |
11427
c4ee56df7173
(Fdisplay_buffer): Search the proper frame when the
Karl Heuer <kwzh@gnu.org>
parents:
11405
diff
changeset
|
3358 window = Fget_buffer_window (buffer, tem); |
485 | 3359 if (!NILP (window) |
3360 && (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
|
3361 return display_buffer_1 (window); |
265 | 3362 |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3363 /* Certain buffer names get special handling. */ |
25182
ef79ee0ceedd
(display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents:
25115
diff
changeset
|
3364 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
|
3365 { |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3366 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
|
3367 if (EQ (tem, Qt)) |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3368 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
|
3369 if (CONSP (tem)) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3370 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
|
3371 } |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3372 |
769 | 3373 /* If there are no frames open that have more than a minibuffer, |
3374 we need to create a new frame. */ | |
3375 if (pop_up_frames || last_nonminibuf_frame == 0) | |
265 | 3376 { |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3377 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
|
3378 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
|
3379 return display_buffer_1 (window); |
265 | 3380 } |
3381 | |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3382 f = SELECTED_FRAME (); |
358 | 3383 if (pop_up_windows |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3384 || 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
|
3385 /* 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
|
3386 don't try to reuse its windows. */ |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3387 || !NILP (XWINDOW (FRAME_ROOT_WINDOW (f))->dedicated)) |
358 | 3388 { |
6517
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
3389 Lisp_Object frames; |
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
3390 |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
3391 frames = Qnil; |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3392 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
|
3393 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
|
3394 /* Don't try to create a window if we would get an error. */ |
265 | 3395 if (split_height_threshold < window_min_height << 1) |
3396 split_height_threshold = window_min_height << 1; | |
3397 | |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3398 /* 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
|
3399 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
|
3400 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
|
3401 |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3402 /* 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
|
3403 try other frames. */ |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3404 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
|
3405 { |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3406 /* Try visible frames first. */ |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3407 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
|
3408 /* 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
|
3409 if (NILP (window)) |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3410 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
|
3411 if (NILP (window)) |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3412 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
|
3413 } |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3414 else |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3415 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
|
3416 |
9567
cf4f4c8a3ef6
(Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents:
9324
diff
changeset
|
3417 /* 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
|
3418 split it. */ |
485 | 3419 if (!NILP (window) |
9567
cf4f4c8a3ef6
(Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents:
9324
diff
changeset
|
3420 && ! FRAME_NO_SPLIT_P (XFRAME (XWINDOW (window)->frame)) |
265 | 3421 && 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
|
3422 && WINDOW_FULL_WIDTH_P (XWINDOW (window))) |
265 | 3423 window = Fsplit_window (window, Qnil, Qnil); |
3424 else | |
3425 { | |
9614
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3426 Lisp_Object upper, lower, other; |
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3427 |
769 | 3428 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
|
3429 /* 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
|
3430 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
|
3431 if (!NILP (window) |
9567
cf4f4c8a3ef6
(Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents:
9324
diff
changeset
|
3432 && ! 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
|
3433 && (EQ (window, selected_window) |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3434 || EQ (XWINDOW (window)->parent, Qnil)) |
265 | 3435 && window_height (window) >= window_min_height << 1) |
3436 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
|
3437 /* 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
|
3438 |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3439 /* Try visible frames first. */ |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3440 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
|
3441 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
|
3442 if (NILP (window)) |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3443 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
|
3444 /* 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
|
3445 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
|
3446 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
|
3447 if (NILP (window)) |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3448 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
|
3449 /* Try invisible frames. */ |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3450 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
|
3451 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
|
3452 if (NILP (window)) |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3453 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
|
3454 /* 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
|
3455 if (NILP (window)) |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3456 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
|
3457 /* 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
|
3458 even out their heights. */ |
11750
b911d6f75664
(Fdisplay_buffer): Initialize other, upper, lower.
Richard M. Stallman <rms@gnu.org>
parents:
11731
diff
changeset
|
3459 other = upper = lower = Qnil; |
9614
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3460 if (!NILP (XWINDOW (window)->prev)) |
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3461 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
|
3462 if (!NILP (XWINDOW (window)->next)) |
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3463 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
|
3464 if (!NILP (other) |
34261
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
3465 && !NILP (Veven_window_heights) |
9614
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3466 /* 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
|
3467 && !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
|
3468 && (XFASTINT (XWINDOW (other)->total_lines) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3469 > 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
|
3470 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3471 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
|
3472 + XFASTINT (XWINDOW (window)->total_lines)); |
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
3473 enlarge_window (upper, |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3474 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
|
3475 0, 0); |
9614
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3476 } |
265 | 3477 } |
3478 } | |
3479 else | |
3480 window = Fget_lru_window (Qnil); | |
3481 | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3482 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
|
3483 return display_buffer_1 (window); |
265 | 3484 } |
3485 | |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3486 |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3487 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
|
3488 0, 1, 0, |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3489 doc: /* Force redisplay of all windows. |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3490 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
|
3491 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
|
3492 displaying that buffer. */) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3493 (object) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3494 Lisp_Object object; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3495 { |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3496 if (NILP (object)) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3497 { |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3498 windows_or_buffers_changed++; |
54178
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
3499 update_mode_lines++; |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3500 return Qt; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3501 } |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3502 |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3503 if (WINDOWP (object)) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3504 { |
54178
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
3505 struct window *w = XWINDOW (object); |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3506 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
|
3507 w->update_mode_line = Qt; |
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
3508 if (BUFFERP (w->buffer)) |
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
3509 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
|
3510 ++update_mode_lines; |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3511 return Qt; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3512 } |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
3513 |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3514 if (STRINGP (object)) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3515 object = Fget_buffer (object); |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3516 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
|
3517 { |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3518 /* 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
|
3519 of each of those windows. */ |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3520 |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3521 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
|
3522 return NILP (object) ? Qnil : Qt; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3523 } |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3524 |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3525 /* 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
|
3526 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
|
3527 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
|
3528 return Qnil; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3529 } |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3530 |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3531 |
265 | 3532 void |
3533 temp_output_buffer_show (buf) | |
3534 register Lisp_Object buf; | |
3535 { | |
3536 register struct buffer *old = current_buffer; | |
3537 register Lisp_Object window; | |
3538 register struct window *w; | |
3539 | |
18493
d65021d5c39e
(temp_output_buffer_show): Copy default-directory from current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18065
diff
changeset
|
3540 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
|
3541 |
265 | 3542 Fset_buffer (buf); |
10302
34556316a48a
(temp_output_buffer_show): Use BUF_SAVE_MODIFF.
Richard M. Stallman <rms@gnu.org>
parents:
10043
diff
changeset
|
3543 BUF_SAVE_MODIFF (XBUFFER (buf)) = MODIFF; |
265 | 3544 BEGV = BEG; |
3545 ZV = Z; | |
3546 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
|
3547 #if 0 /* rms: there should be no reason for this. */ |
25375 | 3548 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
|
3549 #endif |
265 | 3550 set_buffer_internal (old); |
3551 | |
3552 if (!EQ (Vtemp_buffer_show_function, Qnil)) | |
3553 call1 (Vtemp_buffer_show_function, buf); | |
3554 else | |
3555 { | |
20867
fccf74829150
(Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
20777
diff
changeset
|
3556 window = Fdisplay_buffer (buf, Qnil, Qnil); |
265 | 3557 |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3558 if (!EQ (XWINDOW (window)->frame, selected_frame)) |
769 | 3559 Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window))); |
265 | 3560 Vminibuf_scroll_window = window; |
3561 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
|
3562 XSETFASTINT (w->hscroll, 0); |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
3563 XSETFASTINT (w->min_hscroll, 0); |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3564 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
|
3565 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
|
3566 |
22149
ad3ee5ec90d1
(Fselect_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
21844
diff
changeset
|
3567 /* 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
|
3568 and its buffer current. */ |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3569 |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3570 if (!NILP (Vrun_hooks) |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3571 && !NILP (Fboundp (Qtemp_buffer_show_hook)) |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3572 && !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
|
3573 { |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3574 int count = SPECPDL_INDEX (); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3575 Lisp_Object prev_window, prev_buffer; |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3576 prev_window = selected_window; |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3577 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
|
3578 |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3579 /* 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
|
3580 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
|
3581 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
|
3582 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
|
3583 record_unwind_protect (Fset_buffer, prev_buffer); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3584 record_unwind_protect (select_window_norecord, prev_window); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3585 Fselect_window (window, Qt); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3586 Fset_buffer (w->buffer); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3587 call1 (Vrun_hooks, Qtemp_buffer_show_hook); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3588 unbind_to (count, Qnil); |
11405
645e3883da72
(temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents:
11307
diff
changeset
|
3589 } |
645e3883da72
(temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents:
11307
diff
changeset
|
3590 } |
265 | 3591 } |
3592 | |
21514 | 3593 static void |
265 | 3594 make_dummy_parent (window) |
3595 Lisp_Object window; | |
3596 { | |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3597 Lisp_Object new; |
265 | 3598 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
|
3599 int i; |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3600 |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3601 o = XWINDOW (window); |
36432
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
3602 p = allocate_window (); |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3603 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
|
3604 ((struct Lisp_Vector *) p)->contents[i] |
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
3605 = ((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
|
3606 XSETWINDOW (new, p); |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3607 |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
3608 XSETFASTINT (p->sequence_number, ++sequence_number); |
265 | 3609 |
3610 /* Put new into window structure in place of window */ | |
3611 replace_window (window, new); | |
3612 | |
3613 o->next = Qnil; | |
3614 o->prev = Qnil; | |
3615 o->vchild = Qnil; | |
3616 o->hchild = Qnil; | |
3617 o->parent = new; | |
3618 | |
3619 p->start = Qnil; | |
3620 p->pointm = Qnil; | |
3621 p->buffer = Qnil; | |
3622 } | |
3623 | |
3624 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
|
3625 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
|
3626 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
|
3627 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
|
3628 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
|
3629 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
|
3630 Interactively, all arguments are nil. |
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
3631 |
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
3632 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
|
3633 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
|
3634 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
|
3635 (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
|
3636 Lisp_Object window, size, horflag; |
265 | 3637 { |
3638 register Lisp_Object new; | |
3639 register struct window *o, *p; | |
13723
4e170419e83c
(Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents:
13619
diff
changeset
|
3640 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
|
3641 register int size_int; |
265 | 3642 |
485 | 3643 if (NILP (window)) |
265 | 3644 window = selected_window; |
3645 else | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3646 CHECK_LIVE_WINDOW (window); |
265 | 3647 |
3648 o = XWINDOW (window); | |
13723
4e170419e83c
(Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents:
13619
diff
changeset
|
3649 fo = XFRAME (WINDOW_FRAME (o)); |
265 | 3650 |
13780
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3651 if (NILP (size)) |
265 | 3652 { |
485 | 3653 if (!NILP (horflag)) |
13723
4e170419e83c
(Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents:
13619
diff
changeset
|
3654 /* 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
|
3655 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
|
3656 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
|
3657 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
|
3658 size_int = (XFASTINT (o->total_cols) + 1) >> 1; |
265 | 3659 else |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3660 size_int = XFASTINT (o->total_lines) >> 1; |
265 | 3661 } |
3662 else | |
3663 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3664 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
|
3665 size_int = XINT (size); |
265 | 3666 } |
3667 | |
3668 if (MINI_WINDOW_P (o)) | |
3669 error ("Attempt to split minibuffer window"); | |
25268 | 3670 else if (window_fixed_size_p (o, !NILP (horflag), 0)) |
3671 error ("Attempt to split fixed-size window"); | |
265 | 3672 |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
3673 check_min_window_sizes (); |
265 | 3674 |
485 | 3675 if (NILP (horflag)) |
265 | 3676 { |
13780
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3677 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
|
3678 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
|
3679 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
|
3680 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
|
3681 XFASTINT (o->total_lines) - size_int); |
485 | 3682 if (NILP (o->parent) |
3683 || NILP (XWINDOW (o->parent)->vchild)) | |
265 | 3684 { |
3685 make_dummy_parent (window); | |
3686 new = o->parent; | |
3687 XWINDOW (new)->vchild = window; | |
3688 } | |
3689 } | |
3690 else | |
3691 { | |
13780
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3692 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
|
3693 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
|
3694 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3695 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
|
3696 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
|
3697 XFASTINT (o->total_cols) - size_int); |
485 | 3698 if (NILP (o->parent) |
3699 || NILP (XWINDOW (o->parent)->hchild)) | |
265 | 3700 { |
3701 make_dummy_parent (window); | |
3702 new = o->parent; | |
3703 XWINDOW (new)->hchild = window; | |
3704 } | |
3705 } | |
3706 | |
3707 /* Now we know that window's parent is a vertical combination | |
3708 if we are dividing vertically, or a horizontal combination | |
3709 if we are making side-by-side windows */ | |
3710 | |
3711 windows_or_buffers_changed++; | |
13723
4e170419e83c
(Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents:
13619
diff
changeset
|
3712 FRAME_WINDOW_SIZES_CHANGED (fo) = 1; |
265 | 3713 new = make_window (); |
3714 p = XWINDOW (new); | |
3715 | |
769 | 3716 p->frame = o->frame; |
265 | 3717 p->next = o->next; |
485 | 3718 if (!NILP (p->next)) |
265 | 3719 XWINDOW (p->next)->prev = new; |
3720 p->prev = window; | |
3721 o->next = new; | |
3722 p->parent = o->parent; | |
3723 p->buffer = Qt; | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3724 p->window_end_valid = Qnil; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3725 bzero (&p->last_cursor, sizeof p->last_cursor); |
265 | 3726 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3727 /* Duplicate special geometry settings. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3728 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3729 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
|
3730 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
|
3731 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
|
3732 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
|
3733 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
|
3734 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
|
3735 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
|
3736 |
769 | 3737 /* Apportion the available frame space among the two new windows */ |
265 | 3738 |
485 | 3739 if (!NILP (horflag)) |
265 | 3740 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3741 p->total_lines = o->total_lines; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3742 p->top_line = o->top_line; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3743 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
|
3744 XSETFASTINT (o->total_cols, size_int); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3745 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
|
3746 adjust_window_margins (p); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3747 adjust_window_margins (o); |
265 | 3748 } |
3749 else | |
3750 { | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3751 p->left_col = o->left_col; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3752 p->total_cols = o->total_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3753 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
|
3754 XSETFASTINT (o->total_lines, size_int); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3755 XSETFASTINT (p->top_line, XFASTINT (o->top_line) + size_int); |
265 | 3756 } |
3757 | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3758 /* Adjust glyph matrices. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3759 adjust_glyphs (fo); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3760 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3761 Fset_window_buffer (new, o->buffer, Qt); |
265 | 3762 return new; |
3763 } | |
3764 | |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3765 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
|
3766 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
|
3767 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
|
3768 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
|
3769 |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3770 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
|
3771 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
|
3772 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
|
3773 (arg, side, preserve_before) |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3774 register Lisp_Object arg, side, preserve_before; |
265 | 3775 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3776 CHECK_NUMBER (arg); |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3777 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
|
3778 !NILP (preserve_before)); |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3779 |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3780 if (! NILP (Vwindow_configuration_change_hook)) |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3781 call1 (Vrun_hooks, Qwindow_configuration_change_hook); |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3782 |
265 | 3783 return Qnil; |
3784 } | |
3785 | |
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3786 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
|
3787 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
|
3788 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
|
3789 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
|
3790 |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3791 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
|
3792 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
|
3793 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
|
3794 (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
|
3795 register Lisp_Object arg, side, preserve_before; |
265 | 3796 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3797 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
|
3798 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
|
3799 !NILP (preserve_before)); |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3800 |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3801 if (! NILP (Vwindow_configuration_change_hook)) |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3802 call1 (Vrun_hooks, Qwindow_configuration_change_hook); |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3803 |
265 | 3804 return Qnil; |
3805 } | |
3806 | |
3807 int | |
3808 window_height (window) | |
3809 Lisp_Object window; | |
3810 { | |
3811 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
|
3812 return WINDOW_TOTAL_LINES (p); |
265 | 3813 } |
3814 | |
3815 int | |
3816 window_width (window) | |
3817 Lisp_Object window; | |
3818 { | |
3819 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
|
3820 return WINDOW_TOTAL_COLS (p); |
265 | 3821 } |
3822 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3823 |
265 | 3824 #define CURBEG(w) \ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3825 *(widthflag ? &(XWINDOW (w)->left_col) : &(XWINDOW (w)->top_line)) |
265 | 3826 |
3827 #define CURSIZE(w) \ | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3828 *(widthflag ? &(XWINDOW (w)->total_cols) : &(XWINDOW (w)->total_lines)) |
265 | 3829 |
25268 | 3830 |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3831 /* Enlarge WINDOW by DELTA. WIDTHFLAG non-zero means |
25268 | 3832 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
|
3833 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
|
3834 they will be deleted. |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3835 |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3836 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
|
3837 the siblings to the left or above WINDOW. */ |
265 | 3838 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3839 static void |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3840 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
|
3841 Lisp_Object window; |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3842 int delta, widthflag, preserve_before; |
265 | 3843 { |
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
3844 Lisp_Object parent, next, prev; |
25268 | 3845 struct window *p; |
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
3846 Lisp_Object *sizep; |
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
3847 int maximum; |
20351 | 3848 int (*sizefun) P_ ((Lisp_Object)) |
3849 = widthflag ? window_width : window_height; | |
25268 | 3850 void (*setsizefun) P_ ((Lisp_Object, int, int)) |
20351 | 3851 = (widthflag ? set_window_width : set_window_height); |
25268 | 3852 |
3853 /* Check values of window_min_width and window_min_height for | |
3854 validity. */ | |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
3855 check_min_window_sizes (); |
265 | 3856 |
25268 | 3857 /* Give up if this window cannot be resized. */ |
3858 if (window_fixed_size_p (XWINDOW (window), widthflag, 1)) | |
3859 error ("Window is not resizable"); | |
3860 | |
3861 /* Find the parent of the selected window. */ | |
265 | 3862 while (1) |
3863 { | |
3864 p = XWINDOW (window); | |
3865 parent = p->parent; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3866 |
485 | 3867 if (NILP (parent)) |
265 | 3868 { |
3869 if (widthflag) | |
3870 error ("No other window to side of this one"); | |
3871 break; | |
3872 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3873 |
25268 | 3874 if (widthflag |
3875 ? !NILP (XWINDOW (parent)->hchild) | |
485 | 3876 : !NILP (XWINDOW (parent)->vchild)) |
265 | 3877 break; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3878 |
265 | 3879 window = parent; |
3880 } | |
3881 | |
1049
25046e48ce9a
* window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents:
1016
diff
changeset
|
3882 sizep = &CURSIZE (window); |
25046e48ce9a
* window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents:
1016
diff
changeset
|
3883 |
265 | 3884 { |
3885 register int maxdelta; | |
3886 | |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3887 /* 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
|
3888 |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3889 if (preserve_before) |
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 (!NILP (parent)) |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3892 { |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3893 maxdelta = (*sizefun) (parent) - XINT (*sizep); |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3894 /* 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
|
3895 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
|
3896 } |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3897 else |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3898 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
|
3899 - 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
|
3900 widthflag, 0, 0)) |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3901 : (delta = 0)); |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3902 } |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3903 else |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3904 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
|
3905 /* 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
|
3906 : !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
|
3907 - 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
|
3908 widthflag, 0, 0)) |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3909 /* 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
|
3910 : !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
|
3911 - 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
|
3912 widthflag, 0, 0)) |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3913 /* 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
|
3914 or a minibufferless frame. */ |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3915 : (delta = 0)); |
265 | 3916 |
3917 if (delta > maxdelta) | |
3918 /* This case traps trying to make the minibuffer | |
769 | 3919 the full frame, or make the only window aside from the |
3920 minibuffer the full frame. */ | |
265 | 3921 delta = maxdelta; |
7618
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
3922 } |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
3923 |
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
3924 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
|
3925 { |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3926 delete_window (window); |
432 | 3927 return; |
7618
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
3928 } |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
3929 |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
3930 if (delta == 0) |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
3931 return; |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
3932 |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3933 /* 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
|
3934 maximum = 0; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3935 for (next = p->next; ! NILP (next); next = XWINDOW (next)->next) |
25254 | 3936 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
|
3937 widthflag, 0, 0); |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3938 if (! preserve_before) |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3939 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
|
3940 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
|
3941 widthflag, 0, 0); |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3942 |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3943 /* 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
|
3944 if (delta <= maximum) |
265 | 3945 { |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3946 Lisp_Object first_unaffected; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3947 Lisp_Object first_affected; |
25268 | 3948 int fixed_p; |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3949 |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3950 next = p->next; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3951 prev = p->prev; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3952 first_affected = window; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3953 /* 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
|
3954 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
|
3955 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
|
3956 while (delta != 0 |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3957 && (!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
|
3958 { |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3959 if (! NILP (next)) |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3960 { |
25254 | 3961 int this_one = ((*sizefun) (next) |
25268 | 3962 - window_min_size (XWINDOW (next), |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3963 widthflag, 0, &fixed_p)); |
25268 | 3964 if (!fixed_p) |
3965 { | |
3966 if (this_one > delta) | |
3967 this_one = delta; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3968 |
25268 | 3969 (*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
|
3970 (*setsizefun) (window, XINT (*sizep) + this_one, 0); |
25268 | 3971 |
3972 delta -= this_one; | |
3973 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3974 |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3975 next = XWINDOW (next)->next; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3976 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3977 |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3978 if (delta == 0) |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3979 break; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3980 |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3981 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
|
3982 { |
25254 | 3983 int this_one = ((*sizefun) (prev) |
25268 | 3984 - window_min_size (XWINDOW (prev), |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3985 widthflag, 0, &fixed_p)); |
25268 | 3986 if (!fixed_p) |
3987 { | |
3988 if (this_one > delta) | |
3989 this_one = delta; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3990 |
25268 | 3991 first_affected = prev; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3992 |
25268 | 3993 (*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
|
3994 (*setsizefun) (window, XINT (*sizep) + this_one, 0); |
25268 | 3995 |
3996 delta -= this_one; | |
3997 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3998 |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
3999 prev = XWINDOW (prev)->prev; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4000 } |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4001 } |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4002 |
25268 | 4003 xassert (delta == 0); |
4004 | |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4005 /* 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
|
4006 based on the new sizes. */ |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4007 first_unaffected = next; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4008 prev = first_affected; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4009 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
|
4010 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
|
4011 { |
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
4012 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
|
4013 /* 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
|
4014 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
|
4015 (*setsizefun) (next, (*sizefun) (next), 0); |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4016 } |
265 | 4017 } |
4018 else | |
4019 { | |
4020 register int delta1; | |
4021 register int opht = (*sizefun) (parent); | |
4022 | |
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
4023 if (opht <= XINT (*sizep) + delta) |
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4024 { |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4025 /* 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
|
4026 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
|
4027 Lisp_Object start, tem, next; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4028 |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4029 start = XWINDOW (parent)->vchild; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4030 if (NILP (start)) |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4031 start = XWINDOW (parent)->hchild; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4032 |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4033 /* 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
|
4034 tem = XWINDOW (window)->next; |
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4035 while (! NILP (tem)) |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4036 { |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4037 next = XWINDOW (tem)->next; |
42862
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4038 delete_window (tem); |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4039 tem = next; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4040 } |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4041 |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4042 /* 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
|
4043 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
|
4044 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
|
4045 tem = start; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4046 while (! EQ (tem, window)) |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4047 { |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4048 next = XWINDOW (tem)->next; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4049 delete_window (tem); |
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4050 tem = next; |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4051 } |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4052 } |
265 | 4053 else |
25268 | 4054 { |
4055 /* Otherwise, make delta1 just right so that if we add | |
4056 delta1 lines to this window and to the parent, and then | |
4057 shrink the parent back to its original size, the new | |
4058 proportional size of this window will increase by delta. | |
4059 | |
4060 The function size_window will compute the new height h' | |
4061 of the window from delta1 as: | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4062 |
25268 | 4063 e = delta1/n |
4064 x = delta1 - delta1/n * n for the 1st resizable child | |
4065 h' = h + e + x | |
4066 | |
4067 where n is the number of children that can be resized. | |
4068 We can ignore x by choosing a delta1 that is a multiple of | |
4069 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
|
4070 |
25268 | 4071 h' = h + delta |
4072 | |
4073 So, delta1 must be | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4074 |
25268 | 4075 h + e = h + delta |
4076 delta1/n = delta | |
4077 delta1 = n * delta. | |
4078 | |
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
4079 The number of children n equals the number of resizable |
25268 | 4080 children of this window + 1 because we know window itself |
4081 is resizable (otherwise we would have signalled an error. */ | |
4082 | |
4083 struct window *w = XWINDOW (window); | |
4084 Lisp_Object s; | |
4085 int n = 1; | |
4086 | |
4087 for (s = w->next; !NILP (s); s = XWINDOW (s)->next) | |
4088 if (!window_fixed_size_p (XWINDOW (s), widthflag, 0)) | |
4089 ++n; | |
4090 for (s = w->prev; !NILP (s); s = XWINDOW (s)->prev) | |
4091 if (!window_fixed_size_p (XWINDOW (s), widthflag, 0)) | |
4092 ++n; | |
4093 | |
4094 delta1 = n * delta; | |
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4095 |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4096 /* 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
|
4097 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
|
4098 XSETINT (CURSIZE (parent), opht + delta1); |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4099 (*setsizefun) (window, XINT (*sizep) + delta1, 0); |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4100 |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4101 /* 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
|
4102 shriking this window and siblings proportionately. |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4103 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
|
4104 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
|
4105 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
|
4106 (*setsizefun) (parent, opht, 0); |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4107 |
25268 | 4108 } |
265 | 4109 } |
4110 | |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
4111 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
|
4112 XSETFASTINT (p->last_overlay_modified, 0); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4113 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4114 /* Adjust glyph matrices. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4115 adjust_glyphs (XFRAME (WINDOW_FRAME (XWINDOW (window)))); |
265 | 4116 } |
25254 | 4117 |
265 | 4118 #undef CURBEG |
4119 #undef CURSIZE | |
4120 | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4121 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4122 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4123 /*********************************************************************** |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4124 Resizing Mini-Windows |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4125 ***********************************************************************/ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4126 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4127 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
|
4128 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4129 enum save_restore_action |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4130 { |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4131 CHECK_ORIG_SIZES, |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4132 SAVE_ORIG_SIZES, |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4133 RESTORE_ORIG_SIZES |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4134 }; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4135 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4136 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
|
4137 enum save_restore_action)); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4138 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4139 /* 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
|
4140 from lowest windows first. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4141 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4142 static void |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4143 shrink_window_lowest_first (w, height) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4144 struct window *w; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4145 int height; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4146 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4147 struct window *c; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4148 Lisp_Object child; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4149 int old_height; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4150 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4151 xassert (!MINI_WINDOW_P (w)); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4152 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4153 /* Set redisplay hints. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4154 XSETFASTINT (w->last_modified, 0); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4155 XSETFASTINT (w->last_overlay_modified, 0); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4156 windows_or_buffers_changed++; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4157 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
|
4158 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4159 old_height = XFASTINT (w->total_lines); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4160 XSETFASTINT (w->total_lines, height); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4161 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4162 if (!NILP (w->hchild)) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4163 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4164 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
|
4165 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4166 c = XWINDOW (child); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4167 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
|
4168 shrink_window_lowest_first (c, height); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4169 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4170 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4171 else if (!NILP (w->vchild)) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4172 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4173 Lisp_Object last_child; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4174 int delta = old_height - height; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4175 int last_top; |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
4176 |
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
4177 last_child = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4178 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4179 /* 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
|
4180 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
|
4181 backwards. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4182 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
|
4183 last_child = child; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4184 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4185 /* 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
|
4186 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
|
4187 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4188 int this_one; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4189 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4190 c = XWINDOW (child); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4191 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
|
4192 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4193 if (this_one > delta) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4194 this_one = delta; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4195 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4196 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
|
4197 delta -= this_one; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4198 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4199 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4200 /* Compute new positions. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4201 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
|
4202 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
|
4203 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4204 c = XWINDOW (child); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4205 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
|
4206 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
|
4207 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
|
4208 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4209 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4210 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4211 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4212 |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4213 /* 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
|
4214 rooted at W. ACTION says what to do. |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4215 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4216 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
|
4217 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
|
4218 tree. Value is non-zero if they are valid. |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4219 |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4220 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
|
4221 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
|
4222 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4223 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
|
4224 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
|
4225 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4226 static int |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4227 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
|
4228 struct window *w; |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4229 enum save_restore_action action; |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4230 { |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4231 int success_p = 1; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4232 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4233 while (w) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4234 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4235 if (!NILP (w->hchild)) |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4236 { |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4237 if (!save_restore_orig_size (XWINDOW (w->hchild), action)) |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4238 success_p = 0; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4239 } |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4240 else if (!NILP (w->vchild)) |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4241 { |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4242 if (!save_restore_orig_size (XWINDOW (w->vchild), action)) |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4243 success_p = 0; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4244 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4245 |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4246 switch (action) |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4247 { |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4248 case CHECK_ORIG_SIZES: |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4249 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
|
4250 return 0; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4251 break; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4252 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4253 case SAVE_ORIG_SIZES: |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4254 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
|
4255 w->orig_total_lines = w->total_lines; |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4256 XSETFASTINT (w->last_modified, 0); |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4257 XSETFASTINT (w->last_overlay_modified, 0); |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4258 break; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4259 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4260 case RESTORE_ORIG_SIZES: |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4261 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
|
4262 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
|
4263 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
|
4264 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
|
4265 XSETFASTINT (w->last_modified, 0); |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4266 XSETFASTINT (w->last_overlay_modified, 0); |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4267 break; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4268 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4269 default: |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4270 abort (); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4271 } |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4272 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4273 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
|
4274 } |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4275 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4276 return success_p; |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4277 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4278 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4279 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4280 /* 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
|
4281 without deleting other windows. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4282 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4283 void |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4284 grow_mini_window (w, delta) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4285 struct window *w; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4286 int delta; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4287 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4288 struct frame *f = XFRAME (w->frame); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4289 struct window *root; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4290 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4291 xassert (MINI_WINDOW_P (w)); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4292 xassert (delta >= 0); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4293 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4294 /* 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
|
4295 validity. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4296 check_min_window_sizes (); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4297 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4298 /* 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
|
4299 other windows. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4300 root = XWINDOW (FRAME_ROOT_WINDOW (f)); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4301 if (delta) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4302 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4303 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
|
4304 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
|
4305 /* 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
|
4306 min_height. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4307 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
|
4308 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4309 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4310 if (delta) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4311 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4312 /* 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
|
4313 if (!save_restore_orig_size (root, CHECK_ORIG_SIZES)) |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4314 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
|
4315 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4316 /* Shrink other windows. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4317 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
|
4318 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4319 /* Grow the mini-window. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4320 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
|
4321 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
|
4322 XSETFASTINT (w->last_modified, 0); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4323 XSETFASTINT (w->last_overlay_modified, 0); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4324 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4325 adjust_glyphs (f); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4326 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4327 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4328 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4329 |
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
4330 /* 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
|
4331 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
|
4332 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
|
4333 line. */ |
25792
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 void |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4336 shrink_mini_window (w) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4337 struct window *w; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4338 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4339 struct frame *f = XFRAME (w->frame); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4340 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
|
4341 |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4342 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
|
4343 { |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4344 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
|
4345 adjust_glyphs (f); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4346 FRAME_WINDOW_SIZES_CHANGED (f) = 1; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4347 windows_or_buffers_changed = 1; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4348 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4349 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
|
4350 { |
35621
5f154b8fc2bd
(size_window): Set the window's orig_top to nil when
Gerd Moellmann <gerd@gnu.org>
parents:
35483
diff
changeset
|
4351 /* 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
|
4352 among the other windows. */ |
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
4353 Lisp_Object window; |
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
4354 XSETWINDOW (window, w); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4355 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
|
4356 } |
25792
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 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4359 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4360 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4361 /* 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
|
4362 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
|
4363 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
|
4364 the frame are cleared. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4365 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4366 void |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4367 mark_window_cursors_off (w) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4368 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4369 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4370 while (w) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4371 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4372 if (!NILP (w->hchild)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4373 mark_window_cursors_off (XWINDOW (w->hchild)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4374 else if (!NILP (w->vchild)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4375 mark_window_cursors_off (XWINDOW (w->vchild)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4376 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4377 w->phys_cursor_on_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4378 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4379 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4380 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4381 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4382 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4383 |
37270
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4384 /* Return number of lines of text (not counting mode lines) in W. */ |
265 | 4385 |
4386 int | |
4387 window_internal_height (w) | |
4388 struct window *w; | |
4389 { | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4390 int ht = XFASTINT (w->total_lines); |
265 | 4391 |
37270
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4392 if (!MINI_WINDOW_P (w)) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4393 { |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4394 if (!NILP (w->parent) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4395 || !NILP (w->vchild) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4396 || !NILP (w->hchild) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4397 || !NILP (w->next) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4398 || !NILP (w->prev) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4399 || WINDOW_WANTS_MODELINE_P (w)) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4400 --ht; |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4401 |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4402 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
|
4403 --ht; |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4404 } |
265 | 4405 |
4406 return ht; | |
4407 } | |
4408 | |
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4409 |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4410 /* 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
|
4411 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
|
4412 separating W from the sibling to its right. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4413 |
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4414 int |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4415 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
|
4416 struct window *w; |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4417 { |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4418 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
|
4419 int width = XINT (w->total_cols); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4420 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4421 if (WINDOW_HAS_VERTICAL_SCROLL_BAR (w)) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4422 /* 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
|
4423 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
|
4424 else if (!FRAME_WINDOW_P (f) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4425 && !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
|
4426 /* The column of `|' characters separating side-by-side windows |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4427 occupies one column only. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4428 width -= 1; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4429 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4430 if (FRAME_WINDOW_P (f)) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4431 /* 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
|
4432 used for normal text. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4433 width -= (WINDOW_FRINGE_COLS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4434 + WINDOW_LEFT_MARGIN_COLS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4435 + 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
|
4436 |
701db778b7a4
(Fwindow_edges): Use new WINDOW_RIGHT_EDGE macro.
Richard M. Stallman <rms@gnu.org>
parents:
16208
diff
changeset
|
4437 return width; |
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4438 } |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4439 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4440 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4441 /************************************************************************ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4442 Window Scrolling |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4443 ***********************************************************************/ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4444 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4445 /* 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
|
4446 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
|
4447 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
|
4448 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
|
4449 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
|
4450 respectively. */ |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4451 |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4452 static void |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4453 window_scroll (window, n, whole, noerror) |
265 | 4454 Lisp_Object window; |
4455 int n; | |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4456 int whole; |
522 | 4457 int noerror; |
265 | 4458 { |
47865
22b1643144e9
(window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents:
47567
diff
changeset
|
4459 immediate_quit = 1; |
22b1643144e9
(window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents:
47567
diff
changeset
|
4460 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4461 /* 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
|
4462 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
|
4463 if (FRAME_WINDOW_P (XFRAME (XWINDOW (window)->frame))) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4464 window_scroll_pixel_based (window, n, whole, noerror); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4465 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4466 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
|
4467 |
22b1643144e9
(window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents:
47567
diff
changeset
|
4468 immediate_quit = 0; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4469 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4470 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4471 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4472 /* 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
|
4473 heights. See the comment of window_scroll for parameter |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4474 descriptions. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4475 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4476 static void |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4477 window_scroll_pixel_based (window, n, whole, noerror) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4478 Lisp_Object window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4479 int n; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4480 int whole; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4481 int noerror; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4482 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4483 struct it it; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4484 struct window *w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4485 struct text_pos start; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4486 Lisp_Object tem; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4487 int this_scroll_margin; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4488 int preserve_y; |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4489 /* 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
|
4490 int vscrolled = 0; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4491 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4492 SET_TEXT_POS_FROM_MARKER (start, w->start); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4493 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4494 /* 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
|
4495 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
|
4496 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
|
4497 the partially visible one would recenter. */ |
a6f5dfd3e5f4
(window_scroll_pixel_based): Don't recenter if
Gerd Moellmann <gerd@gnu.org>
parents:
38722
diff
changeset
|
4498 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
|
4499 if (NILP (tem)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4500 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4501 /* 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
|
4502 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
|
4503 results for variable height lines. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4504 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
|
4505 it.current_y = it.last_visible_y; |
37305
8381b1ef7f3a
(window_scroll_pixel_based, Frecenter): Call
Gerd Moellmann <gerd@gnu.org>
parents:
37270
diff
changeset
|
4506 move_it_vertically (&it, - window_box_height (w) / 2); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4507 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4508 /* 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
|
4509 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
|
4510 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
|
4511 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
|
4512 start of the line containing PT in this case. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4513 if (it.current_y <= 0) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4514 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4515 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
|
4516 move_it_vertically (&it, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4517 it.current_y = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4518 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4519 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4520 start = it.current.pos; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4521 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4522 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4523 /* If scroll_preserve_screen_position is non-zero, we try to set |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4524 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
|
4525 if (!NILP (Vscroll_preserve_screen_position)) |
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 start_display (&it, w, start); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4528 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
|
4529 preserve_y = it.current_y; |
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 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4532 preserve_y = -1; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4533 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4534 /* 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
|
4535 backward. The result is the new window start. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4536 start_display (&it, w, start); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4537 if (whole) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4538 { |
37305
8381b1ef7f3a
(window_scroll_pixel_based, Frecenter): Call
Gerd Moellmann <gerd@gnu.org>
parents:
37270
diff
changeset
|
4539 int screen_full = (window_box_height (w) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4540 - next_screen_context_lines * FRAME_LINE_HEIGHT (it.f)); |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
4541 int dy = n * screen_full; |
34717
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4542 |
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4543 /* 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
|
4544 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
|
4545 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
|
4546 if (dy <= 0) |
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4547 move_it_vertically_backward (&it, -dy); |
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4548 else if (dy > 0) |
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4549 move_it_to (&it, ZV, -1, it.current_y + dy, -1, |
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4550 MOVE_TO_POS | MOVE_TO_Y); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4551 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4552 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4553 move_it_by_lines (&it, n, 1); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4554 |
49011
594a08370cb3
(window_scroll_pixel_based): Partially undo last change.
Richard M. Stallman <rms@gnu.org>
parents:
48945
diff
changeset
|
4555 /* 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
|
4556 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
|
4557 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
|
4558 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
|
4559 || (n < 0 && IT_CHARPOS (it) == CHARPOS (start))) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4560 { |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4561 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
|
4562 { |
48945
a96801f68a82
(window_scroll_pixel_based): Fix check for reaching BEGV.
Richard M. Stallman <rms@gnu.org>
parents:
48927
diff
changeset
|
4563 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
|
4564 && (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
|
4565 >= it.last_visible_y)) |
35126
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4566 { |
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4567 /* 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
|
4568 visible. */ |
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4569 w->vscroll = (it.last_visible_y |
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4570 - 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
|
4571 adjust_glyphs (it.f); |
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4572 } |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4573 else if (noerror) |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4574 return; |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4575 else |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4576 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
|
4577 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4578 else |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4579 { |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4580 if (w->vscroll != 0) |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4581 /* 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
|
4582 visible. */ |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4583 w->vscroll = 0; |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4584 else if (noerror) |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4585 return; |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4586 else |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4587 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
|
4588 } |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4589 |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4590 /* 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
|
4591 |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4592 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
|
4593 |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4594 /* 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
|
4595 vscrolled = 1; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4596 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4597 |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4598 if (! vscrolled) |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4599 { |
45562
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
4600 int pos = IT_CHARPOS (it); |
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
4601 int bytepos; |
49836
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4602 |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4603 /* 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
|
4604 the next character. */ |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4605 if (in_display_vector_p (&it)) |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4606 { |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4607 ++pos; |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4608 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
|
4609 } |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4610 |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4611 /* 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
|
4612 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
|
4613 w->buffer); |
45562
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
4614 bytepos = XMARKER (w->start)->bytepos; |
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
4615 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
|
4616 ? Qt : Qnil); |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4617 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
|
4618 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
|
4619 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
|
4620 /* 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
|
4621 window-scroll-functions. */ |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4622 w->force_start = Qt; |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4623 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4624 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4625 it.current_y = it.vpos = 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4626 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4627 /* Preserve the screen position if we must. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4628 if (preserve_y >= 0) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4629 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4630 move_it_to (&it, -1, -1, preserve_y, -1, MOVE_TO_Y); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4631 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4632 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4633 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4634 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4635 /* Move PT out of scroll margins. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4636 this_scroll_margin = max (0, scroll_margin); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4637 this_scroll_margin = min (this_scroll_margin, XFASTINT (w->total_lines) / 4); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4638 this_scroll_margin *= FRAME_LINE_HEIGHT (it.f); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4639 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4640 if (n > 0) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4641 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4642 /* We moved the window start towards ZV, so PT may be now |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4643 in the scroll margin at the top. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4644 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
|
4645 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
|
4646 { |
6bcf9f9c10df
(window_scroll_pixel_based): Exit the move_it_by_lines
Richard M. Stallman <rms@gnu.org>
parents:
44155
diff
changeset
|
4647 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
|
4648 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
|
4649 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
|
4650 break; |
6bcf9f9c10df
(window_scroll_pixel_based): Exit the move_it_by_lines
Richard M. Stallman <rms@gnu.org>
parents:
44155
diff
changeset
|
4651 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4652 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4653 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4654 else if (n < 0) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4655 { |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4656 int charpos, bytepos; |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4657 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4658 /* We moved the window start towards BEGV, so PT may be now |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4659 in the scroll margin at the bottom. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4660 move_it_to (&it, PT, -1, |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4661 it.last_visible_y - this_scroll_margin - 1, -1, |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4662 MOVE_TO_POS | MOVE_TO_Y); |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4663 |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4664 /* Save our position, in case it's correct. */ |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4665 charpos = IT_CHARPOS (it); |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4666 bytepos = IT_BYTEPOS (it); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4667 |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4668 /* See if point is on a partially visible line at the end. */ |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4669 move_it_by_lines (&it, 1, 1); |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4670 if (it.current_y > it.last_visible_y) |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4671 /* 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
|
4672 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
|
4673 { |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4674 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
|
4675 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
|
4676 } |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4677 else |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4678 /* 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
|
4679 SET_PT_BOTH (charpos, bytepos); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4680 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4681 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4682 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4683 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4684 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4685 /* 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
|
4686 See the comment of window_scroll for parameter descriptions. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4687 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4688 static void |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4689 window_scroll_line_based (window, n, whole, noerror) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4690 Lisp_Object window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4691 int n; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4692 int whole; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4693 int noerror; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4694 { |
265 | 4695 register struct window *w = XWINDOW (window); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4696 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
|
4697 register int pos, pos_byte; |
265 | 4698 register int ht = window_internal_height (w); |
4699 register Lisp_Object tem; | |
4700 int lose; | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4701 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
|
4702 int startpos; |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4703 struct position posit; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4704 int original_vpos; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4705 |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
4706 /* 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
|
4707 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
|
4708 if (whole) |
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
4709 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
|
4710 |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4711 startpos = marker_position (w->start); |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4712 |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4713 posit = *compute_motion (startpos, 0, 0, 0, |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4714 PT, ht, 0, |
56585
f2ea7576ac6e
(window_scroll_line_based): Let compute_motion
Kim F. Storm <storm@cua.dk>
parents:
56542
diff
changeset
|
4715 -1, XINT (w->hscroll), |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4716 0, w); |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4717 original_vpos = posit.vpos; |
13102
960db92441d8
(window_scroll): Always set force_start.
Richard M. Stallman <rms@gnu.org>
parents:
12981
diff
changeset
|
4718 |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
4719 XSETFASTINT (tem, PT); |
32773
a7fdbf39d4de
(window_scroll_pixel_based, window_scroll_line_based):
Miles Bader <miles@gnu.org>
parents:
32752
diff
changeset
|
4720 tem = Fpos_visible_in_window_p (tem, window, Qnil); |
265 | 4721 |
485 | 4722 if (NILP (tem)) |
265 | 4723 { |
6341
dfc758dd2b08
(window_scroll, Fmove_to_window_line): Avoid dividing negative numbers,
Karl Heuer <kwzh@gnu.org>
parents:
6326
diff
changeset
|
4724 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
|
4725 startpos = PT; |
265 | 4726 } |
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
|
4727 |
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
|
4728 SET_PT (startpos); |
7347 | 4729 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
|
4730 Fvertical_motion (make_number (n), window); |
7347 | 4731 pos = PT; |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4732 pos_byte = PT_BYTE; |
265 | 4733 bolp = Fbolp (); |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4734 SET_PT_BOTH (opoint, opoint_byte); |
265 | 4735 |
4736 if (lose) | |
522 | 4737 { |
4738 if (noerror) | |
4739 return; | |
4740 else | |
4741 Fsignal (Qbeginning_of_buffer, Qnil); | |
4742 } | |
265 | 4743 |
4744 if (pos < ZV) | |
4745 { | |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4746 int this_scroll_margin = scroll_margin; |
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4747 |
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4748 /* 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
|
4749 if (this_scroll_margin < 0) |
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4750 this_scroll_margin = 0; |
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4751 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4752 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
|
4753 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
|
4754 |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4755 set_marker_restricted_both (w->start, w->buffer, pos, pos_byte); |
265 | 4756 w->start_at_line_beg = bolp; |
4757 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
|
4758 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
|
4759 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
|
4760 /* 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
|
4761 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
|
4762 w->force_start = Qt; |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4763 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4764 if (whole && !NILP (Vscroll_preserve_screen_position)) |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4765 { |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4766 SET_PT_BOTH (pos, pos_byte); |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4767 Fvertical_motion (make_number (original_vpos), window); |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4768 } |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4769 /* 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
|
4770 that it is outside the scroll margin. */ |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4771 else if (n > 0) |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4772 { |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4773 int top_margin; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4774 |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4775 if (this_scroll_margin > 0) |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4776 { |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4777 SET_PT_BOTH (pos, pos_byte); |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4778 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
|
4779 top_margin = PT; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4780 } |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4781 else |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4782 top_margin = pos; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4783 |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4784 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
|
4785 SET_PT_BOTH (opoint, opoint_byte); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4786 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
|
4787 { |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4788 SET_PT_BOTH (pos, pos_byte); |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4789 Fvertical_motion (make_number (original_vpos), window); |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4790 } |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
4791 else |
20046
8baac8399a29
(window_scroll): When scrolling forward and point is
Karl Heuer <kwzh@gnu.org>
parents:
19667
diff
changeset
|
4792 SET_PT (top_margin); |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4793 } |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4794 else if (n < 0) |
265 | 4795 { |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4796 int bottom_margin; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4797 |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4798 /* 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
|
4799 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
|
4800 SET_PT_BOTH (pos, pos_byte); |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
4801 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
|
4802 if (XFASTINT (tem) == ht - this_scroll_margin) |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4803 bottom_margin = PT; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4804 else |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4805 bottom_margin = PT + 1; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4806 |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4807 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
|
4808 SET_PT_BOTH (opoint, opoint_byte); |
265 | 4809 else |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4810 { |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4811 if (!NILP (Vscroll_preserve_screen_position)) |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
4812 { |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4813 SET_PT_BOTH (pos, pos_byte); |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
4814 Fvertical_motion (make_number (original_vpos), window); |
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
4815 } |
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
4816 else |
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
4817 Fvertical_motion (make_number (-1), window); |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4818 } |
265 | 4819 } |
4820 } | |
4821 else | |
522 | 4822 { |
4823 if (noerror) | |
4824 return; | |
4825 else | |
4826 Fsignal (Qend_of_buffer, Qnil); | |
4827 } | |
265 | 4828 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4829 |
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 /* 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
|
4832 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
|
4833 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
|
4834 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
|
4835 up. This is the guts of Fscroll_up and Fscroll_down. */ |
265 | 4836 |
4837 static void | |
4838 scroll_command (n, direction) | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4839 Lisp_Object n; |
265 | 4840 int direction; |
4841 { | |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46271
diff
changeset
|
4842 int count = SPECPDL_INDEX (); |
265 | 4843 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4844 xassert (abs (direction) == 1); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4845 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4846 /* 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
|
4847 the moment. But don't screw up if window_scroll gets an error. */ |
265 | 4848 if (XBUFFER (XWINDOW (selected_window)->buffer) != current_buffer) |
548 | 4849 { |
4850 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
4851 Fset_buffer (XWINDOW (selected_window)->buffer); | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4852 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4853 /* Make redisplay consider other windows than just selected_window. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4854 ++windows_or_buffers_changed; |
548 | 4855 } |
265 | 4856 |
485 | 4857 if (NILP (n)) |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
4858 window_scroll (selected_window, direction, 1, 0); |
265 | 4859 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
|
4860 window_scroll (selected_window, -direction, 1, 0); |
265 | 4861 else |
4862 { | |
4863 n = Fprefix_numeric_value (n); | |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4864 window_scroll (selected_window, XINT (n) * direction, 0, 0); |
265 | 4865 } |
548 | 4866 |
4867 unbind_to (count, Qnil); | |
265 | 4868 } |
4869 | |
4870 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
|
4871 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
|
4872 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
|
4873 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
|
4874 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
|
4875 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
|
4876 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
|
4877 (arg) |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
4878 Lisp_Object arg; |
265 | 4879 { |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
4880 scroll_command (arg, 1); |
265 | 4881 return Qnil; |
4882 } | |
4883 | |
4884 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
|
4885 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
|
4886 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
|
4887 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
|
4888 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
|
4889 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
|
4890 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
|
4891 (arg) |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
4892 Lisp_Object arg; |
265 | 4893 { |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
4894 scroll_command (arg, -1); |
265 | 4895 return Qnil; |
4896 } | |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
4897 |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
4898 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
|
4899 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
|
4900 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
|
4901 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
|
4902 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
|
4903 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
|
4904 `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
|
4905 () |
265 | 4906 { |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
4907 Lisp_Object window; |
265 | 4908 |
4909 if (MINI_WINDOW_P (XWINDOW (selected_window)) | |
485 | 4910 && !NILP (Vminibuf_scroll_window)) |
265 | 4911 window = Vminibuf_scroll_window; |
4912 /* If buffer is specified, scroll that buffer. */ | |
485 | 4913 else if (!NILP (Vother_window_scroll_buffer)) |
265 | 4914 { |
4915 window = Fget_buffer_window (Vother_window_scroll_buffer, Qnil); | |
485 | 4916 if (NILP (window)) |
20867
fccf74829150
(Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
20777
diff
changeset
|
4917 window = Fdisplay_buffer (Vother_window_scroll_buffer, Qt, Qnil); |
265 | 4918 } |
4919 else | |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
4920 { |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
4921 /* 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
|
4922 frame. */ |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
4923 window = Fnext_window (selected_window, Qnil, Qnil); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
4924 |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
4925 if (EQ (window, selected_window)) |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
4926 /* 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
|
4927 visible frame. */ |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
4928 do |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
4929 window = Fnext_window (window, Qnil, Qt); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
4930 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
|
4931 && ! EQ (window, selected_window)); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
4932 } |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
4933 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
4934 CHECK_LIVE_WINDOW (window); |
265 | 4935 |
4936 if (EQ (window, selected_window)) | |
4937 error ("There is no other window"); | |
4938 | |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
4939 return window; |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
4940 } |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
4941 |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
4942 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
|
4943 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
|
4944 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
|
4945 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
|
4946 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
|
4947 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
|
4948 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
|
4949 |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
4950 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
|
4951 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
|
4952 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
|
4953 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
|
4954 `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
|
4955 (arg) |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
4956 Lisp_Object arg; |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
4957 { |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
4958 Lisp_Object window; |
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
4959 struct window *w; |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46271
diff
changeset
|
4960 int count = SPECPDL_INDEX (); |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
4961 |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
4962 window = Fother_window_for_scrolling (); |
265 | 4963 w = XWINDOW (window); |
4964 | |
4965 /* Don't screw up if window_scroll gets an error. */ | |
4966 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
|
4967 ++windows_or_buffers_changed; |
265 | 4968 |
4969 Fset_buffer (w->buffer); | |
4970 SET_PT (marker_position (w->pointm)); | |
4971 | |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
4972 if (NILP (arg)) |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
4973 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
|
4974 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
|
4975 window_scroll (window, -1, 1, 1); |
265 | 4976 else |
4977 { | |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
4978 if (CONSP (arg)) |
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
4979 arg = Fcar (arg); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
4980 CHECK_NUMBER (arg); |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4981 window_scroll (window, XINT (arg), 0, 1); |
265 | 4982 } |
4983 | |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
4984 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
|
4985 unbind_to (count, Qnil); |
265 | 4986 |
4987 return Qnil; | |
4988 } | |
4989 | |
3621
0576930165ed
(Fscroll_left): Make argument optional.
Richard M. Stallman <rms@gnu.org>
parents:
3535
diff
changeset
|
4990 DEFUN ("scroll-left", Fscroll_left, Sscroll_left, 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
|
4991 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
|
4992 Default for ARG is window width minus 2. |
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
4993 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
|
4994 effect after the change. |
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
4995 If `automatic-hscrolling' is non-nil, the argument ARG modifies |
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
4996 a lower bound for automatic scrolling, i.e. automatic scrolling |
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
4997 will not scroll a window to a column less than the value returned |
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
4998 by this function. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
4999 (arg) |
265 | 5000 register Lisp_Object arg; |
5001 { | |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5002 Lisp_Object result; |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5003 int hscroll; |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5004 struct window *w = XWINDOW (selected_window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5005 |
485 | 5006 if (NILP (arg)) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5007 XSETFASTINT (arg, window_box_text_cols (w) - 2); |
265 | 5008 else |
5009 arg = Fprefix_numeric_value (arg); | |
5010 | |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5011 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
|
5012 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
|
5013 |
35772
22d10a2fa31a
(Fscroll_right, Fscroll_left): Use interactive_p
Gerd Moellmann <gerd@gnu.org>
parents:
35621
diff
changeset
|
5014 if (interactive_p (0)) |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5015 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
|
5016 |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5017 return result; |
265 | 5018 } |
5019 | |
3621
0576930165ed
(Fscroll_left): Make argument optional.
Richard M. Stallman <rms@gnu.org>
parents:
3535
diff
changeset
|
5020 DEFUN ("scroll-right", Fscroll_right, Sscroll_right, 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
|
5021 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
|
5022 Default for ARG is window width minus 2. |
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
5023 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
|
5024 effect after the change. |
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
5025 If `automatic-hscrolling' is non-nil, the argument ARG modifies |
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
5026 a lower bound for automatic scrolling, i.e. automatic scrolling |
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
5027 will not scroll a window to a column less than the value returned |
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
5028 by this function. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5029 (arg) |
265 | 5030 register Lisp_Object arg; |
5031 { | |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5032 Lisp_Object result; |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5033 int hscroll; |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5034 struct window *w = XWINDOW (selected_window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5035 |
485 | 5036 if (NILP (arg)) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5037 XSETFASTINT (arg, window_box_text_cols (w) - 2); |
265 | 5038 else |
5039 arg = Fprefix_numeric_value (arg); | |
5040 | |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5041 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
|
5042 result = Fset_window_hscroll (selected_window, make_number (hscroll)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5043 |
35772
22d10a2fa31a
(Fscroll_right, Fscroll_left): Use interactive_p
Gerd Moellmann <gerd@gnu.org>
parents:
35621
diff
changeset
|
5044 if (interactive_p (0)) |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5045 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
|
5046 |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5047 return result; |
265 | 5048 } |
5049 | |
43624
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5050 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
|
5051 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
|
5052 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
|
5053 () |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5054 { |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5055 if (minibuf_level > 0 |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5056 && MINI_WINDOW_P (XWINDOW (selected_window)) |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5057 && WINDOW_LIVE_P (minibuf_selected_window)) |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5058 return minibuf_selected_window; |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5059 |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5060 return Qnil; |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5061 } |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5062 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5063 /* 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
|
5064 as opposed to its height. */ |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5065 |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5066 static int |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5067 displayed_window_lines (w) |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5068 struct window *w; |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5069 { |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5070 struct it it; |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5071 struct text_pos start; |
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
5072 int height = window_box_height (w); |
33059
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5073 struct buffer *old_buffer; |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5074 int bottom_y; |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5075 |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5076 if (XBUFFER (w->buffer) != current_buffer) |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5077 { |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5078 old_buffer = current_buffer; |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5079 set_buffer_internal (XBUFFER (w->buffer)); |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5080 } |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5081 else |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5082 old_buffer = NULL; |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5083 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5084 /* 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
|
5085 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
|
5086 calls (recenter -1) while W->start is 1. */ |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5087 if (XMARKER (w->start)->charpos < BEGV) |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5088 SET_TEXT_POS (start, BEGV, BEGV_BYTE); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5089 else if (XMARKER (w->start)->charpos > ZV) |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5090 SET_TEXT_POS (start, ZV, ZV_BYTE); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5091 else |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5092 SET_TEXT_POS_FROM_MARKER (start, w->start); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5093 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5094 start_display (&it, w, start); |
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
5095 move_it_vertically (&it, height); |
36202
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5096 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
|
5097 |
47234
ca48173ebf57
(displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents:
46410
diff
changeset
|
5098 /* 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
|
5099 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
|
5100 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
|
5101 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
|
5102 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
|
5103 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
|
5104 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
|
5105 height++; |
ca48173ebf57
(displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents:
46410
diff
changeset
|
5106 |
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
5107 /* 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
|
5108 if (bottom_y < height) |
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
5109 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5110 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
|
5111 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
|
5112 } |
34384
9669bb49fca2
(Fmove_to_window_line): Skip past any partially visible first line.
Miles Bader <miles@gnu.org>
parents:
34381
diff
changeset
|
5113 |
36202
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5114 if (old_buffer) |
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5115 set_buffer_internal (old_buffer); |
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5116 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5117 return it.vpos; |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5118 } |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5119 |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5120 |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5121 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
|
5122 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
|
5123 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
|
5124 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
|
5125 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
|
5126 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5127 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
|
5128 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
|
5129 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
|
5130 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
|
5131 (arg) |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5132 register Lisp_Object arg; |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5133 { |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5134 struct window *w = XWINDOW (selected_window); |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5135 struct buffer *buf = XBUFFER (w->buffer); |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5136 struct buffer *obuf = current_buffer; |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5137 int center_p = 0; |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5138 int charpos, bytepos; |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5139 |
42089
ca7101bea5ee
(Frecenter): Clear display_error_modiff field.
Richard M. Stallman <rms@gnu.org>
parents:
41980
diff
changeset
|
5140 /* 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
|
5141 obuf->display_error_modiff = 0; |
ca7101bea5ee
(Frecenter): Clear display_error_modiff field.
Richard M. Stallman <rms@gnu.org>
parents:
41980
diff
changeset
|
5142 |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5143 if (NILP (arg)) |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5144 { |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5145 int i; |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5146 |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5147 /* Invalidate pixel data calculated for all compositions. */ |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5148 for (i = 0; i < n_compositions; i++) |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5149 composition_table[i]->font = NULL; |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5150 |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5151 Fredraw_frame (w->frame); |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5152 SET_FRAME_GARBAGED (XFRAME (WINDOW_FRAME (w))); |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5153 center_p = 1; |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5154 } |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5155 else if (CONSP (arg)) /* Just C-u. */ |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5156 center_p = 1; |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5157 else |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5158 { |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5159 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
|
5160 CHECK_NUMBER (arg); |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5161 } |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5162 |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5163 set_buffer_internal (buf); |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5164 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5165 /* 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
|
5166 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
|
5167 line counts would lead to strange effects. */ |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5168 if (FRAME_WINDOW_P (XFRAME (w->frame))) |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5169 { |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5170 if (center_p) |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5171 { |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5172 struct it it; |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5173 struct text_pos pt; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5174 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5175 SET_TEXT_POS (pt, PT, PT_BYTE); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5176 start_display (&it, w, pt); |
37305
8381b1ef7f3a
(window_scroll_pixel_based, Frecenter): Call
Gerd Moellmann <gerd@gnu.org>
parents:
37270
diff
changeset
|
5177 move_it_vertically (&it, - window_box_height (w) / 2); |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5178 charpos = IT_CHARPOS (it); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5179 bytepos = IT_BYTEPOS (it); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5180 } |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5181 else if (XINT (arg) < 0) |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5182 { |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5183 struct it it; |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5184 struct text_pos pt; |
38722
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
5185 int y0, y1, h, nlines; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5186 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5187 SET_TEXT_POS (pt, PT, PT_BYTE); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5188 start_display (&it, w, pt); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5189 y0 = it.current_y; |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5190 |
38722
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
5191 /* 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
|
5192 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
|
5193 and the lines below. */ |
38722
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
5194 nlines = - XINT (arg) - 1; |
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
5195 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
|
5196 |
41980
e0aefc6e3422
(Frecenter): Simplify computation in the case of window
Gerd Moellmann <gerd@gnu.org>
parents:
41736
diff
changeset
|
5197 y1 = line_bottom_y (&it); |
38722
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
5198 |
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
5199 /* 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
|
5200 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
|
5201 if (it.vpos < nlines) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5202 y1 += (nlines - it.vpos) * FRAME_LINE_HEIGHT (it.f); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5203 |
41980
e0aefc6e3422
(Frecenter): Simplify computation in the case of window
Gerd Moellmann <gerd@gnu.org>
parents:
41736
diff
changeset
|
5204 h = window_box_height (w) - (y1 - y0); |
e0aefc6e3422
(Frecenter): Simplify computation in the case of window
Gerd Moellmann <gerd@gnu.org>
parents:
41736
diff
changeset
|
5205 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5206 start_display (&it, w, pt); |
41980
e0aefc6e3422
(Frecenter): Simplify computation in the case of window
Gerd Moellmann <gerd@gnu.org>
parents:
41736
diff
changeset
|
5207 move_it_vertically (&it, - h); |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5208 charpos = IT_CHARPOS (it); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5209 bytepos = IT_BYTEPOS (it); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5210 } |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5211 else |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5212 { |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5213 struct position pos; |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5214 pos = *vmotion (PT, - XINT (arg), w); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5215 charpos = pos.bufpos; |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5216 bytepos = pos.bytepos; |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5217 } |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5218 } |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5219 else |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5220 { |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5221 struct position pos; |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5222 int ht = window_internal_height (w); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5223 |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5224 if (center_p) |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5225 arg = make_number (ht / 2); |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5226 else if (XINT (arg) < 0) |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5227 arg = make_number (XINT (arg) + ht); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5228 |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5229 pos = *vmotion (PT, - XINT (arg), w); |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5230 charpos = pos.bufpos; |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5231 bytepos = pos.bytepos; |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5232 } |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5233 |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5234 /* Set the new window start. */ |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5235 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
|
5236 w->window_end_valid = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5237 |
46108
7b8b4ec9573c
(Frecenter): With arg, set optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
46021
diff
changeset
|
5238 w->optional_new_start = Qt; |
7b8b4ec9573c
(Frecenter): With arg, set optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
46021
diff
changeset
|
5239 |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5240 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
|
5241 w->start_at_line_beg = Qt; |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5242 else |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5243 w->start_at_line_beg = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5244 |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5245 set_buffer_internal (obuf); |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5246 return Qnil; |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5247 } |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5248 |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5249 |
34416
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5250 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
|
5251 0, 1, 0, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5252 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
|
5253 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
|
5254 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
|
5255 (window) |
34416
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5256 Lisp_Object window; |
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5257 { |
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5258 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
|
5259 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
|
5260 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
|
5261 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
|
5262 } |
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5263 |
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5264 |
265 | 5265 |
5266 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
|
5267 1, 1, "P", |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5268 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
|
5269 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
|
5270 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
|
5271 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
|
5272 (arg) |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5273 Lisp_Object arg; |
265 | 5274 { |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5275 struct window *w = XWINDOW (selected_window); |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5276 int lines, start; |
6326
5e662ad3f594
(Fdelete_other_windows): Pass new arg to Fvertical_motion.
Richard M. Stallman <rms@gnu.org>
parents:
6269
diff
changeset
|
5277 Lisp_Object window; |
265 | 5278 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5279 window = selected_window; |
265 | 5280 start = marker_position (w->start); |
5281 if (start < BEGV || start > ZV) | |
5282 { | |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5283 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
|
5284 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
|
5285 set_marker_both (w->start, w->buffer, PT, PT_BYTE); |
265 | 5286 w->start_at_line_beg = Fbolp (); |
5287 w->force_start = Qt; | |
5288 } | |
5289 else | |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5290 Fgoto_char (w->start); |
265 | 5291 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5292 lines = displayed_window_lines (w); |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5293 if (NILP (arg)) |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5294 XSETFASTINT (arg, lines / 2); |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5295 else |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5296 { |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5297 arg = Fprefix_numeric_value (arg); |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5298 if (XINT (arg) < 0) |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5299 XSETINT (arg, XINT (arg) + lines); |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5300 } |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5301 |
36202
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5302 /* 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
|
5303 if (w->vscroll) |
9669bb49fca2
(Fmove_to_window_line): Skip past any partially visible first line.
Miles Bader <miles@gnu.org>
parents:
34381
diff
changeset
|
5304 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
|
5305 |
6326
5e662ad3f594
(Fdelete_other_windows): Pass new arg to Fvertical_motion.
Richard M. Stallman <rms@gnu.org>
parents:
6269
diff
changeset
|
5306 return Fvertical_motion (arg, window); |
265 | 5307 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5308 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5309 |
265 | 5310 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5311 /*********************************************************************** |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5312 Window Configuration |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5313 ***********************************************************************/ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5314 |
265 | 5315 struct save_window_data |
5316 { | |
15712
a272ccf6c225
(struct save_window_data, struct saved_window): First
Karl Heuer <kwzh@gnu.org>
parents:
15385
diff
changeset
|
5317 EMACS_INT size_from_Lisp_Vector_struct; |
265 | 5318 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
|
5319 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
|
5320 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
|
5321 Lisp_Object selected_frame; |
265 | 5322 Lisp_Object current_window; |
5323 Lisp_Object current_buffer; | |
5324 Lisp_Object minibuf_scroll_window; | |
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
5325 Lisp_Object minibuf_selected_window; |
265 | 5326 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
|
5327 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
|
5328 /* 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
|
5329 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
|
5330 Lisp_Object min_width, min_height; |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5331 /* 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
|
5332 for one window. */ |
265 | 5333 Lisp_Object saved_windows; |
5334 }; | |
1326
709532b86646
* window.c (SAVE_WINDOW_DATA_SIZE): Define this using sizeof,
Jim Blandy <jimb@redhat.com>
parents:
1325
diff
changeset
|
5335 |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5336 /* This is saved as a Lisp_Vector */ |
265 | 5337 struct saved_window |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5338 { |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5339 /* 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
|
5340 EMACS_INT size_from_Lisp_Vector_struct; |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5341 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
|
5342 |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5343 Lisp_Object window; |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5344 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
|
5345 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
|
5346 Lisp_Object hscroll, min_hscroll; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5347 Lisp_Object parent, prev; |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5348 Lisp_Object start_at_line_beg; |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5349 Lisp_Object display_table; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5350 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
|
5351 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
|
5352 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
|
5353 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
|
5354 }; |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5355 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5356 #define SAVED_WINDOW_VECTOR_SIZE 24 /* Arg to Fmake_vector */ |
265 | 5357 |
5358 #define SAVED_WINDOW_N(swv,n) \ | |
5359 ((struct saved_window *) (XVECTOR ((swv)->contents[(n)]))) | |
5360 | |
5361 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
|
5362 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
|
5363 (object) |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5364 Lisp_Object object; |
265 | 5365 { |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5366 if (WINDOW_CONFIGURATIONP (object)) |
265 | 5367 return Qt; |
5368 return Qnil; | |
5369 } | |
5370 | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5371 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
|
5372 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
|
5373 (config) |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5374 Lisp_Object config; |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5375 { |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5376 register struct save_window_data *data; |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5377 struct Lisp_Vector *saved_windows; |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5378 |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5379 if (! WINDOW_CONFIGURATIONP (config)) |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5380 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
|
5381 |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5382 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
|
5383 saved_windows = XVECTOR (data->saved_windows); |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5384 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
|
5385 } |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5386 |
2297
bb88d48c290f
(Fselect_window): Use Fhandle_switch_frame.
Richard M. Stallman <rms@gnu.org>
parents:
2210
diff
changeset
|
5387 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
|
5388 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
|
5389 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
|
5390 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
|
5391 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
|
5392 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
|
5393 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
|
5394 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
|
5395 (configuration) |
1016
817b0ce337d7
* window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents:
983
diff
changeset
|
5396 Lisp_Object configuration; |
265 | 5397 { |
5398 register struct save_window_data *data; | |
5399 struct Lisp_Vector *saved_windows; | |
5400 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
|
5401 Lisp_Object frame; |
769 | 5402 FRAME_PTR f; |
45835
aab759361c24
(Fset_window_configuration): Explicitly preserve
Richard M. Stallman <rms@gnu.org>
parents:
45645
diff
changeset
|
5403 int old_point = -1; |
265 | 5404 |
9105
984a4b1be1d1
(Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents:
9028
diff
changeset
|
5405 while (!WINDOW_CONFIGURATIONP (configuration)) |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5406 wrong_type_argument (Qwindow_configuration_p, configuration); |
265 | 5407 |
1016
817b0ce337d7
* window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents:
983
diff
changeset
|
5408 data = (struct save_window_data *) XVECTOR (configuration); |
265 | 5409 saved_windows = XVECTOR (data->saved_windows); |
5410 | |
5411 new_current_buffer = data->current_buffer; | |
485 | 5412 if (NILP (XBUFFER (new_current_buffer)->name)) |
265 | 5413 new_current_buffer = Qnil; |
45835
aab759361c24
(Fset_window_configuration): Explicitly preserve
Richard M. Stallman <rms@gnu.org>
parents:
45645
diff
changeset
|
5414 else |
48898
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
5415 { |
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
5416 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
|
5417 old_point = PT; |
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
5418 else |
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
5419 old_point = BUF_PT (XBUFFER (new_current_buffer)); |
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
5420 } |
265 | 5421 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5422 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
|
5423 f = XFRAME (frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5424 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5425 /* 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
|
5426 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
|
5427 if (FRAME_LIVE_P (f)) |
265 | 5428 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5429 register struct window *w; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5430 register struct saved_window *p; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5431 struct window *root_window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5432 struct window **leaf_windows; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5433 int n_leaf_windows; |
33277
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5434 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
|
5435 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5436 /* 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
|
5437 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
|
5438 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
|
5439 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
|
5440 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
|
5441 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
|
5442 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
|
5443 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
|
5444 |
18657 | 5445 /* The mouse highlighting code could get screwed up |
5446 if it runs during this. */ | |
5447 BLOCK_INPUT; | |
5448 | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5449 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
|
5450 || 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
|
5451 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
|
5452 XFASTINT (data->frame_cols), 0, 0, 0); |
16051
ccf489f8596e
Removed support for !MULTI_FRAME.
Karl Heuer <kwzh@gnu.org>
parents:
16039
diff
changeset
|
5453 #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
|
5454 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
|
5455 != previous_frame_menu_bar_lines) |
21533
b7df83bf15ff
(Fset_window_configuration): Fix mixing of Lisp_Object
Andreas Schwab <schwab@suse.de>
parents:
21514
diff
changeset
|
5456 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
|
5457 #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
|
5458 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
|
5459 != 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
|
5460 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
|
5461 #endif |
25115
2105537c5916
(Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25044
diff
changeset
|
5462 #endif |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5463 |
27869
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
5464 /* "Swap out" point from the selected window |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
5465 into its buffer. We do this now, before |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
5466 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
|
5467 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
|
5468 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
|
5469 { |
0753fa7a67f3
(Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents:
20535
diff
changeset
|
5470 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
|
5471 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
|
5472 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
|
5473 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
|
5474 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
|
5475 } |
0753fa7a67f3
(Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents:
20535
diff
changeset
|
5476 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5477 windows_or_buffers_changed++; |
10666
e1dfb47b664e
(Fdelete_window, set_window_height, set_window_width)
Richard M. Stallman <rms@gnu.org>
parents:
10461
diff
changeset
|
5478 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
|
5479 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5480 /* Problem: Freeing all matrices and later allocating them again |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5481 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
|
5482 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
|
5483 below. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5484 root_window = XWINDOW (FRAME_ROOT_WINDOW (f)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5485 leaf_windows |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5486 = (struct window **) alloca (count_windows (root_window) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5487 * sizeof (struct window *)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5488 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
|
5489 |
8931
c64388cd7346
(struct saved_window_data): New slots min_width, min_height.
Richard M. Stallman <rms@gnu.org>
parents:
8536
diff
changeset
|
5490 /* 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
|
5491 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
|
5492 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
|
5493 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
|
5494 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5495 /* Kludge Alert! |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5496 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
|
5497 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
|
5498 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5499 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
|
5500 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
|
5501 dead. */ |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5502 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
|
5503 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5504 for (k = 0; k < saved_windows->size; k++) |
265 | 5505 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5506 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
|
5507 w = XWINDOW (p->window); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5508 w->next = Qnil; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5509 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5510 if (!NILP (p->parent)) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5511 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
|
5512 XFASTINT (p->parent))->window; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5513 else |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5514 w->parent = Qnil; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5515 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5516 if (!NILP (p->prev)) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5517 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5518 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
|
5519 XFASTINT (p->prev))->window; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5520 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
|
5521 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5522 else |
265 | 5523 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5524 w->prev = Qnil; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5525 if (!NILP (w->parent)) |
265 | 5526 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5527 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
|
5528 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5529 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
|
5530 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
|
5531 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5532 else |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5533 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5534 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
|
5535 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
|
5536 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5537 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5538 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5539 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5540 /* 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
|
5541 restore it now. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5542 if (BUFFERP (w->total_lines)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5543 w->buffer = w->total_lines; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5544 w->left_col = p->left_col; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5545 w->top_line = p->top_line; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5546 w->total_cols = p->total_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5547 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
|
5548 w->hscroll = p->hscroll; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5549 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
|
5550 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
|
5551 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
|
5552 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
|
5553 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
|
5554 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
|
5555 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
|
5556 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
|
5557 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
|
5558 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
|
5559 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
|
5560 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
|
5561 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
|
5562 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5563 /* 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
|
5564 if (NILP (p->buffer)) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5565 w->buffer = p->buffer; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5566 else |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5567 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5568 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
|
5569 /* 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
|
5570 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5571 w->buffer = p->buffer; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5572 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
|
5573 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
|
5574 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
|
5575 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
|
5576 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
|
5577 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5578 /* 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
|
5579 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
|
5580 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
|
5581 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
|
5582 && 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
|
5583 Fgoto_char (w->pointm); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5584 } |
3535
581c09f72dbd
(Fset_window_configuration): If a window is supposed
Richard M. Stallman <rms@gnu.org>
parents:
3354
diff
changeset
|
5585 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
|
5586 /* 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
|
5587 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5588 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
|
5589 /* 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
|
5590 range. */ |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5591 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
|
5592 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
|
5593 w->start_at_line_beg = Qt; |
265 | 5594 } |
5595 else | |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5596 /* 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
|
5597 are real. */ |
265 | 5598 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5599 /* 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
|
5600 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
|
5601 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
|
5602 w->buffer); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5603 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
|
5604 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
|
5605 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
|
5606 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
|
5607 w->start_at_line_beg = Qt; |
265 | 5608 } |
5609 } | |
5610 } | |
1237
3929b2135e58
* window.c (delete_all_subwindows): Save the window's buffer in
Jim Blandy <jimb@redhat.com>
parents:
1123
diff
changeset
|
5611 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5612 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
|
5613 /* 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
|
5614 using the buffer that has been restored into it. |
45835
aab759361c24
(Fset_window_configuration): Explicitly preserve
Richard M. Stallman <rms@gnu.org>
parents:
45645
diff
changeset
|
5615 Use the point value from the beginning of this function |
aab759361c24
(Fset_window_configuration): Explicitly preserve
Richard M. Stallman <rms@gnu.org>
parents:
45645
diff
changeset
|
5616 since unshow_buffer (called from delete_all_subwindows) |
aab759361c24
(Fset_window_configuration): Explicitly preserve
Richard M. Stallman <rms@gnu.org>
parents:
45645
diff
changeset
|
5617 could have altered it. */ |
27869
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
5618 selected_window = Qnil; |
45584
5fd12f9027a3
(Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents:
45562
diff
changeset
|
5619 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
|
5620 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
|
5621 make_number (old_point), |
45584
5fd12f9027a3
(Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents:
45562
diff
changeset
|
5622 XWINDOW (data->current_window)->buffer); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5623 |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
5624 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
|
5625 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
|
5626 = selected_window; |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5627 |
1716
95db936d47c0
* keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents:
1685
diff
changeset
|
5628 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
|
5629 || (FRAMEP (data->focus_frame) |
1716
95db936d47c0
* keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents:
1685
diff
changeset
|
5630 && FRAME_LIVE_P (XFRAME (data->focus_frame)))) |
95db936d47c0
* keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents:
1685
diff
changeset
|
5631 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
|
5632 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5633 #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
|
5634 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
|
5635 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
|
5636 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
|
5637 0, 0); |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5638 #endif |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5639 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5640 /* 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
|
5641 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
|
5642 || previous_frame_cols != FRAME_COLS (f)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5643 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
|
5644 0, 0, 0); |
16051
ccf489f8596e
Removed support for !MULTI_FRAME.
Karl Heuer <kwzh@gnu.org>
parents:
16039
diff
changeset
|
5645 #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
|
5646 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
|
5647 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
|
5648 make_number (0)); |
25115
2105537c5916
(Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25044
diff
changeset
|
5649 #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
|
5650 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
|
5651 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
|
5652 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
|
5653 #endif |
25115
2105537c5916
(Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25044
diff
changeset
|
5654 #endif |
18657 | 5655 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5656 /* 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
|
5657 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
|
5658 { |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5659 if (NILP (leaf_windows[i]->buffer)) |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5660 { |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5661 /* Assert it's not reused as a combination. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5662 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
|
5663 && NILP (leaf_windows[i]->vchild)); |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5664 free_window_matrices (leaf_windows[i]); |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5665 } |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5666 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
|
5667 ++n; |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5668 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5669 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5670 adjust_glyphs (f); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5671 |
18657 | 5672 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
|
5673 |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
5674 /* 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
|
5675 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
|
5676 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
|
5677 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
|
5678 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
|
5679 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
|
5680 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
|
5681 |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
5682 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
|
5683 && ! 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
|
5684 call1 (Vrun_hooks, Qwindow_configuration_change_hook); |
265 | 5685 } |
5686 | |
1325
f03e559aac3e
* window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents:
1280
diff
changeset
|
5687 if (!NILP (new_current_buffer)) |
45584
5fd12f9027a3
(Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents:
45562
diff
changeset
|
5688 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
|
5689 |
21198
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
5690 /* 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
|
5691 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
|
5692 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
|
5693 |
265 | 5694 Vminibuf_scroll_window = data->minibuf_scroll_window; |
43594
23cddac4d0b7
(minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents:
43571
diff
changeset
|
5695 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
|
5696 |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5697 return (FRAME_LIVE_P (f) ? Qt : Qnil); |
265 | 5698 } |
5699 | |
769 | 5700 /* Mark all windows now on frame as deleted |
265 | 5701 by setting their buffers to nil. */ |
5702 | |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5703 void |
265 | 5704 delete_all_subwindows (w) |
5705 register struct window *w; | |
5706 { | |
485 | 5707 if (!NILP (w->next)) |
265 | 5708 delete_all_subwindows (XWINDOW (w->next)); |
485 | 5709 if (!NILP (w->vchild)) |
265 | 5710 delete_all_subwindows (XWINDOW (w->vchild)); |
485 | 5711 if (!NILP (w->hchild)) |
265 | 5712 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
|
5713 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5714 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
|
5715 |
16068
b19129a8c644
(unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
5716 if (!NILP (w->buffer)) |
b19129a8c644
(unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
5717 unshow_buffer (w); |
b19129a8c644
(unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
5718 |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
5719 /* 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
|
5720 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
|
5721 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
|
5722 vchild or hchild set. */ |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
5723 w->buffer = Qnil; |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
5724 w->vchild = Qnil; |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
5725 w->hchild = Qnil; |
30045
ff2db81c11c1
(delete_all_subwindows): Reset Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents:
30039
diff
changeset
|
5726 |
ff2db81c11c1
(delete_all_subwindows): Reset Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents:
30039
diff
changeset
|
5727 Vwindow_list = Qnil; |
265 | 5728 } |
5729 | |
5730 static int | |
5731 count_windows (window) | |
5732 register struct window *window; | |
5733 { | |
5734 register int count = 1; | |
485 | 5735 if (!NILP (window->next)) |
265 | 5736 count += count_windows (XWINDOW (window->next)); |
485 | 5737 if (!NILP (window->vchild)) |
265 | 5738 count += count_windows (XWINDOW (window->vchild)); |
485 | 5739 if (!NILP (window->hchild)) |
265 | 5740 count += count_windows (XWINDOW (window->hchild)); |
5741 return count; | |
5742 } | |
5743 | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5744 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5745 /* 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
|
5746 Value is last index + 1. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5747 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5748 static int |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5749 get_leaf_windows (w, flat, i) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5750 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5751 struct window **flat; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5752 int i; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5753 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5754 while (w) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5755 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5756 if (!NILP (w->hchild)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5757 i = get_leaf_windows (XWINDOW (w->hchild), flat, i); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5758 else if (!NILP (w->vchild)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5759 i = get_leaf_windows (XWINDOW (w->vchild), flat, i); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5760 else |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5761 flat[i++] = w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5762 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5763 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5764 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5765 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5766 return i; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5767 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5768 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5769 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5770 /* 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
|
5771 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
|
5772 can be returned. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5773 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5774 struct glyph * |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5775 get_phys_cursor_glyph (w) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5776 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5777 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5778 struct glyph_row *row; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5779 struct glyph *glyph; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5780 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5781 if (w->phys_cursor.vpos >= 0 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5782 && w->phys_cursor.vpos < w->current_matrix->nrows |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5783 && (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
|
5784 row->enabled_p) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5785 && row->used[TEXT_AREA] > w->phys_cursor.hpos) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5786 glyph = row->glyphs[TEXT_AREA] + w->phys_cursor.hpos; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5787 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5788 glyph = NULL; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5789 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5790 return glyph; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5791 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5792 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5793 |
265 | 5794 static int |
5795 save_window_save (window, vector, i) | |
5796 Lisp_Object window; | |
5797 struct Lisp_Vector *vector; | |
5798 int i; | |
5799 { | |
5800 register struct saved_window *p; | |
5801 register struct window *w; | |
5802 register Lisp_Object tem; | |
5803 | |
485 | 5804 for (;!NILP (window); window = w->next) |
265 | 5805 { |
5806 p = SAVED_WINDOW_N (vector, i); | |
5807 w = XWINDOW (window); | |
5808 | |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
5809 XSETFASTINT (w->temslot, i++); |
265 | 5810 p->window = window; |
5811 p->buffer = w->buffer; | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5812 p->left_col = w->left_col; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5813 p->top_line = w->top_line; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5814 p->total_cols = w->total_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5815 p->total_lines = w->total_lines; |
265 | 5816 p->hscroll = w->hscroll; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5817 p->min_hscroll = w->min_hscroll; |
265 | 5818 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
|
5819 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
|
5820 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
|
5821 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
|
5822 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
|
5823 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
|
5824 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
|
5825 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
|
5826 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
|
5827 p->vertical_scroll_bar_type = w->vertical_scroll_bar_type; |
485 | 5828 if (!NILP (w->buffer)) |
265 | 5829 { |
5830 /* Save w's value of point in the window configuration. | |
5831 If w is the selected window, then get the value of point | |
5832 from the buffer; pointm is garbage in the selected window. */ | |
5833 if (EQ (window, selected_window)) | |
5834 { | |
5835 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
|
5836 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
|
5837 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
|
5838 BUF_PT_BYTE (XBUFFER (w->buffer))); |
265 | 5839 } |
5840 else | |
12981
7a540e9cb21a
(save_window_save): Pass the new arg to Fcopy_marker.
Richard M. Stallman <rms@gnu.org>
parents:
12643
diff
changeset
|
5841 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
|
5842 |
7a540e9cb21a
(save_window_save): Pass the new arg to Fcopy_marker.
Richard M. Stallman <rms@gnu.org>
parents:
12643
diff
changeset
|
5843 p->start = Fcopy_marker (w->start, Qnil); |
265 | 5844 p->start_at_line_beg = w->start_at_line_beg; |
5845 | |
5846 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
|
5847 p->mark = Fcopy_marker (tem, Qnil); |
265 | 5848 } |
5849 else | |
5850 { | |
5851 p->pointm = Qnil; | |
5852 p->start = Qnil; | |
5853 p->mark = Qnil; | |
5854 p->start_at_line_beg = Qnil; | |
5855 } | |
5856 | |
485 | 5857 if (NILP (w->parent)) |
265 | 5858 p->parent = Qnil; |
5859 else | |
5860 p->parent = XWINDOW (w->parent)->temslot; | |
5861 | |
485 | 5862 if (NILP (w->prev)) |
265 | 5863 p->prev = Qnil; |
5864 else | |
5865 p->prev = XWINDOW (w->prev)->temslot; | |
5866 | |
485 | 5867 if (!NILP (w->vchild)) |
265 | 5868 i = save_window_save (w->vchild, vector, i); |
485 | 5869 if (!NILP (w->hchild)) |
265 | 5870 i = save_window_save (w->hchild, vector, i); |
5871 } | |
5872 | |
5873 return i; | |
5874 } | |
5875 | |
16485
9b919c5464a4
Reorganize function definitions so etags finds them.
Erik Naggum <erik@naggum.no>
parents:
16392
diff
changeset
|
5876 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
|
5877 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
|
5878 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
|
5879 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
|
5880 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
|
5881 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
|
5882 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
|
5883 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
|
5884 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
|
5885 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
|
5886 (frame) |
769 | 5887 Lisp_Object frame; |
265 | 5888 { |
5889 register Lisp_Object tem; | |
5890 register int n_windows; | |
5891 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
|
5892 register struct Lisp_Vector *vec; |
265 | 5893 register int i; |
769 | 5894 FRAME_PTR f; |
265 | 5895 |
769 | 5896 if (NILP (frame)) |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
5897 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
5898 CHECK_LIVE_FRAME (frame); |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
5899 f = XFRAME (frame); |
358 | 5900 |
769 | 5901 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
|
5902 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
|
5903 data = (struct save_window_data *)vec; |
5cda62e4222a
(Fcurrent_window_configuration): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9970
diff
changeset
|
5904 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5905 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
|
5906 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
|
5907 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
|
5908 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
|
5909 data->selected_frame = selected_frame; |
769 | 5910 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
|
5911 XSETBUFFER (data->current_buffer, current_buffer); |
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
5912 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
|
5913 data->minibuf_selected_window = minibuf_level > 0 ? minibuf_selected_window : Qnil; |
769 | 5914 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
|
5915 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
|
5916 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
|
5917 XSETINT (data->min_width, window_min_width); |
265 | 5918 tem = Fmake_vector (make_number (n_windows), Qnil); |
5919 data->saved_windows = tem; | |
5920 for (i = 0; i < n_windows; i++) | |
5921 XVECTOR (tem)->contents[i] | |
5922 = 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
|
5923 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
|
5924 XSETWINDOW_CONFIGURATION (tem, data); |
265 | 5925 return (tem); |
5926 } | |
5927 | |
5928 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
|
5929 0, UNEVALLED, 0, |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
5930 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
|
5931 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
|
5932 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
|
5933 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
|
5934 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
|
5935 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
|
5936 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
|
5937 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
|
5938 (args) |
265 | 5939 Lisp_Object args; |
5940 { | |
5941 register Lisp_Object val; | |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
5942 register int count = SPECPDL_INDEX (); |
265 | 5943 |
5944 record_unwind_protect (Fset_window_configuration, | |
358 | 5945 Fcurrent_window_configuration (Qnil)); |
265 | 5946 val = Fprogn (args); |
5947 return unbind_to (count, val); | |
5948 } | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5949 |
265 | 5950 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5951 /*********************************************************************** |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5952 Marginal Areas |
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 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5955 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
|
5956 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
|
5957 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
|
5958 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
|
5959 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
|
5960 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
|
5961 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
|
5962 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
|
5963 (window, left, right) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5964 Lisp_Object window, left, right; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5965 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5966 struct window *w = decode_window (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5967 |
52852
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
5968 /* Translate negative or zero widths to nil. |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5969 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
|
5970 |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
5971 if (!NILP (left)) |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
5972 { |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
5973 CHECK_NUMBER (left); |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
5974 if (XINT (left) <= 0) |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
5975 left = Qnil; |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
5976 } |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
5977 |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
5978 if (!NILP (right)) |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
5979 { |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
5980 CHECK_NUMBER (right); |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
5981 if (XINT (right) <= 0) |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
5982 right = Qnil; |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
5983 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5984 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5985 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
|
5986 || !EQ (w->right_margin_cols, right)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5987 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5988 w->left_margin_cols = left; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5989 w->right_margin_cols = right; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5990 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5991 adjust_window_margins (w); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5992 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5993 ++windows_or_buffers_changed; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5994 adjust_glyphs (XFRAME (WINDOW_FRAME (w))); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5995 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5996 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5997 return Qnil; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5998 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5999 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6000 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6001 DEFUN ("window-margins", Fwindow_margins, Swindow_margins, |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6002 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
|
6003 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
|
6004 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
|
6005 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
|
6006 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
|
6007 as nil. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6008 (window) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6009 Lisp_Object window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6010 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6011 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
|
6012 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
|
6013 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6014 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6015 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6016 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6017 /*********************************************************************** |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6018 Fringes |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6019 ***********************************************************************/ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6020 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6021 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
|
6022 2, 4, 0, |
52853
91a9da753e30
(Fset_window_fringes): Clarify docstring.
Lute Kamstra <lute@gnu.org>
parents:
52852
diff
changeset
|
6023 doc: /* Set the fringe widths of window WINDOW. |
91a9da753e30
(Fset_window_fringes): Clarify docstring.
Lute Kamstra <lute@gnu.org>
parents:
52852
diff
changeset
|
6024 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
|
6025 window. |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
6026 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
|
6027 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
|
6028 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
|
6029 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
|
6030 the command `set-fringe-style'. |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
6031 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
|
6032 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
|
6033 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
|
6034 (window, left, right, outside_margins) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6035 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
|
6036 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6037 struct window *w = decode_window (window); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6038 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6039 if (!NILP (left)) |
57309
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
6040 CHECK_NATNUM (left); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6041 if (!NILP (right)) |
57309
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
6042 CHECK_NATNUM (right); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6043 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6044 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
|
6045 || !EQ (w->right_fringe_width, right) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6046 || !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
|
6047 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6048 w->left_fringe_width = left; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6049 w->right_fringe_width = right; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6050 w->fringes_outside_margins = outside_margins; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6051 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6052 adjust_window_margins (w); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6053 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6054 clear_glyph_matrix (w->current_matrix); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6055 w->window_end_valid = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6056 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6057 ++windows_or_buffers_changed; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6058 adjust_glyphs (XFRAME (WINDOW_FRAME (w))); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6059 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6060 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6061 return Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6062 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6063 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6064 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6065 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
|
6066 0, 1, 0, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6067 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
|
6068 If WINDOW is omitted or nil, use the currently selected window. |
53927 | 6069 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
|
6070 (window) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6071 Lisp_Object window; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6072 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6073 struct window *w = decode_window (window); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6074 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
|
6075 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
|
6076 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
|
6077 Qt : Qnil), Qnil))); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6078 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6079 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6080 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6081 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6082 /*********************************************************************** |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6083 Scroll bars |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6084 ***********************************************************************/ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6085 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6086 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
|
6087 2, 4, 0, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6088 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
|
6089 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
|
6090 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
|
6091 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
|
6092 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
|
6093 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
|
6094 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
|
6095 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
|
6096 (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
|
6097 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
|
6098 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6099 struct window *w = decode_window (window); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6100 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6101 if (!NILP (width)) |
57309
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
6102 CHECK_NATNUM (width); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6103 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6104 if (XINT (width) == 0) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6105 vertical_type = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6106 |
52565
26d1a4665f6c
(Fset_window_scroll_bars): Validate the value of `vertical_type'.
Masatake YAMATO <jet@gyve.org>
parents:
52560
diff
changeset
|
6107 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
|
6108 || 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
|
6109 || EQ (vertical_type, Qright) |
26d1a4665f6c
(Fset_window_scroll_bars): Validate the value of `vertical_type'.
Masatake YAMATO <jet@gyve.org>
parents:
52560
diff
changeset
|
6110 || EQ (vertical_type, Qt))) |
26d1a4665f6c
(Fset_window_scroll_bars): Validate the value of `vertical_type'.
Masatake YAMATO <jet@gyve.org>
parents:
52560
diff
changeset
|
6111 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
|
6112 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6113 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
|
6114 || !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
|
6115 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6116 w->scroll_bar_width = width; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6117 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
|
6118 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6119 adjust_window_margins (w); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6120 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6121 clear_glyph_matrix (w->current_matrix); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6122 w->window_end_valid = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6123 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6124 ++windows_or_buffers_changed; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6125 adjust_glyphs (XFRAME (WINDOW_FRAME (w))); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6126 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6127 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6128 return Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6129 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6130 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6131 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6132 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
|
6133 0, 1, 0, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6134 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
|
6135 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
|
6136 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
|
6137 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
|
6138 value. */) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6139 (window) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6140 Lisp_Object window; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6141 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6142 struct window *w = decode_window (window); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6143 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
|
6144 ? WINDOW_CONFIG_SCROLL_BAR_WIDTH (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6145 : WINDOW_SCROLL_BAR_AREA_WIDTH (w))), |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6146 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
|
6147 Fcons (w->vertical_scroll_bar_type, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6148 Fcons (Qnil, Qnil)))); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6149 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6150 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6151 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6152 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6153 /*********************************************************************** |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6154 Smooth scrolling |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6155 ***********************************************************************/ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6156 |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6157 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
|
6158 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
|
6159 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
|
6160 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
|
6161 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
|
6162 (window, pixels_p) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6163 Lisp_Object window, pixels_p; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6164 { |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6165 Lisp_Object result; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6166 struct frame *f; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6167 struct window *w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6168 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6169 if (NILP (window)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6170 window = selected_window; |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6171 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
6172 CHECK_WINDOW (window); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6173 w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6174 f = XFRAME (w->frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6175 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6176 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
|
6177 result = (NILP (pixels_p) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6178 ? 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
|
6179 : make_number (-w->vscroll)); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6180 else |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6181 result = make_number (0); |
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6182 return result; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6183 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6184 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6185 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6186 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
|
6187 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
|
6188 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
|
6189 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
|
6190 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
|
6191 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
|
6192 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
|
6193 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
|
6194 result of this rounding. |
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
6195 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
|
6196 (window, vscroll, pixels_p) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6197 Lisp_Object window, vscroll, pixels_p; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6198 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6199 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6200 struct frame *f; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6201 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6202 if (NILP (window)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6203 window = selected_window; |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6204 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
6205 CHECK_WINDOW (window); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
6206 CHECK_NUMBER_OR_FLOAT (vscroll); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6207 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6208 w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6209 f = XFRAME (w->frame); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6210 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6211 if (FRAME_WINDOW_P (f)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6212 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6213 int old_dy = w->vscroll; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6214 |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6215 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
|
6216 ? 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
|
6217 : XFLOATINT (vscroll)); |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6218 w->vscroll = min (w->vscroll, 0); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6219 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6220 /* Adjust glyph matrix of the frame if the virtual display |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6221 area becomes larger than before. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6222 if (w->vscroll < 0 && w->vscroll < old_dy) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6223 adjust_glyphs (f); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6224 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6225 /* Prevent redisplay shortcuts. */ |
25375 | 6226 XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6227 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6228 |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6229 return Fwindow_vscroll (window, pixels_p); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6230 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6231 |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6232 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6233 /* 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
|
6234 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
|
6235 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
|
6236 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6237 void |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6238 foreach_window (f, fn, user_data) |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6239 struct frame *f; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6240 int (* fn) P_ ((struct window *, void *)); |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6241 void *user_data; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6242 { |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6243 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
|
6244 } |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6245 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6246 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6247 /* 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
|
6248 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
|
6249 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
|
6250 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
|
6251 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6252 static int |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6253 foreach_window_1 (w, fn, user_data) |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6254 struct window *w; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6255 int (* fn) P_ ((struct window *, void *)); |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6256 void *user_data; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6257 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6258 int cont; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6259 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6260 for (cont = 1; w && cont;) |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6261 { |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6262 if (!NILP (w->hchild)) |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6263 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
|
6264 else if (!NILP (w->vchild)) |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6265 cont = foreach_window_1 (XWINDOW (w->vchild), fn, user_data); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6266 else |
30366
8dd313fc287d
(foreach_window_1): Fix typo reversing an if-condition.
Gerd Moellmann <gerd@gnu.org>
parents:
30362
diff
changeset
|
6267 cont = fn (w, user_data); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6268 |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6269 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6270 } |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6271 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6272 return cont; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6273 } |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6274 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6275 |
39952 | 6276 /* 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
|
6277 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
|
6278 the window start. */ |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6279 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6280 static int |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6281 freeze_window_start (w, freeze_p) |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6282 struct window *w; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6283 void *freeze_p; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6284 { |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6285 if (w == XWINDOW (selected_window) |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6286 || MINI_WINDOW_P (w) |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6287 || (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
|
6288 && ! NILP (Vminibuf_scroll_window) |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6289 && w == XWINDOW (Vminibuf_scroll_window))) |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6290 freeze_p = NULL; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6291 |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6292 w->frozen_window_start_p = freeze_p != NULL; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6293 return 1; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6294 } |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6295 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6296 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6297 /* 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
|
6298 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
|
6299 means freeze the window start. */ |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6300 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6301 void |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6302 freeze_window_starts (f, freeze_p) |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6303 struct frame *f; |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6304 int freeze_p; |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6305 { |
31903
3e0a1f91c149
(freeze_window_starts): Construct last argument for
Gerd Moellmann <gerd@gnu.org>
parents:
31829
diff
changeset
|
6306 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
|
6307 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6308 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6309 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6310 /*********************************************************************** |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6311 Initialization |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6312 ***********************************************************************/ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6313 |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6314 /* Return 1 if window configurations C1 and C2 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6315 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
|
6316 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6317 int |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6318 compare_window_configurations (c1, c2, ignore_positions) |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6319 Lisp_Object c1, c2; |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6320 int ignore_positions; |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6321 { |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6322 register struct save_window_data *d1, *d2; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6323 struct Lisp_Vector *sw1, *sw2; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6324 int i; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6325 |
28505
b5a7eb24964c
(compare_window_configurations): Signal an error
Gerd Moellmann <gerd@gnu.org>
parents:
28463
diff
changeset
|
6326 if (!WINDOW_CONFIGURATIONP (c1)) |
b5a7eb24964c
(compare_window_configurations): Signal an error
Gerd Moellmann <gerd@gnu.org>
parents:
28463
diff
changeset
|
6327 wrong_type_argument (Qwindow_configuration_p, c1); |
b5a7eb24964c
(compare_window_configurations): Signal an error
Gerd Moellmann <gerd@gnu.org>
parents:
28463
diff
changeset
|
6328 if (!WINDOW_CONFIGURATIONP (c2)) |
b5a7eb24964c
(compare_window_configurations): Signal an error
Gerd Moellmann <gerd@gnu.org>
parents:
28463
diff
changeset
|
6329 wrong_type_argument (Qwindow_configuration_p, c2); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6330 |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6331 d1 = (struct save_window_data *) XVECTOR (c1); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6332 d2 = (struct save_window_data *) XVECTOR (c2); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6333 sw1 = XVECTOR (d1->saved_windows); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6334 sw2 = XVECTOR (d2->saved_windows); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6335 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6336 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
|
6337 return 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6338 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
|
6339 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6340 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
|
6341 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6342 if (! EQ (d1->selected_frame, d2->selected_frame)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6343 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6344 /* Don't compare the current_window field directly. |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6345 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
|
6346 if (! EQ (d1->current_buffer, d2->current_buffer)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6347 return 0; |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6348 if (! ignore_positions) |
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
6349 { |
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
6350 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
|
6351 return 0; |
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
6352 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
|
6353 return 0; |
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
6354 } |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6355 /* Don't compare the root_window field. |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6356 We don't require the two configurations |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6357 to use the same window object, |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6358 and the two root windows must be equivalent |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6359 if everything else compares equal. */ |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6360 if (! EQ (d1->focus_frame, d2->focus_frame)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6361 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6362 if (! EQ (d1->min_width, d2->min_width)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6363 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6364 if (! EQ (d1->min_height, d2->min_height)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6365 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6366 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6367 /* 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
|
6368 if (sw1->size != sw2->size) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6369 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6370 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6371 for (i = 0; i < sw1->size; i++) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6372 { |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6373 struct saved_window *p1, *p2; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6374 int w1_is_current, w2_is_current; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6375 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6376 p1 = SAVED_WINDOW_N (sw1, i); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6377 p2 = SAVED_WINDOW_N (sw2, i); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6378 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6379 /* Verify that the current windows in the two |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6380 configurations correspond to each other. */ |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6381 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
|
6382 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
|
6383 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6384 if (w1_is_current != w2_is_current) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6385 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6386 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6387 /* Verify that the corresponding windows do match. */ |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6388 if (! EQ (p1->buffer, p2->buffer)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6389 return 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6390 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
|
6391 return 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6392 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
|
6393 return 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6394 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
|
6395 return 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6396 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
|
6397 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6398 if (! EQ (p1->display_table, p2->display_table)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6399 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6400 if (! EQ (p1->parent, p2->parent)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6401 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6402 if (! EQ (p1->prev, p2->prev)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6403 return 0; |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6404 if (! ignore_positions) |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6405 { |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6406 if (! EQ (p1->hscroll, p2->hscroll)) |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6407 return 0; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
6408 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
|
6409 return 0; |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6410 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
|
6411 return 0; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6412 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
|
6413 return 0; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6414 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
|
6415 return 0; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6416 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
|
6417 return 0; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6418 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6419 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
|
6420 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6421 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
|
6422 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6423 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
|
6424 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6425 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
|
6426 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6427 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
|
6428 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6429 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
|
6430 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6431 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
|
6432 return 0; |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6433 } |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6434 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6435 return 1; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6436 } |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6437 |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6438 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
|
6439 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
|
6440 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
|
6441 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
|
6442 and scrolling positions. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6443 (x, y) |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6444 Lisp_Object x, y; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6445 { |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6446 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
|
6447 return Qt; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6448 return Qnil; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6449 } |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6450 |
21514 | 6451 void |
265 | 6452 init_window_once () |
6453 { | |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6454 struct frame *f = make_terminal_frame (); |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6455 XSETFRAME (selected_frame, f); |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6456 Vterminal_frame = selected_frame; |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6457 minibuf_window = f->minibuffer_window; |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6458 selected_window = f->selected_window; |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6459 last_nonminibuf_frame = f; |
14445
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
6460 |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
6461 window_initialized = 1; |
265 | 6462 } |
6463 | |
21514 | 6464 void |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6465 init_window () |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6466 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6467 Vwindow_list = Qnil; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6468 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6469 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6470 void |
265 | 6471 syms_of_window () |
6472 { | |
25540
2b4bdd114899
(Qwindow_size_fixed): Replaces Qfixed_window_size.
Gerd Moellmann <gerd@gnu.org>
parents:
25517
diff
changeset
|
6473 Qwindow_size_fixed = intern ("window-size-fixed"); |
2b4bdd114899
(Qwindow_size_fixed): Replaces Qfixed_window_size.
Gerd Moellmann <gerd@gnu.org>
parents:
25517
diff
changeset
|
6474 staticpro (&Qwindow_size_fixed); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6475 |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
6476 staticpro (&Qwindow_configuration_change_hook); |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
6477 Qwindow_configuration_change_hook |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
6478 = intern ("window-configuration-change-hook"); |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
6479 |
265 | 6480 Qwindowp = intern ("windowp"); |
6481 staticpro (&Qwindowp); | |
6482 | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
6483 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
|
6484 staticpro (&Qwindow_configuration_p); |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
6485 |
2210
22d78dbb3cc7
Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents:
2190
diff
changeset
|
6486 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
|
6487 staticpro (&Qwindow_live_p); |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
6488 |
11405
645e3883da72
(temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents:
11307
diff
changeset
|
6489 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
|
6490 staticpro (&Qtemp_buffer_show_hook); |
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
6491 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6492 staticpro (&Vwindow_list); |
43597
8097923cfe85
(syms_of_window): Initialize minibuf_selected_window.
Kim F. Storm <storm@cua.dk>
parents:
43594
diff
changeset
|
6493 |
8097923cfe85
(syms_of_window): Initialize minibuf_selected_window.
Kim F. Storm <storm@cua.dk>
parents:
43594
diff
changeset
|
6494 minibuf_selected_window = Qnil; |
43594
23cddac4d0b7
(minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents:
43571
diff
changeset
|
6495 staticpro (&minibuf_selected_window); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6496 |
265 | 6497 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
|
6498 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
|
6499 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
|
6500 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
|
6501 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
|
6502 the buffer; `temp-buffer-show-hook' is not run unless this function runs it. */); |
265 | 6503 Vtemp_buffer_show_function = Qnil; |
6504 | |
6505 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
|
6506 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
|
6507 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
|
6508 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
|
6509 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
|
6510 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
|
6511 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
|
6512 work using this function. */); |
265 | 6513 Vdisplay_buffer_function = Qnil; |
6514 | |
34261
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
6515 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
|
6516 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
|
6517 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
|
6518 Veven_window_heights = Qt; |
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
6519 |
265 | 6520 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
|
6521 doc: /* Non-nil means it is the window that C-M-v in minibuffer should scroll. */); |
265 | 6522 Vminibuf_scroll_window = Qnil; |
6523 | |
43281
a4ea76de57c9
(Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents:
43241
diff
changeset
|
6524 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
|
6525 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
|
6526 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
|
6527 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
|
6528 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
|
6529 |
265 | 6530 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
|
6531 doc: /* If non-nil, this is a buffer and \\[scroll-other-window] should scroll its window. */); |
265 | 6532 Vother_window_scroll_buffer = Qnil; |
6533 | |
769 | 6534 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
|
6535 doc: /* *Non-nil means `display-buffer' should make a separate frame. */); |
769 | 6536 pop_up_frames = 0; |
265 | 6537 |
30560
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
6538 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
|
6539 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
|
6540 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
|
6541 display_buffer_reuse_frames = 0; |
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
6542 |
769 | 6543 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
|
6544 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
|
6545 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
|
6546 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6547 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
|
6548 where `pop-up-frame-alist' would hold the default frame parameters. */); |
769 | 6549 Vpop_up_frame_function = Qnil; |
265 | 6550 |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
6551 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
|
6552 doc: /* *List of buffer names that should have their own special frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6553 Displaying a buffer whose name is in this list makes a special frame for it |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6554 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
|
6555 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6556 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
|
6557 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
|
6558 (BUFFER FRAME-PARAMETERS...) (BUFFER FUNCTION OTHER-ARGS...) |
56174
7b713bd3dad4
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56089
diff
changeset
|
6559 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
|
6560 \(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
|
6561 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
|
6562 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
|
6563 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
|
6564 |
52836
a832ae359532
(Fset_window_margins): Allow only integers as args.
Richard M. Stallman <rms@gnu.org>
parents:
52831
diff
changeset
|
6565 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
|
6566 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
|
6567 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
|
6568 in the currently selected frame. |
a832ae359532
(Fset_window_margins): Allow only integers as args.
Richard M. Stallman <rms@gnu.org>
parents:
52831
diff
changeset
|
6569 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6570 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
|
6571 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
|
6572 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
|
6573 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
|
6574 Vspecial_display_buffer_names = Qnil; |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
6575 |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
6576 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
|
6577 doc: /* *List of regexps saying which buffers should have their own special frames. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6578 If a buffer name matches one of these regexps, it gets its own frame. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6579 Displaying a buffer whose name is in this list makes a special frame for it |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6580 using `special-display-function'. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6581 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6582 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
|
6583 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
|
6584 (REGEXP FRAME-PARAMETERS...) (REGEXP FUNCTION OTHER-ARGS...) |
56174
7b713bd3dad4
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56089
diff
changeset
|
6585 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
|
6586 \(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
|
6587 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
|
6588 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
|
6589 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
|
6590 |
52836
a832ae359532
(Fset_window_margins): Allow only integers as args.
Richard M. Stallman <rms@gnu.org>
parents:
52831
diff
changeset
|
6591 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
|
6592 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
|
6593 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
|
6594 in the currently selected frame. |
a832ae359532
(Fset_window_margins): Allow only integers as args.
Richard M. Stallman <rms@gnu.org>
parents:
52831
diff
changeset
|
6595 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6596 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
|
6597 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
|
6598 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
|
6599 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
|
6600 Vspecial_display_regexps = Qnil; |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
6601 |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
6602 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
|
6603 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
|
6604 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
|
6605 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
|
6606 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
|
6607 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
|
6608 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
|
6609 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
|
6610 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
|
6611 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
|
6612 |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
6613 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
|
6614 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
|
6615 Vspecial_display_function = Qnil; |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
6616 |
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
6617 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
|
6618 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
|
6619 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
|
6620 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
|
6621 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
|
6622 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6623 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
|
6624 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
|
6625 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
|
6626 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
|
6627 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6628 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
|
6629 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
|
6630 |
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
6631 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
|
6632 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
|
6633 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
|
6634 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
|
6635 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
|
6636 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6637 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
|
6638 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
|
6639 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
|
6640 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
|
6641 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6642 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
|
6643 Vsame_window_regexps = Qnil; |
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
6644 |
265 | 6645 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
|
6646 doc: /* *Non-nil means display-buffer should make new windows. */); |
265 | 6647 pop_up_windows = 1; |
6648 | |
6649 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
|
6650 doc: /* *Number of lines of continuity when scrolling by screenfuls. */); |
265 | 6651 next_screen_context_lines = 2; |
6652 | |
6653 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
|
6654 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
|
6655 If there is only one window, it is split regardless of this value. */); |
265 | 6656 split_height_threshold = 500; |
6657 | |
6658 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
|
6659 doc: /* *Delete any window less than this tall (including its mode line). */); |
265 | 6660 window_min_height = 4; |
6661 | |
6662 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
|
6663 doc: /* *Delete any window less than this wide. */); |
265 | 6664 window_min_width = 10; |
6665 | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6666 DEFVAR_LISP ("scroll-preserve-screen-position", |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6667 &Vscroll_preserve_screen_position, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6668 doc: /* *Non-nil means scroll commands move point to keep its screen line unchanged. */); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6669 Vscroll_preserve_screen_position = Qnil; |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
6670 |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
6671 DEFVAR_LISP ("window-configuration-change-hook", |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
6672 &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
|
6673 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
|
6674 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
|
6675 Vwindow_configuration_change_hook = Qnil; |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
6676 |
35396
980c3ba545f9
(window_size_fixed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
35341
diff
changeset
|
6677 DEFVAR_BOOL ("window-size-fixed", &window_size_fixed, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6678 doc: /* Non-nil in a buffer means windows displaying the buffer are fixed-size. |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
6679 If the value is`height', then only the window's height is fixed. |
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
6680 If the value is `width', then only the window's width is fixed. |
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
6681 Any other non-nil value fixes both the width and the height. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6682 Emacs won't change the size of any window displaying that buffer, |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
6683 unless you explicitly change the size, or Emacs has no other choice. */); |
35396
980c3ba545f9
(window_size_fixed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
35341
diff
changeset
|
6684 Fmake_variable_buffer_local (Qwindow_size_fixed); |
980c3ba545f9
(window_size_fixed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
35341
diff
changeset
|
6685 window_size_fixed = 0; |
980c3ba545f9
(window_size_fixed): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
35341
diff
changeset
|
6686 |
265 | 6687 defsubr (&Sselected_window); |
6688 defsubr (&Sminibuffer_window); | |
6689 defsubr (&Swindow_minibuffer_p); | |
6690 defsubr (&Swindowp); | |
2210
22d78dbb3cc7
Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents:
2190
diff
changeset
|
6691 defsubr (&Swindow_live_p); |
265 | 6692 defsubr (&Spos_visible_in_window_p); |
6693 defsubr (&Swindow_buffer); | |
6694 defsubr (&Swindow_height); | |
6695 defsubr (&Swindow_width); | |
6696 defsubr (&Swindow_hscroll); | |
6697 defsubr (&Sset_window_hscroll); | |
13457
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
6698 defsubr (&Swindow_redisplay_end_trigger); |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
6699 defsubr (&Sset_window_redisplay_end_trigger); |
265 | 6700 defsubr (&Swindow_edges); |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
6701 defsubr (&Swindow_pixel_edges); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
6702 defsubr (&Swindow_inside_edges); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
6703 defsubr (&Swindow_inside_pixel_edges); |
432 | 6704 defsubr (&Scoordinates_in_window_p); |
6705 defsubr (&Swindow_at); | |
265 | 6706 defsubr (&Swindow_point); |
6707 defsubr (&Swindow_start); | |
6708 defsubr (&Swindow_end); | |
6709 defsubr (&Sset_window_point); | |
6710 defsubr (&Sset_window_start); | |
6711 defsubr (&Swindow_dedicated_p); | |
722
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
6712 defsubr (&Sset_window_dedicated_p); |
265 | 6713 defsubr (&Swindow_display_table); |
6714 defsubr (&Sset_window_display_table); | |
6715 defsubr (&Snext_window); | |
6716 defsubr (&Sprevious_window); | |
6717 defsubr (&Sother_window); | |
6718 defsubr (&Sget_lru_window); | |
6719 defsubr (&Sget_largest_window); | |
6720 defsubr (&Sget_buffer_window); | |
6721 defsubr (&Sdelete_other_windows); | |
6722 defsubr (&Sdelete_windows_on); | |
6723 defsubr (&Sreplace_buffer_in_windows); | |
6724 defsubr (&Sdelete_window); | |
6725 defsubr (&Sset_window_buffer); | |
6726 defsubr (&Sselect_window); | |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
6727 defsubr (&Sspecial_display_p); |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
6728 defsubr (&Ssame_window_p); |
265 | 6729 defsubr (&Sdisplay_buffer); |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
6730 defsubr (&Sforce_window_update); |
265 | 6731 defsubr (&Ssplit_window); |
6732 defsubr (&Senlarge_window); | |
6733 defsubr (&Sshrink_window); | |
6734 defsubr (&Sscroll_up); | |
6735 defsubr (&Sscroll_down); | |
6736 defsubr (&Sscroll_left); | |
6737 defsubr (&Sscroll_right); | |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
6738 defsubr (&Sother_window_for_scrolling); |
265 | 6739 defsubr (&Sscroll_other_window); |
43624
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
6740 defsubr (&Sminibuffer_selected_window); |
265 | 6741 defsubr (&Srecenter); |
34416
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
6742 defsubr (&Swindow_text_height); |
265 | 6743 defsubr (&Smove_to_window_line); |
6744 defsubr (&Swindow_configuration_p); | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
6745 defsubr (&Swindow_configuration_frame); |
265 | 6746 defsubr (&Sset_window_configuration); |
6747 defsubr (&Scurrent_window_configuration); | |
6748 defsubr (&Ssave_window_excursion); | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6749 defsubr (&Sset_window_margins); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6750 defsubr (&Swindow_margins); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6751 defsubr (&Sset_window_fringes); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6752 defsubr (&Swindow_fringes); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6753 defsubr (&Sset_window_scroll_bars); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6754 defsubr (&Swindow_scroll_bars); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6755 defsubr (&Swindow_vscroll); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6756 defsubr (&Sset_window_vscroll); |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6757 defsubr (&Scompare_window_configurations); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6758 defsubr (&Swindow_list); |
265 | 6759 } |
6760 | |
21514 | 6761 void |
265 | 6762 keys_of_window () |
6763 { | |
6764 initial_define_key (control_x_map, '1', "delete-other-windows"); | |
6765 initial_define_key (control_x_map, '2', "split-window"); | |
6766 initial_define_key (control_x_map, '0', "delete-window"); | |
6767 initial_define_key (control_x_map, 'o', "other-window"); | |
6768 initial_define_key (control_x_map, '^', "enlarge-window"); | |
6769 initial_define_key (control_x_map, '<', "scroll-left"); | |
6770 initial_define_key (control_x_map, '>', "scroll-right"); | |
6771 | |
6772 initial_define_key (global_map, Ctl ('V'), "scroll-up"); | |
6773 initial_define_key (meta_map, Ctl ('V'), "scroll-other-window"); | |
6774 initial_define_key (meta_map, 'v', "scroll-down"); | |
6775 | |
6776 initial_define_key (global_map, Ctl('L'), "recenter"); | |
6777 initial_define_key (meta_map, 'r', "move-to-window-line"); | |
6778 } | |
52401 | 6779 |
6780 /* arch-tag: 90a9c576-0590-48f1-a5f1-6c96a0452d9f | |
6781 (do not change this comment) */ |