Mercurial > emacs
annotate src/window.c @ 90317:34c8b755296d
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-23
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 113-118)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 38-39)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 24 Feb 2006 08:08:56 +0000 |
parents | d1c5430c5bff 527507f1a62e |
children | 5754737d1e04 |
rev | line source |
---|---|
265 | 1 /* Window creation, deletion and examination for GNU Emacs. |
2 Does not include redisplay. | |
61511
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
3 Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 2000, |
68651
3bd95f4f2941
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68490
diff
changeset
|
4 2001, 2002, 2003, 2004, 2005, 2006 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 | |
64084 | 20 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
21 Boston, MA 02110-1301, 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)); |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
68 static void enlarge_window P_ ((Lisp_Object, int, int)); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
69 static Lisp_Object window_list P_ ((void)); |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
70 static int add_window_to_list P_ ((struct window *, void *)); |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
71 static int candidate_window_p P_ ((Lisp_Object, Lisp_Object, Lisp_Object, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
72 Lisp_Object)); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
73 static Lisp_Object next_window P_ ((Lisp_Object, Lisp_Object, |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
74 Lisp_Object, int)); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
75 static void decode_next_window_args P_ ((Lisp_Object *, Lisp_Object *, |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
76 Lisp_Object *)); |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
77 static int foreach_window_1 P_ ((struct window *, |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
78 int (* fn) (struct window *, void *), |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
79 void *)); |
33619
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
80 static Lisp_Object window_list_1 P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); |
22187
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
81 |
265 | 82 /* This is the window in which the terminal's cursor should |
83 be left when nothing is being done with it. This must | |
84 always be a leaf window, and its buffer is selected by | |
85 the top level editing loop at the end of each command. | |
86 | |
87 This value is always the same as | |
769 | 88 FRAME_SELECTED_WINDOW (selected_frame). */ |
265 | 89 |
90 Lisp_Object selected_window; | |
91 | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
92 /* A list of all windows for use by next_window and Fwindow_list. |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
93 Functions creating or deleting windows should invalidate this cache |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
94 by setting it to nil. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
95 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
96 Lisp_Object Vwindow_list; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
97 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
98 /* The mini-buffer window of the selected frame. |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
99 Note that you cannot test for mini-bufferness of an arbitrary window |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
100 by comparing against this; but you can test for mini-bufferness of |
265 | 101 the selected window. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
102 |
265 | 103 Lisp_Object minibuf_window; |
104 | |
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
105 /* Non-nil means it is the window whose mode line should be |
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
106 shown as the selected window when the minibuffer is selected. */ |
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
107 |
43594
23cddac4d0b7
(minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents:
43571
diff
changeset
|
108 Lisp_Object minibuf_selected_window; |
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
109 |
265 | 110 /* Non-nil means it is the window for C-M-v to scroll |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
111 when the mini-buffer is selected. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
112 |
265 | 113 Lisp_Object Vminibuf_scroll_window; |
114 | |
115 /* Non-nil means this is the buffer whose window C-M-v should scroll. */ | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
116 |
265 | 117 Lisp_Object Vother_window_scroll_buffer; |
118 | |
119 /* Non-nil means it's function to call to display temp buffers. */ | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
120 |
265 | 121 Lisp_Object Vtemp_buffer_show_function; |
122 | |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
123 /* Non-zero means line and page scrolling on tall lines (with images) |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
124 does partial scrolling by modifying window-vscroll. */ |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
125 |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
126 int auto_window_vscroll_p; |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
127 |
43281
a4ea76de57c9
(Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents:
43241
diff
changeset
|
128 /* Non-zero means to use mode-line-inactive face in all windows but the |
a4ea76de57c9
(Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents:
43241
diff
changeset
|
129 selected-window and the minibuffer-scroll-window when the |
a4ea76de57c9
(Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents:
43241
diff
changeset
|
130 minibuffer is active. */ |
a4ea76de57c9
(Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents:
43241
diff
changeset
|
131 int mode_line_in_non_selected_windows; |
43241
5558e7582f1f
(Vmode_line_in_non_selected_windows): New variable.
Kim F. Storm <storm@cua.dk>
parents:
42875
diff
changeset
|
132 |
265 | 133 /* If a window gets smaller than either of these, it is removed. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
134 |
43713
f92c4d87863a
Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43624
diff
changeset
|
135 EMACS_INT window_min_height; |
f92c4d87863a
Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43624
diff
changeset
|
136 EMACS_INT window_min_width; |
265 | 137 |
138 /* Nonzero implies Fdisplay_buffer should create windows. */ | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
139 |
265 | 140 int pop_up_windows; |
141 | |
769 | 142 /* Nonzero implies make new frames for Fdisplay_buffer. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
143 |
769 | 144 int pop_up_frames; |
265 | 145 |
30560
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
146 /* Nonzero means reuse existing frames for displaying buffers. */ |
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
147 |
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
148 int display_buffer_reuse_frames; |
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
149 |
265 | 150 /* Non-nil means use this function instead of default */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
151 |
769 | 152 Lisp_Object Vpop_up_frame_function; |
265 | 153 |
154 /* Function to call to handle Fdisplay_buffer. */ | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
155 |
265 | 156 Lisp_Object Vdisplay_buffer_function; |
157 | |
34261
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
158 /* Non-nil means that Fdisplay_buffer should even the heights of windows. */ |
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
159 |
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
160 Lisp_Object Veven_window_heights; |
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
161 |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
162 /* List of buffer *names* for buffers that should have their own frames. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
163 |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
164 Lisp_Object Vspecial_display_buffer_names; |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
165 |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
166 /* List of regexps for buffer names that should have their own frames. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
167 |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
168 Lisp_Object Vspecial_display_regexps; |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
169 |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
170 /* Function to pop up a special frame. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
171 |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
172 Lisp_Object Vspecial_display_function; |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
173 |
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
174 /* List of buffer *names* for buffers to appear in selected window. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
175 |
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
176 Lisp_Object Vsame_window_buffer_names; |
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
177 |
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
178 /* List of regexps for buffer names to appear in selected window. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
179 |
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
180 Lisp_Object Vsame_window_regexps; |
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
181 |
10461
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
182 /* Hook run at end of temp_output_buffer_show. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
183 |
10461
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
184 Lisp_Object Qtemp_buffer_show_hook; |
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
185 |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
186 /* Fdisplay_buffer always splits the largest window |
265 | 187 if that window is more than this high. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
188 |
43713
f92c4d87863a
Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43624
diff
changeset
|
189 EMACS_INT split_height_threshold; |
265 | 190 |
191 /* Number of lines of continuity in scrolling by screenfuls. */ | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
192 |
43713
f92c4d87863a
Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43624
diff
changeset
|
193 EMACS_INT next_screen_context_lines; |
265 | 194 |
195 /* Incremented for each window created. */ | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
196 |
265 | 197 static int sequence_number; |
198 | |
14445
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
199 /* Nonzero after init_window_once has finished. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
200 |
14445
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
201 static int window_initialized; |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
202 |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
203 /* Hook to run when window config changes. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
204 |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
205 Lisp_Object Qwindow_configuration_change_hook; |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
206 Lisp_Object Vwindow_configuration_change_hook; |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
207 |
58083 | 208 /* Non-nil means scroll commands try to put point |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
209 at the same screen height as previously. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
210 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
211 Lisp_Object Vscroll_preserve_screen_position; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
212 |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
213 /* Incremented by 1 whenever a window is deleted. */ |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
214 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
215 int window_deletion_count; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
216 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
217 #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
|
218 /* 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
|
219 static int inhibit_frame_unsplittable; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
220 #endif /* 0 */ |
17540
eb82c4de9dea
(frame_allow_splitting): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17365
diff
changeset
|
221 |
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
|
222 extern EMACS_INT scroll_margin; |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
223 |
14149
0d67df27dc2a
(Fset_window_buffer): Call the window-scroll-functions.
Richard M. Stallman <rms@gnu.org>
parents:
14089
diff
changeset
|
224 extern Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions; |
265 | 225 |
226 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
|
227 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
|
228 (object) |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
229 Lisp_Object object; |
265 | 230 { |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
231 return WINDOWP (object) ? Qt : Qnil; |
265 | 232 } |
233 | |
2210
22d78dbb3cc7
Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents:
2190
diff
changeset
|
234 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
|
235 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
|
236 (object) |
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
237 Lisp_Object object; |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
238 { |
35398
ef34ddc12a7d
* window.c (Fwindow_live_p): Use WINDOW_LIVE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
35396
diff
changeset
|
239 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
|
240 } |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
241 |
265 | 242 Lisp_Object |
243 make_window () | |
244 { | |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
245 Lisp_Object val; |
265 | 246 register struct window *p; |
36432
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
247 |
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
248 p = allocate_window (); |
58265
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
249 ++sequence_number; |
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
250 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
|
251 XSETFASTINT (p->left_col, 0); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
252 XSETFASTINT (p->top_line, 0); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
253 XSETFASTINT (p->total_lines, 0); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
254 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
|
255 XSETFASTINT (p->hscroll, 0); |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
256 XSETFASTINT (p->min_hscroll, 0); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
257 p->orig_top_line = p->orig_total_lines = Qnil; |
265 | 258 p->start = Fmake_marker (); |
259 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
|
260 XSETFASTINT (p->use_time, 0); |
769 | 261 p->frame = Qnil; |
265 | 262 p->display_table = Qnil; |
263 p->dedicated = Qnil; | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
264 p->pseudo_window_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
265 bzero (&p->cursor, sizeof (p->cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
266 bzero (&p->last_cursor, sizeof (p->last_cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
267 bzero (&p->phys_cursor, sizeof (p->phys_cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
268 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
|
269 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
|
270 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
|
271 p->phys_cursor_width = -1; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
272 p->must_be_updated_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
273 XSETFASTINT (p->window_end_vpos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
274 XSETFASTINT (p->window_end_pos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
275 p->window_end_valid = Qnil; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
276 p->vscroll = 0; |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
277 XSETWINDOW (val, p); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
278 XSETFASTINT (p->last_point, 0); |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
279 p->frozen_window_start_p = 0; |
44744
8c52c2bf3b3f
(make_window): Initialize height_fixed_p,
Richard M. Stallman <rms@gnu.org>
parents:
44649
diff
changeset
|
280 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
|
281 p->left_margin_cols = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
282 p->right_margin_cols = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
283 p->left_fringe_width = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
284 p->right_fringe_width = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
285 p->fringes_outside_margins = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
286 p->scroll_bar_width = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
287 p->vertical_scroll_bar_type = Qt; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
288 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
289 Vwindow_list = Qnil; |
265 | 290 return val; |
291 } | |
292 | |
293 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
|
294 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
|
295 () |
265 | 296 { |
297 return selected_window; | |
298 } | |
299 | |
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
300 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
|
301 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
|
302 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
|
303 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
|
304 (frame) |
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
305 Lisp_Object frame; |
265 | 306 { |
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
307 if (NILP (frame)) |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
308 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
309 CHECK_LIVE_FRAME (frame); |
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
310 return FRAME_MINIBUF_WINDOW (XFRAME (frame)); |
265 | 311 } |
312 | |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
313 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
|
314 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
|
315 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
|
316 (window) |
265 | 317 Lisp_Object window; |
318 { | |
319 struct window *w = decode_window (window); | |
32871
361743be1fa8
(pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
32824
diff
changeset
|
320 return MINI_WINDOW_P (w) ? Qt : Qnil; |
32710
cd7dca826a03
(pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents:
32426
diff
changeset
|
321 } |
cd7dca826a03
(pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents:
32426
diff
changeset
|
322 |
cd7dca826a03
(pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents:
32426
diff
changeset
|
323 |
265 | 324 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
|
325 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
|
326 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
|
327 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
|
328 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
|
329 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
|
330 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
|
331 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
|
332 |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
333 If POS is visible, return t if PARTIALLY is nil; if PARTIALLY is non-nil, |
59700
c401b93db575
* window.c (Fpos_visible_in_window_p): Simplify return value for
Kim F. Storm <storm@cua.dk>
parents:
59695
diff
changeset
|
334 return value is a list (X Y PARTIAL) where X and Y are the pixel coordinates |
c401b93db575
* window.c (Fpos_visible_in_window_p): Simplify return value for
Kim F. Storm <storm@cua.dk>
parents:
59695
diff
changeset
|
335 relative to the top left corner of the window. PARTIAL is nil if the character |
c401b93db575
* window.c (Fpos_visible_in_window_p): Simplify return value for
Kim F. Storm <storm@cua.dk>
parents:
59695
diff
changeset
|
336 after POS is fully visible; otherwise it is a cons (RTOP . RBOT) where RTOP |
c401b93db575
* window.c (Fpos_visible_in_window_p): Simplify return value for
Kim F. Storm <storm@cua.dk>
parents:
59695
diff
changeset
|
337 and RBOT are the number of pixels invisible at the top and bottom of the row. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
338 (pos, window, partially) |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
339 Lisp_Object pos, window, partially; |
265 | 340 { |
341 register struct window *w; | |
342 register int posint; | |
343 register struct buffer *buf; | |
25300
096b78b6cc2e
(Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
25268
diff
changeset
|
344 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
|
345 Lisp_Object in_window = Qnil; |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
346 int rtop, rbot, fully_p = 1; |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
347 int x, y; |
265 | 348 |
32937 | 349 w = decode_window (window); |
350 buf = XBUFFER (w->buffer); | |
351 SET_TEXT_POS_FROM_MARKER (top, w->start); | |
352 | |
353 if (!NILP (pos)) | |
265 | 354 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
355 CHECK_NUMBER_COERCE_MARKER (pos); |
265 | 356 posint = XINT (pos); |
357 } | |
32937 | 358 else if (w == XWINDOW (selected_window)) |
359 posint = PT; | |
360 else | |
361 posint = XMARKER (w->pointm)->charpos; | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
362 |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
363 /* 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
|
364 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
|
365 if (posint >= CHARPOS (top) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
366 && posint <= BUF_ZV (buf) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
367 && 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
|
368 && CHARPOS (top) <= BUF_ZV (buf) |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
369 && pos_visible_p (w, posint, &x, &y, &rtop, &rbot, NILP (partially)) |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
370 && (fully_p = !rtop && !rbot, (!NILP (partially) || fully_p))) |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
371 in_window = Qt; |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
372 |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
373 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
|
374 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
|
375 Fcons (make_number (y), |
59700
c401b93db575
* window.c (Fpos_visible_in_window_p): Simplify return value for
Kim F. Storm <storm@cua.dk>
parents:
59695
diff
changeset
|
376 Fcons ((fully_p ? Qnil |
c401b93db575
* window.c (Fpos_visible_in_window_p): Simplify return value for
Kim F. Storm <storm@cua.dk>
parents:
59695
diff
changeset
|
377 : Fcons (make_number (rtop), |
c401b93db575
* window.c (Fpos_visible_in_window_p): Simplify return value for
Kim F. Storm <storm@cua.dk>
parents:
59695
diff
changeset
|
378 make_number (rbot))), |
c401b93db575
* window.c (Fpos_visible_in_window_p): Simplify return value for
Kim F. Storm <storm@cua.dk>
parents:
59695
diff
changeset
|
379 Qnil))); |
25300
096b78b6cc2e
(Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
25268
diff
changeset
|
380 return in_window; |
265 | 381 } |
32871
361743be1fa8
(pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
32824
diff
changeset
|
382 |
265 | 383 |
384 static struct window * | |
385 decode_window (window) | |
386 register Lisp_Object window; | |
387 { | |
485 | 388 if (NILP (window)) |
265 | 389 return XWINDOW (selected_window); |
390 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
391 CHECK_LIVE_WINDOW (window); |
265 | 392 return XWINDOW (window); |
393 } | |
394 | |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
395 static struct window * |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
396 decode_any_window (window) |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
397 register Lisp_Object window; |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
398 { |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
399 if (NILP (window)) |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
400 return XWINDOW (selected_window); |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
401 |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
402 CHECK_WINDOW (window); |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
403 return XWINDOW (window); |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
404 } |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
405 |
265 | 406 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
|
407 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
|
408 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
|
409 (window) |
265 | 410 Lisp_Object window; |
411 { | |
412 return decode_window (window)->buffer; | |
413 } | |
414 | |
415 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
|
416 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
|
417 (window) |
265 | 418 Lisp_Object window; |
419 { | |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
420 return decode_any_window (window)->total_lines; |
265 | 421 } |
422 | |
423 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
|
424 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
|
425 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
|
426 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
|
427 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
|
428 (window) |
265 | 429 Lisp_Object window; |
430 { | |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
431 return make_number (window_box_text_cols (decode_any_window (window))); |
265 | 432 } |
433 | |
434 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
|
435 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
|
436 (window) |
265 | 437 Lisp_Object window; |
438 { | |
439 return decode_window (window)->hscroll; | |
440 } | |
441 | |
442 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
|
443 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
|
444 Return NCOL. NCOL should be zero or positive. |
45645
6e2471fb2c1c
(Fset_window_hscroll): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
45584
diff
changeset
|
445 |
6e2471fb2c1c
(Fset_window_hscroll): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
45584
diff
changeset
|
446 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
|
447 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
|
448 (window, ncol) |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
449 Lisp_Object window, ncol; |
265 | 450 { |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
451 struct window *w = decode_window (window); |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
452 int hscroll; |
265 | 453 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
454 CHECK_NUMBER (ncol); |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
455 hscroll = max (0, XINT (ncol)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
456 |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
457 /* Prevent redisplay shortcuts when changing the hscroll. */ |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
458 if (XINT (w->hscroll) != hscroll) |
25375 | 459 XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
460 |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
461 w->hscroll = make_number (hscroll); |
265 | 462 return ncol; |
463 } | |
464 | |
13457
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
465 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
|
466 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
|
467 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
|
468 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
|
469 (window) |
13457
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
470 Lisp_Object window; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
471 { |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
472 return decode_window (window)->redisplay_end_trigger; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
473 } |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
474 |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
475 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
|
476 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
|
477 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
|
478 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
|
479 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
|
480 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
|
481 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
|
482 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
|
483 (window, value) |
13457
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
484 register Lisp_Object window, value; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
485 { |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
486 register struct window *w; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
487 |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
488 w = decode_window (window); |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
489 w->redisplay_end_trigger = value; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
490 return value; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
491 } |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
492 |
265 | 493 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
|
494 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
|
495 \(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
|
496 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
|
497 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
|
498 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
|
499 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
|
500 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
|
501 (window) |
265 | 502 Lisp_Object window; |
503 { | |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
504 register struct window *w = decode_any_window (window); |
265 | 505 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
506 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
|
507 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
|
508 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
|
509 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
|
510 Qnil)))); |
265 | 511 } |
512 | |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
513 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
|
514 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
|
515 \(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
|
516 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
|
517 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
|
518 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
|
519 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
|
520 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
|
521 (window) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
522 Lisp_Object window; |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
523 { |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
524 register struct window *w = decode_any_window (window); |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
525 |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
526 return Fcons (make_number (WINDOW_LEFT_EDGE_X (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
527 Fcons (make_number (WINDOW_TOP_EDGE_Y (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
528 Fcons (make_number (WINDOW_RIGHT_EDGE_X (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
529 Fcons (make_number (WINDOW_BOTTOM_EDGE_Y (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
530 Qnil)))); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
531 } |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
532 |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
533 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
|
534 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
|
535 \(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
|
536 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
|
537 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
|
538 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
|
539 display margins, fringes, header line, and/or mode line. */) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
540 (window) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
541 Lisp_Object window; |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
542 { |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
543 register struct window *w = decode_any_window (window); |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
544 |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
545 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
|
546 + WINDOW_LEFT_MARGIN_COLS (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
547 + WINDOW_LEFT_FRINGE_COLS (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
548 make_number (WINDOW_TOP_EDGE_LINE (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
549 + WINDOW_HEADER_LINE_LINES (w)), |
62544
5283bd0173e6
(Fwindow_inside_edges, Fwindow_inside_pixel_edges): Correct the right value.
Lute Kamstra <lute@gnu.org>
parents:
61871
diff
changeset
|
550 make_number (WINDOW_BOX_RIGHT_EDGE_COL (w) |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
551 - WINDOW_RIGHT_MARGIN_COLS (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
552 - WINDOW_RIGHT_FRINGE_COLS (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
553 make_number (WINDOW_BOTTOM_EDGE_LINE (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
554 - WINDOW_MODE_LINE_LINES (w))); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
555 } |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
556 |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
557 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
|
558 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
|
559 \(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
|
560 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
|
561 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
|
562 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
|
563 display margins, fringes, header line, and/or mode line. */) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
564 (window) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
565 Lisp_Object window; |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
566 { |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
567 register struct window *w = decode_any_window (window); |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
568 |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
569 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
|
570 + WINDOW_LEFT_MARGIN_WIDTH (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
571 + WINDOW_LEFT_FRINGE_WIDTH (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
572 make_number (WINDOW_TOP_EDGE_Y (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
573 + WINDOW_HEADER_LINE_HEIGHT (w)), |
62544
5283bd0173e6
(Fwindow_inside_edges, Fwindow_inside_pixel_edges): Correct the right value.
Lute Kamstra <lute@gnu.org>
parents:
61871
diff
changeset
|
574 make_number (WINDOW_BOX_RIGHT_EDGE_X (w) |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
575 - WINDOW_RIGHT_MARGIN_WIDTH (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
576 - WINDOW_RIGHT_FRINGE_WIDTH (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
577 make_number (WINDOW_BOTTOM_EDGE_Y (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
578 - WINDOW_MODE_LINE_HEIGHT (w))); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
579 } |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
580 |
25315
79bb4978ab2e
(Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents:
25300
diff
changeset
|
581 /* 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
|
582 If it is not, return ON_NOTHING; |
432 | 583 if it is in the window's text area, |
584 set *x and *y to its location relative to the upper left corner | |
585 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
|
586 return ON_TEXT; |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
587 if it is on the window's modeline, return ON_MODE_LINE; |
432 | 588 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
|
589 return ON_VERTICAL_BORDER. |
56542
6d2d9477f39e
(coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents:
56540
diff
changeset
|
590 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
|
591 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
|
592 if it is on the window's top line, return ON_HEADER_LINE; |
41127 | 593 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
|
594 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
|
595 to window-relative coordinates; |
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
596 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
|
597 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
|
598 to window-relative coordinates. |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
599 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
600 X and Y are frame relative pixel coordinates. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
601 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
602 static enum window_part |
432 | 603 coordinates_in_window (w, x, y) |
604 register struct window *w; | |
605 register int *x, *y; | |
606 { | |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
607 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
608 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
|
609 enum window_part part; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
610 int ux = FRAME_COLUMN_WIDTH (f); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
611 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
|
612 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
|
613 /* 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
|
614 (Between mode lines for instance. */ |
f03dfbb443ce
(coordinates_in_window): Increase width of area
Gerd Moellmann <gerd@gnu.org>
parents:
36068
diff
changeset
|
615 int grabbable_width = ux; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
616 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
|
617 |
28918
e42cd428f056
(coordinates_in_window): Subtract 1 when computing right_x.
Eli Zaretskii <eliz@gnu.org>
parents:
28726
diff
changeset
|
618 /* 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
|
619 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
|
620 if (w->pseudo_window_p) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
621 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
622 left_x = 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
623 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
|
624 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
|
625 bottom_y = WINDOW_BOTTOM_EDGE_Y (w); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
626 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
627 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
628 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
629 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
|
630 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
|
631 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
|
632 bottom_y = WINDOW_BOTTOM_EDGE_Y (w); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
633 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
634 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
635 /* Outside any interesting row? */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
636 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
|
637 return ON_NOTHING; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
638 |
33957
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
639 /* 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
|
640 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
|
641 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
|
642 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
|
643 scroll bars. */ |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
644 |
33957
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
645 if (WINDOW_WANTS_MODELINE_P (w) |
53129
070325c3884d
(coordinates_in_window): Remove redundant tests.
Kim F. Storm <storm@cua.dk>
parents:
52853
diff
changeset
|
646 && *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
|
647 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
648 part = ON_MODE_LINE; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
649 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
650 header_vertical_border_check: |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
651 /* 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
|
652 between mode lines of horizontally adjacent mode lines |
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
653 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
|
654 return the right window. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
655 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
|
656 || WINDOW_RIGHTMOST_P (w)) |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
657 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
658 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
|
659 return ON_VERTICAL_BORDER; |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
660 } |
51223
c1daf1c22f97
(Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents:
51207
diff
changeset
|
661 else |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
662 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
663 if (abs (*x - x1) < grabbable_width) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
664 return ON_VERTICAL_BORDER; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
665 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
666 |
57309
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
667 if (*x < x0 || *x >= x1) |
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
668 return ON_NOTHING; |
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
669 |
51477
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
670 /* 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
|
671 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
|
672 *x -= x0; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
673 *y -= top_y; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
674 return part; |
33957
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
675 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
676 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
677 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
|
678 && *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
|
679 { |
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
680 part = ON_HEADER_LINE; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
681 goto header_vertical_border_check; |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
682 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
683 |
57309
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
684 if (*x < x0 || *x >= x1) |
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
685 return ON_NOTHING; |
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
686 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
687 /* Outside any interesting column? */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
688 if (*x < left_x || *x > right_x) |
66018
7810bc0b0259
(coordinates_in_window): Fix returned y position when
Kim F. Storm <storm@cua.dk>
parents:
65975
diff
changeset
|
689 { |
7810bc0b0259
(coordinates_in_window): Fix returned y position when
Kim F. Storm <storm@cua.dk>
parents:
65975
diff
changeset
|
690 *y -= top_y; |
7810bc0b0259
(coordinates_in_window): Fix returned y position when
Kim F. Storm <storm@cua.dk>
parents:
65975
diff
changeset
|
691 return ON_SCROLL_BAR; |
7810bc0b0259
(coordinates_in_window): Fix returned y position when
Kim F. Storm <storm@cua.dk>
parents:
65975
diff
changeset
|
692 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
693 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
694 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
|
695 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
|
696 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
697 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
|
698 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
|
699 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
700 if (FRAME_WINDOW_P (f)) |
25315
79bb4978ab2e
(Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents:
25300
diff
changeset
|
701 { |
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
702 if (!w->pseudo_window_p |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
703 && !WINDOW_HAS_VERTICAL_SCROLL_BAR (w) |
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
704 && !WINDOW_RIGHTMOST_P (w) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
705 && (abs (*x - right_x) < grabbable_width)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
706 return ON_VERTICAL_BORDER; |
25315
79bb4978ab2e
(Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents:
25300
diff
changeset
|
707 } |
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
708 else |
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
709 { |
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
710 /* 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
|
711 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
|
712 if (!w->pseudo_window_p |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
713 && !WINDOW_RIGHTMOST_P (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
714 && *x > right_x - ux) |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
715 { |
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
716 /* 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
|
717 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
|
718 return ON_VERTICAL_BORDER; |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
719 } |
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
720 } |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
721 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
722 if (*x < text_left) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
723 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
724 if (lmargin_width > 0 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
725 && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
726 ? (*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
|
727 : (*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
|
728 { |
53129
070325c3884d
(coordinates_in_window): Remove redundant tests.
Kim F. Storm <storm@cua.dk>
parents:
52853
diff
changeset
|
729 *x -= left_x; |
51477
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
730 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
|
731 *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
|
732 *y -= top_y; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
733 return ON_LEFT_MARGIN; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
734 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
735 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
736 /* 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
|
737 *x -= left_x; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
738 *y -= top_y; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
739 return ON_LEFT_FRINGE; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
740 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
741 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
742 if (*x >= text_right) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
743 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
744 if (rmargin_width > 0 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
745 && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
746 ? (*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
|
747 : (*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
|
748 { |
66030
999beda71a39
(coordinates_in_window): Fix x position for ON_RIGHT_MARGIN.
Kim F. Storm <storm@cua.dk>
parents:
66018
diff
changeset
|
749 *x -= right_x - rmargin_width; |
999beda71a39
(coordinates_in_window): Fix x position for ON_RIGHT_MARGIN.
Kim F. Storm <storm@cua.dk>
parents:
66018
diff
changeset
|
750 if (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)) |
999beda71a39
(coordinates_in_window): Fix x position for ON_RIGHT_MARGIN.
Kim F. Storm <storm@cua.dk>
parents:
66018
diff
changeset
|
751 *x += WINDOW_RIGHT_FRINGE_WIDTH (w); |
51477
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
752 *y -= top_y; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
753 return ON_RIGHT_MARGIN; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
754 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
755 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
756 /* 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
|
757 *x -= left_x + WINDOW_LEFT_FRINGE_WIDTH (w); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
758 *y -= top_y; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
759 return ON_RIGHT_FRINGE; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
760 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
761 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
762 /* Everything special ruled out - must be on text area */ |
66030
999beda71a39
(coordinates_in_window): Fix x position for ON_RIGHT_MARGIN.
Kim F. Storm <storm@cua.dk>
parents:
66018
diff
changeset
|
763 *x -= text_left; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
764 *y -= top_y; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
765 return ON_TEXT; |
432 | 766 } |
767 | |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
768 |
432 | 769 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
|
770 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
|
771 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
|
772 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
|
773 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
|
774 \(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
|
775 frame. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
776 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
|
777 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
|
778 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
|
779 If they are in the top mode line of WINDOW, `header-line' is returned. |
41127 | 780 If they are in the left fringe of WINDOW, `left-fringe' is returned. |
781 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
|
782 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
|
783 `vertical-line' is returned. |
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
784 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
|
785 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
|
786 (coordinates, window) |
432 | 787 register Lisp_Object coordinates, window; |
788 { | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
789 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
790 struct frame *f; |
432 | 791 int x, y; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
792 Lisp_Object lx, ly; |
432 | 793 |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
794 CHECK_WINDOW (window); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
795 w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
796 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
|
797 CHECK_CONS (coordinates); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
798 lx = Fcar (coordinates); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
799 ly = Fcdr (coordinates); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
800 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
|
801 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
|
802 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
|
803 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
|
804 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
805 switch (coordinates_in_window (w, &x, &y)) |
432 | 806 { |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
807 case ON_NOTHING: |
432 | 808 return Qnil; |
809 | |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
810 case ON_TEXT: |
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
811 /* 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
|
812 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
|
813 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
|
814 FRAME_CANON_Y_FROM_PIXEL_Y (f, y)); |
432 | 815 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
816 case ON_MODE_LINE: |
432 | 817 return Qmode_line; |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
818 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
819 case ON_VERTICAL_BORDER: |
732 | 820 return Qvertical_line; |
432 | 821 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
822 case ON_HEADER_LINE: |
25546 | 823 return Qheader_line; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
824 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
825 case ON_LEFT_FRINGE: |
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
826 return Qleft_fringe; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
827 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
828 case ON_RIGHT_FRINGE: |
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
829 return Qright_fringe; |
25315
79bb4978ab2e
(Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents:
25300
diff
changeset
|
830 |
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
831 case ON_LEFT_MARGIN: |
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
832 return Qleft_margin; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
833 |
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
834 case ON_RIGHT_MARGIN: |
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
835 return Qright_margin; |
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
836 |
56542
6d2d9477f39e
(coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents:
56540
diff
changeset
|
837 case ON_SCROLL_BAR: |
6d2d9477f39e
(coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents:
56540
diff
changeset
|
838 /* 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
|
839 return Qnil; |
6d2d9477f39e
(coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents:
56540
diff
changeset
|
840 |
432 | 841 default: |
842 abort (); | |
843 } | |
844 } | |
845 | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
846 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
847 /* 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
|
848 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
|
849 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
|
850 |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
851 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
|
852 does, return W in *CW->window, as Lisp_Object, and return in |
30777 | 853 *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
|
854 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
|
855 |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
856 struct check_window_data |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
857 { |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
858 Lisp_Object *window; |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
859 int *x, *y; |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
860 enum window_part *part; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
861 }; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
862 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
863 static int |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
864 check_window_containing (w, user_data) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
865 struct window *w; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
866 void *user_data; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
867 { |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
868 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
|
869 enum window_part found; |
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
870 int continue_p = 1; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
871 |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
872 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
|
873 if (found != ON_NOTHING) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
874 { |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
875 *cw->part = found; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
876 XSETWINDOW (*cw->window, w); |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
877 continue_p = 0; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
878 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
879 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
880 return continue_p; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
881 } |
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 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
884 /* 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
|
885 return it as a Lisp_Object. |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
886 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
887 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
|
888 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
|
889 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
|
890 |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
891 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
|
892 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
|
893 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
894 This function was previously implemented with a loop cycling over |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
895 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
|
896 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
|
897 implementation of next_window using Vwindow_list, because |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
898 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
|
899 tree of F when this function is called asynchronously from |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
900 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
|
901 case. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
902 |
265 | 903 Lisp_Object |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
904 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
|
905 struct frame *f; |
265 | 906 int x, y; |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
907 enum window_part *part; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
908 int *wx, *wy; |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25540
diff
changeset
|
909 int tool_bar_p; |
265 | 910 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
911 Lisp_Object window; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
912 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
|
913 enum window_part dummy; |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
914 |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
915 if (part == 0) |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
916 part = &dummy; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
917 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
918 window = Qnil; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
919 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
|
920 foreach_window (f, check_window_containing, &cw); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
921 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
922 /* 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
|
923 bar exists. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
924 if (NILP (window) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
925 && tool_bar_p |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
926 && WINDOWP (f->tool_bar_window) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
927 && 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
|
928 && (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
|
929 != ON_NOTHING)) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
930 { |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
931 *part = ON_TEXT; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
932 window = f->tool_bar_window; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
933 } |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
934 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
935 if (wx) *wx = x; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
936 if (wy) *wy = y; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
937 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
938 return window; |
265 | 939 } |
940 | |
681
026f978690be
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
555
diff
changeset
|
941 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
|
942 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
|
943 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
|
944 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
|
945 column 0. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
946 (x, y, frame) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
947 Lisp_Object x, y, frame; |
265 | 948 { |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
949 struct frame *f; |
265 | 950 |
769 | 951 if (NILP (frame)) |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
952 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
953 CHECK_LIVE_FRAME (frame); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
954 f = XFRAME (frame); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
955 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
956 /* 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
|
957 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
|
958 CHECK_NUMBER_OR_FLOAT (y); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
959 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
960 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
|
961 (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
|
962 + 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
|
963 (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
|
964 + FRAME_INTERNAL_BORDER_WIDTH (f)), |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
965 0, 0, 0, 0); |
265 | 966 } |
967 | |
968 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
|
969 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
|
970 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
|
971 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
|
972 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
973 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
|
974 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
|
975 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
|
976 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
|
977 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
|
978 (window) |
265 | 979 Lisp_Object window; |
980 { | |
981 register struct window *w = decode_window (window); | |
982 | |
983 if (w == XWINDOW (selected_window) | |
984 && current_buffer == XBUFFER (w->buffer)) | |
985 return Fpoint (); | |
986 return Fmarker_position (w->pointm); | |
987 } | |
988 | |
989 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
|
990 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
|
991 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
|
992 (window) |
265 | 993 Lisp_Object window; |
994 { | |
995 return Fmarker_position (decode_window (window)->start); | |
996 } | |
997 | |
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
998 /* 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
|
999 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1000 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
|
1001 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
|
1002 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
|
1003 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
|
1004 (save-excursion |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1005 (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
|
1006 (vertical-motion (1- (window-height window)) window) |
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
1007 (point))") */ |
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
1008 |
21198
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
1009 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
|
1010 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
|
1011 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
|
1012 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
|
1013 does not update this value. |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
1014 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
|
1015 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
|
1016 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
|
1017 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
|
1018 (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
|
1019 Lisp_Object window, update; |
265 | 1020 { |
1021 Lisp_Object value; | |
1022 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
|
1023 Lisp_Object buf; |
990f6ee7f527
(Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents:
4145
diff
changeset
|
1024 |
990f6ee7f527
(Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents:
4145
diff
changeset
|
1025 buf = w->buffer; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1026 CHECK_BUFFER (buf); |
4292
990f6ee7f527
(Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents:
4145
diff
changeset
|
1027 |
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
1028 #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
|
1029 /* 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
|
1030 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
|
1031 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
|
1032 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
|
1033 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
|
1034 return Qnil; |
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
1035 #endif |
8492
865daa7a9faf
(Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
8486
diff
changeset
|
1036 |
21198
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
1037 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
|
1038 && ! (! NILP (w->window_end_valid) |
65950
543b18532c51
(Fwindow_end): Don't try to redisplay if non-interactive.
Romain Francoise <romain@orebokech.com>
parents:
65908
diff
changeset
|
1039 && XFASTINT (w->last_modified) >= MODIFF) |
543b18532c51
(Fwindow_end): Don't try to redisplay if non-interactive.
Romain Francoise <romain@orebokech.com>
parents:
65908
diff
changeset
|
1040 && !noninteractive) |
21198
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
1041 { |
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1042 struct text_pos startp; |
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1043 struct it it; |
36231
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1044 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
|
1045 |
af8d605cbcf1
(Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
1046 /* 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
|
1047 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
|
1048 `-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
|
1049 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
|
1050 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
|
1051 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
|
1052 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
|
1053 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
|
1054 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
|
1055 else |
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1056 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
|
1057 |
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1058 /* 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
|
1059 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
|
1060 if (b != current_buffer) |
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1061 { |
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1062 old_buffer = current_buffer; |
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1063 set_buffer_internal (b); |
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1064 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1065 |
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1066 start_display (&it, w, startp); |
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1067 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
|
1068 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
|
1069 move_it_past_eol (&it); |
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1070 value = make_number (IT_CHARPOS (it)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1071 |
36231
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1072 if (old_buffer) |
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1073 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
|
1074 } |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
1075 else |
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1076 XSETINT (value, BUF_Z (XBUFFER (buf)) - XFASTINT (w->window_end_pos)); |
265 | 1077 |
1078 return value; | |
1079 } | |
1080 | |
1081 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
|
1082 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
|
1083 Return POS. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1084 (window, pos) |
265 | 1085 Lisp_Object window, pos; |
1086 { | |
1087 register struct window *w = decode_window (window); | |
1088 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1089 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
|
1090 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
|
1091 && XBUFFER (w->buffer) == current_buffer) |
265 | 1092 Fgoto_char (pos); |
1093 else | |
1094 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
|
1095 |
34615
a8944d7e6773
(Fset_window_point): Remove test for
Gerd Moellmann <gerd@gnu.org>
parents:
34499
diff
changeset
|
1096 /* 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
|
1097 the new value of point. */ |
a8944d7e6773
(Fset_window_point): Remove test for
Gerd Moellmann <gerd@gnu.org>
parents:
34499
diff
changeset
|
1098 if (!EQ (window, selected_window)) |
34491
f9d400d4653a
(Fset_window_point): If displaying cursors in windows
Gerd Moellmann <gerd@gnu.org>
parents:
34417
diff
changeset
|
1099 ++windows_or_buffers_changed; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1100 |
265 | 1101 return pos; |
1102 } | |
1103 | |
1104 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
|
1105 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
|
1106 Return POS. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1107 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
|
1108 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
|
1109 (window, pos, noforce) |
265 | 1110 Lisp_Object window, pos, noforce; |
1111 { | |
1112 register struct window *w = decode_window (window); | |
1113 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1114 CHECK_NUMBER_COERCE_MARKER (pos); |
265 | 1115 set_marker_restricted (w->start, pos, w->buffer); |
1116 /* this is not right, but much easier than doing what is right. */ | |
1117 w->start_at_line_beg = Qnil; | |
485 | 1118 if (NILP (noforce)) |
265 | 1119 w->force_start = Qt; |
1120 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
|
1121 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
|
1122 XSETFASTINT (w->last_overlay_modified, 0); |
338 | 1123 if (!EQ (window, selected_window)) |
1124 windows_or_buffers_changed++; | |
25387
df0083768b79
(Fset_window_point): Reset Vresize_mini_config.
Gerd Moellmann <gerd@gnu.org>
parents:
25375
diff
changeset
|
1125 |
265 | 1126 return pos; |
1127 } | |
1128 | |
1129 DEFUN ("window-dedicated-p", Fwindow_dedicated_p, Swindow_dedicated_p, | |
1130 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
|
1131 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
|
1132 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
|
1133 (window) |
265 | 1134 Lisp_Object window; |
1135 { | |
1136 return decode_window (window)->dedicated; | |
1137 } | |
1138 | |
722
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
1139 DEFUN ("set-window-dedicated-p", Fset_window_dedicated_p, |
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
1140 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
|
1141 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
|
1142 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
|
1143 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
|
1144 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
|
1145 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
|
1146 (window, arg) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1147 Lisp_Object window, arg; |
265 | 1148 { |
1149 register struct window *w = decode_window (window); | |
1150 | |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
1151 w->dedicated = arg; |
265 | 1152 |
1153 return w->dedicated; | |
1154 } | |
1155 | |
1156 DEFUN ("window-display-table", Fwindow_display_table, Swindow_display_table, | |
1157 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
|
1158 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
|
1159 (window) |
265 | 1160 Lisp_Object window; |
1161 { | |
1162 return decode_window (window)->display_table; | |
1163 } | |
1164 | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1165 /* 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
|
1166 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
|
1167 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
|
1168 return 0. */ |
265 | 1169 |
13187
1a4cee562d33
(window_display_table): Use DISP_TABLE_P. Return type
Richard M. Stallman <rms@gnu.org>
parents:
13126
diff
changeset
|
1170 struct Lisp_Char_Table * |
265 | 1171 window_display_table (w) |
1172 struct window *w; | |
1173 { | |
30446
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1174 struct Lisp_Char_Table *dp = NULL; |
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 if (DISP_TABLE_P (w->display_table)) |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1177 dp = XCHAR_TABLE (w->display_table); |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1178 else if (BUFFERP (w->buffer)) |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1179 { |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1180 struct buffer *b = XBUFFER (w->buffer); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1181 |
30446
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1182 if (DISP_TABLE_P (b->display_table)) |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1183 dp = XCHAR_TABLE (b->display_table); |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1184 else if (DISP_TABLE_P (Vstandard_display_table)) |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1185 dp = XCHAR_TABLE (Vstandard_display_table); |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1186 } |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1187 |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1188 return dp; |
265 | 1189 } |
1190 | |
555 | 1191 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
|
1192 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
|
1193 (window, table) |
265 | 1194 register Lisp_Object window, table; |
1195 { | |
1196 register struct window *w; | |
1197 | |
1198 w = decode_window (window); | |
1199 w->display_table = table; | |
1200 return table; | |
1201 } | |
1202 | |
1203 /* Record info on buffer window w is displaying | |
1204 when it is about to cease to display that buffer. */ | |
21514 | 1205 static void |
265 | 1206 unshow_buffer (w) |
1207 register struct window *w; | |
1208 { | |
6517
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1209 Lisp_Object buf; |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1210 struct buffer *b; |
6517
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1211 |
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1212 buf = w->buffer; |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1213 b = XBUFFER (buf); |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1214 if (b != XMARKER (w->pointm)->buffer) |
265 | 1215 abort (); |
1216 | |
5990
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
1217 #if 0 |
265 | 1218 if (w == XWINDOW (selected_window) |
1219 || ! EQ (buf, XWINDOW (selected_window)->buffer)) | |
1220 /* Do this except when the selected window's buffer | |
1221 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
|
1222 #endif |
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
1223 /* 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
|
1224 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
|
1225 Now that this statement is unconditional, |
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
1226 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
|
1227 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
|
1228 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
|
1229 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
|
1230 b->last_window_start = marker_position (w->start); |
265 | 1231 |
1232 /* Point in the selected window's buffer | |
1233 is actually stored in that buffer, and the window's pointm isn't used. | |
1234 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
|
1235 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
|
1236 /* 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
|
1237 && !(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
|
1238 && 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
|
1239 && 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
|
1240 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
|
1241 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
|
1242 XMARKER (w->pointm)->charpos, |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1243 BUF_ZV (b)), |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1244 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
|
1245 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
|
1246 BUF_ZV_BYTE (b))); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1247 |
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28104
diff
changeset
|
1248 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
|
1249 && 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
|
1250 b->last_selected_window = Qnil; |
265 | 1251 } |
1252 | |
1253 /* Put replacement into the window structure in place of old. */ | |
21514 | 1254 static void |
265 | 1255 replace_window (old, replacement) |
1256 Lisp_Object old, replacement; | |
1257 { | |
1258 register Lisp_Object tem; | |
1259 register struct window *o = XWINDOW (old), *p = XWINDOW (replacement); | |
1260 | |
769 | 1261 /* If OLD is its frame's root_window, then replacement is the new |
1262 root_window for that frame. */ | |
265 | 1263 |
1525
f79a22ad87d0
* window.c (Fwindow_width, Fset_window_hscroll): Use accessors on
Jim Blandy <jimb@redhat.com>
parents:
1444
diff
changeset
|
1264 if (EQ (old, FRAME_ROOT_WINDOW (XFRAME (o->frame)))) |
769 | 1265 FRAME_ROOT_WINDOW (XFRAME (o->frame)) = replacement; |
265 | 1266 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1267 p->left_col = o->left_col; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1268 p->top_line = o->top_line; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1269 p->total_cols = o->total_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1270 p->total_lines = o->total_lines; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1271 p->desired_matrix = p->current_matrix = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1272 p->vscroll = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1273 bzero (&p->cursor, sizeof (p->cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1274 bzero (&p->last_cursor, sizeof (p->last_cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1275 bzero (&p->phys_cursor, sizeof (p->phys_cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1276 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
|
1277 p->phys_cursor_width = -1; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1278 p->must_be_updated_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1279 p->pseudo_window_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1280 XSETFASTINT (p->window_end_vpos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1281 XSETFASTINT (p->window_end_pos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1282 p->window_end_valid = Qnil; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
1283 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
|
1284 p->orig_top_line = p->orig_total_lines = Qnil; |
265 | 1285 |
1286 p->next = tem = o->next; | |
485 | 1287 if (!NILP (tem)) |
265 | 1288 XWINDOW (tem)->prev = replacement; |
1289 | |
1290 p->prev = tem = o->prev; | |
485 | 1291 if (!NILP (tem)) |
265 | 1292 XWINDOW (tem)->next = replacement; |
1293 | |
1294 p->parent = tem = o->parent; | |
485 | 1295 if (!NILP (tem)) |
265 | 1296 { |
1297 if (EQ (XWINDOW (tem)->vchild, old)) | |
1298 XWINDOW (tem)->vchild = replacement; | |
1299 if (EQ (XWINDOW (tem)->hchild, old)) | |
1300 XWINDOW (tem)->hchild = replacement; | |
1301 } | |
1302 | |
1303 /*** Here, if replacement is a vertical combination | |
1304 and so is its new parent, we should make replacement's | |
1305 children be children of that parent instead. ***/ | |
1306 } | |
1307 | |
1308 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
|
1309 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
|
1310 (window) |
265 | 1311 register Lisp_Object window; |
1312 { | |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1313 delete_window (window); |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1314 |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1315 if (! NILP (Vwindow_configuration_change_hook) |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1316 && ! NILP (Vrun_hooks)) |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1317 call1 (Vrun_hooks, Qwindow_configuration_change_hook); |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1318 |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1319 return Qnil; |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1320 } |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1321 |
20351 | 1322 void |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1323 delete_window (window) |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1324 register Lisp_Object window; |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1325 { |
265 | 1326 register Lisp_Object tem, parent, sib; |
1327 register struct window *p; | |
1328 register struct window *par; | |
34819
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1329 struct frame *f; |
265 | 1330 |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1331 /* 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
|
1332 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
|
1333 so we can't decode_window here. */ |
485 | 1334 if (NILP (window)) |
265 | 1335 window = selected_window; |
1336 else | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1337 CHECK_WINDOW (window); |
265 | 1338 p = XWINDOW (window); |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1339 |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
1340 /* It's a no-op to delete an already-deleted window. */ |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1341 if (NILP (p->buffer) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1342 && NILP (p->hchild) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1343 && NILP (p->vchild)) |
17365
fc2ec9ced22f
(delete_window): Don't return value from void function.
Karl Heuer <kwzh@gnu.org>
parents:
17281
diff
changeset
|
1344 return; |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1345 |
265 | 1346 parent = p->parent; |
485 | 1347 if (NILP (parent)) |
265 | 1348 error ("Attempt to delete minibuffer or sole ordinary window"); |
1349 par = XWINDOW (parent); | |
1350 | |
1351 windows_or_buffers_changed++; | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1352 Vwindow_list = Qnil; |
34819
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1353 f = XFRAME (WINDOW_FRAME (p)); |
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1354 FRAME_WINDOW_SIZES_CHANGED (f) = 1; |
265 | 1355 |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1356 /* 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
|
1357 { |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1358 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
|
1359 |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
1360 /* 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
|
1361 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
|
1362 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
|
1363 swindow = FRAME_SELECTED_WINDOW (f); |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1364 |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1365 while (1) |
3723
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
1366 { |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1367 pwindow = swindow; |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1368 while (!NILP (pwindow)) |
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 (EQ (window, pwindow)) |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1371 break; |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1372 pwindow = XWINDOW (pwindow)->parent; |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1373 } |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1374 |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1375 /* If 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
|
1376 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
|
1377 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
|
1378 break; |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1379 /* 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
|
1380 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
|
1381 |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1382 /* 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
|
1383 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
|
1384 so we cannot delete. */ |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1385 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
|
1386 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
|
1387 } |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
1388 |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1389 /* 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
|
1390 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
|
1391 { |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1392 /* 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
|
1393 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
|
1394 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
|
1395 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
|
1396 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
|
1397 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
|
1398 Fselect_window (swindow, Qnil); |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1399 else |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1400 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
|
1401 } |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1402 } |
265 | 1403 |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
1404 /* Now we know we can delete this one. */ |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
1405 window_deletion_count++; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
1406 |
265 | 1407 tem = p->buffer; |
1408 /* tem is null for dummy parent windows | |
1409 (which have inferiors but not any contents themselves) */ | |
485 | 1410 if (!NILP (tem)) |
265 | 1411 { |
1412 unshow_buffer (p); | |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
1413 unchain_marker (XMARKER (p->pointm)); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
1414 unchain_marker (XMARKER (p->start)); |
265 | 1415 } |
1416 | |
26761
c15c2756ec0f
(delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents:
26635
diff
changeset
|
1417 /* 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
|
1418 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
|
1419 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
|
1420 processed while we are changing them. */ |
c15c2756ec0f
(delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents:
26635
diff
changeset
|
1421 BLOCK_INPUT; |
34819
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1422 free_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f))); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1423 |
265 | 1424 tem = p->next; |
485 | 1425 if (!NILP (tem)) |
265 | 1426 XWINDOW (tem)->prev = p->prev; |
1427 | |
1428 tem = p->prev; | |
485 | 1429 if (!NILP (tem)) |
265 | 1430 XWINDOW (tem)->next = p->next; |
1431 | |
1432 if (EQ (window, par->hchild)) | |
1433 par->hchild = p->next; | |
1434 if (EQ (window, par->vchild)) | |
1435 par->vchild = p->next; | |
1436 | |
1437 /* Find one of our siblings to give our space to. */ | |
1438 sib = p->prev; | |
485 | 1439 if (NILP (sib)) |
265 | 1440 { |
1441 /* If p gives its space to its next sibling, that sibling needs | |
1442 to have its top/left side pulled back to where p's is. | |
1443 set_window_{height,width} will re-position the sibling's | |
1444 children. */ | |
1445 sib = p->next; | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1446 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
|
1447 XWINDOW (sib)->left_col = p->left_col; |
265 | 1448 } |
1449 | |
1450 /* Stretch that sibling. */ | |
485 | 1451 if (!NILP (par->vchild)) |
265 | 1452 set_window_height (sib, |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1453 XFASTINT (XWINDOW (sib)->total_lines) + XFASTINT (p->total_lines), |
265 | 1454 1); |
485 | 1455 if (!NILP (par->hchild)) |
265 | 1456 set_window_width (sib, |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1457 XFASTINT (XWINDOW (sib)->total_cols) + XFASTINT (p->total_cols), |
265 | 1458 1); |
1459 | |
1460 /* If parent now has only one child, | |
1461 put the child into the parent's place. */ | |
1462 tem = par->hchild; | |
485 | 1463 if (NILP (tem)) |
265 | 1464 tem = par->vchild; |
63045
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1465 if (NILP (XWINDOW (tem)->next)) { |
265 | 1466 replace_window (parent, tem); |
63045
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1467 par = XWINDOW (tem); |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1468 } |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1469 |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1470 /* 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
|
1471 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
|
1472 if (! NILP (p->hchild)) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1473 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
|
1474 else if (! NILP (p->vchild)) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1475 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
|
1476 |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1477 /* Mark this window as deleted. */ |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1478 p->buffer = p->hchild = p->vchild = Qnil; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1479 |
63045
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1480 if (! NILP (par->parent)) |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1481 par = XWINDOW (par->parent); |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1482 |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1483 /* Check if we have a v/hchild with a v/hchild. In that case remove |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1484 one of them. */ |
64133
7e06f331c228
(Frecenter): Fix last change (set iarg before use).
Kim F. Storm <storm@cua.dk>
parents:
64114
diff
changeset
|
1485 |
63045
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1486 if (! NILP (par->vchild) && ! NILP (XWINDOW (par->vchild)->vchild)) |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1487 { |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1488 p = XWINDOW (par->vchild); |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1489 par->vchild = p->vchild; |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1490 tem = p->vchild; |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1491 } |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1492 else if (! NILP (par->hchild) && ! NILP (XWINDOW (par->hchild)->hchild)) |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1493 { |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1494 p = XWINDOW (par->hchild); |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1495 par->hchild = p->hchild; |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1496 tem = p->hchild; |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1497 } |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1498 else |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1499 p = 0; |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1500 |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1501 if (p) |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1502 { |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1503 while (! NILP (tem)) { |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1504 XWINDOW (tem)->parent = p->parent; |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1505 if (NILP (XWINDOW (tem)->next)) |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1506 break; |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1507 tem = XWINDOW (tem)->next; |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1508 } |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1509 if (! NILP (tem)) { |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1510 /* The next of the v/hchild we are removing is now the next of the |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1511 last child for the v/hchild: |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1512 Before v/hchild -> v/hchild -> next1 -> next2 |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1513 | |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1514 -> next3 |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1515 After: v/hchild -> next1 -> next2 -> next3 |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1516 */ |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1517 XWINDOW (tem)->next = p->next; |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1518 if (! NILP (p->next)) |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1519 XWINDOW (p->next)->prev = tem; |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1520 } |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1521 p->next = p->prev = p->vchild = p->hchild = p->buffer = Qnil; |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1522 } |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1523 |
872de430453e
* window.c (delete_window): Handle the case where a h/vchild has
Jan Djärv <jan.h.d@swipnet.se>
parents:
62544
diff
changeset
|
1524 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1525 /* Adjust glyph matrices. */ |
34819
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1526 adjust_glyphs (f); |
26761
c15c2756ec0f
(delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents:
26635
diff
changeset
|
1527 UNBLOCK_INPUT; |
265 | 1528 } |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1529 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1530 |
265 | 1531 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1532 /*********************************************************************** |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1533 Window List |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1534 ***********************************************************************/ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1535 |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1536 /* 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
|
1537 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
|
1538 function window_list. */ |
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 static int |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1541 add_window_to_list (w, user_data) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1542 struct window *w; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1543 void *user_data; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1544 { |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1545 Lisp_Object *list = (Lisp_Object *) user_data; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1546 Lisp_Object window; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1547 XSETWINDOW (window, w); |
30039
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1548 *list = Fcons (window, *list); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1549 return 1; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1550 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1551 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1552 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1553 /* 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
|
1554 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
|
1555 list, cache it in Vwindow_list, and return that. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1556 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1557 static Lisp_Object |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1558 window_list () |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1559 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1560 if (!CONSP (Vwindow_list)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1561 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1562 Lisp_Object tail; |
30039
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1563 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1564 Vwindow_list = Qnil; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1565 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
|
1566 { |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1567 Lisp_Object args[2]; |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1568 |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1569 /* 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
|
1570 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
|
1571 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
|
1572 args[1] = Qnil; |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1573 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
|
1574 args[0] = Vwindow_list; |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1575 args[1] = Fnreverse (args[1]); |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1576 Vwindow_list = Fnconc (2, args); |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1577 } |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1578 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1579 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1580 return Vwindow_list; |
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 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1583 |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1584 /* 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
|
1585 OWINDOW, MINIBUF and ALL_FRAMES. |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1586 |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1587 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
|
1588 `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
|
1589 a window means a specific minibuffer window |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1590 |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1591 ALL_FRAMES t means search all frames, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1592 nil means search just current frame, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1593 `visible' means search just visible frames, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1594 0 means search visible and iconified frames, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1595 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
|
1596 a frame means consider windows on that frame, only. */ |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1597 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1598 static int |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1599 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
|
1600 Lisp_Object window, owindow, minibuf, all_frames; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1601 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1602 struct window *w = XWINDOW (window); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1603 struct frame *f = XFRAME (w->frame); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1604 int candidate_p = 1; |
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 if (!BUFFERP (w->buffer)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1607 candidate_p = 0; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1608 else if (MINI_WINDOW_P (w) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1609 && (EQ (minibuf, Qlambda) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1610 || (WINDOWP (minibuf) && !EQ (minibuf, window)))) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1611 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1612 /* If MINIBUF is `lambda' don't consider any mini-windows. |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1613 If it is a window, consider only that one. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1614 candidate_p = 0; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1615 } |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1616 else if (EQ (all_frames, Qt)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1617 candidate_p = 1; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1618 else if (NILP (all_frames)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1619 { |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1620 xassert (WINDOWP (owindow)); |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1621 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
|
1622 } |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1623 else if (EQ (all_frames, Qvisible)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1624 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1625 FRAME_SAMPLE_VISIBILITY (f); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1626 candidate_p = FRAME_VISIBLE_P (f); |
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 else if (INTEGERP (all_frames) && XINT (all_frames) == 0) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1629 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1630 FRAME_SAMPLE_VISIBILITY (f); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1631 candidate_p = FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f); |
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 else if (WINDOWP (all_frames)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1634 candidate_p = (EQ (FRAME_MINIBUF_WINDOW (f), all_frames) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1635 || EQ (XWINDOW (all_frames)->frame, w->frame) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1636 || 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
|
1637 else if (FRAMEP (all_frames)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1638 candidate_p = EQ (all_frames, w->frame); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1639 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1640 return candidate_p; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1641 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1642 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1643 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1644 /* Decode arguments as allowed by Fnext_window, Fprevious_window, and |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1645 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
|
1646 ALL_FRAMES. */ |
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 static void |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1649 decode_next_window_args (window, minibuf, all_frames) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1650 Lisp_Object *window, *minibuf, *all_frames; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1651 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1652 if (NILP (*window)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1653 *window = selected_window; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1654 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1655 CHECK_LIVE_WINDOW (*window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1656 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1657 /* 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
|
1658 does. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1659 if (NILP (*minibuf)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1660 *minibuf = minibuf_level ? minibuf_window : Qlambda; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1661 else if (!EQ (*minibuf, Qt)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1662 *minibuf = Qlambda; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1663 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1664 /* Now *MINIBUF can be t => count all minibuffer windows, `lambda' |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1665 => count none of them, or a specific minibuffer window (the |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1666 active one) to count. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1667 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1668 /* ALL_FRAMES nil doesn't specify which frames to include. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1669 if (NILP (*all_frames)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1670 *all_frames = (!EQ (*minibuf, Qlambda) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1671 ? FRAME_MINIBUF_WINDOW (XFRAME (XWINDOW (*window)->frame)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1672 : Qnil); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1673 else if (EQ (*all_frames, Qvisible)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1674 ; |
58448
f3a76c43ac80
(Fset_window_scroll_bars): Don't use XINT if it isn't int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58441
diff
changeset
|
1675 else if (EQ (*all_frames, make_number (0))) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1676 ; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1677 else if (FRAMEP (*all_frames)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1678 ; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1679 else if (!EQ (*all_frames, Qt)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1680 *all_frames = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1681 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1682 /* 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
|
1683 search just current frame, `visible' meaning search just visible |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1684 frames, 0 meaning search visible and iconified frames, or a |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1685 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
|
1686 frame, meaning consider windows on that frame, only. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1687 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1688 |
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 /* 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
|
1691 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
|
1692 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
|
1693 ALL_FRAMES. */ |
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 static Lisp_Object |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1696 next_window (window, minibuf, all_frames, next_p) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1697 Lisp_Object window, minibuf, all_frames; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1698 int next_p; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1699 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1700 decode_next_window_args (&window, &minibuf, &all_frames); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1701 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1702 /* 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
|
1703 return the first window on the frame. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1704 if (FRAMEP (all_frames) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1705 && !EQ (all_frames, XWINDOW (window)->frame)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1706 return Fframe_first_window (all_frames); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1707 |
30039
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1708 if (next_p) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1709 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1710 Lisp_Object list; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1711 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1712 /* Find WINDOW in the list of all windows. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1713 list = Fmemq (window, window_list ()); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1714 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1715 /* 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
|
1716 if (CONSP (list)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1717 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
|
1718 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
|
1719 break; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1720 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1721 /* 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
|
1722 if (!CONSP (list)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1723 for (list = Vwindow_list; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1724 CONSP (list) && !EQ (XCAR (list), window); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1725 list = XCDR (list)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1726 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
|
1727 break; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1728 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1729 if (CONSP (list)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1730 window = XCAR (list); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1731 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1732 else |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1733 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1734 Lisp_Object candidate, list; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1735 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1736 /* 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
|
1737 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
|
1738 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
|
1739 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
|
1740 candidate = Qnil; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1741 for (list = window_list (); CONSP (list); list = XCDR (list)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1742 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1743 if (EQ (XCAR (list), window)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1744 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1745 if (WINDOWP (candidate)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1746 break; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1747 } |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1748 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
|
1749 all_frames)) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1750 candidate = XCAR (list); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1751 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1752 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1753 if (WINDOWP (candidate)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1754 window = candidate; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1755 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1756 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1757 return window; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1758 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1759 |
432 | 1760 |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1761 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
|
1762 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
|
1763 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
|
1764 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1765 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
|
1766 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
|
1767 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
|
1768 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
|
1769 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1770 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
|
1771 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
|
1772 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
|
1773 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
|
1774 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
|
1775 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1776 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
|
1777 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
|
1778 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
|
1779 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
|
1780 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
|
1781 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
|
1782 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1783 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
|
1784 `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
|
1785 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
|
1786 `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
|
1787 (window, minibuf, all_frames) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1788 Lisp_Object window, minibuf, all_frames; |
265 | 1789 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1790 return next_window (window, minibuf, all_frames, 1); |
265 | 1791 } |
1792 | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1793 |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1794 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
|
1795 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
|
1796 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
|
1797 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1798 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
|
1799 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
|
1800 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
|
1801 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
|
1802 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1803 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
|
1804 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
|
1805 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
|
1806 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
|
1807 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
|
1808 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1809 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
|
1810 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
|
1811 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
|
1812 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
|
1813 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
|
1814 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
|
1815 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1816 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
|
1817 `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
|
1818 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
|
1819 `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
|
1820 (window, minibuf, all_frames) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1821 Lisp_Object window, minibuf, all_frames; |
265 | 1822 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1823 return next_window (window, minibuf, all_frames, 0); |
265 | 1824 } |
1825 | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1826 |
338 | 1827 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
|
1828 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
|
1829 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
|
1830 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
|
1831 A negative ARG moves in the opposite order. The optional second |
68490
36ac94b7246c
(Fother_window, Fwindow_vscroll, Fset_window_vscroll): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
67328
diff
changeset
|
1832 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
|
1833 (arg, all_frames) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1834 Lisp_Object arg, all_frames; |
265 | 1835 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1836 Lisp_Object window; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1837 int i; |
265 | 1838 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1839 CHECK_NUMBER (arg); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1840 window = selected_window; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1841 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1842 for (i = XINT (arg); i > 0; --i) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1843 window = Fnext_window (window, Qnil, all_frames); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1844 for (; i < 0; ++i) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1845 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
|
1846 |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
1847 Fselect_window (window, Qnil); |
265 | 1848 return Qnil; |
1849 } | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1850 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1851 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1852 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
|
1853 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
|
1854 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
|
1855 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
|
1856 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
|
1857 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
|
1858 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
|
1859 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
|
1860 (frame, minibuf, window) |
33619
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1861 Lisp_Object frame, minibuf, window; |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1862 { |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1863 if (NILP (window)) |
69104
527507f1a62e
(Fwindow_list): Check `window' before doing XWINDOW.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68987
diff
changeset
|
1864 window = FRAMEP (frame) ? XFRAME (frame)->selected_window : selected_window; |
527507f1a62e
(Fwindow_list): Check `window' before doing XWINDOW.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68987
diff
changeset
|
1865 CHECK_WINDOW (window); |
33619
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1866 if (NILP (frame)) |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1867 frame = selected_frame; |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1868 |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1869 if (!EQ (frame, XWINDOW (window)->frame)) |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1870 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
|
1871 |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1872 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
|
1873 } |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1874 |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1875 |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1876 /* 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
|
1877 for `next-window'. */ |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1878 |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1879 static Lisp_Object |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1880 window_list_1 (window, minibuf, all_frames) |
30265
9b1c8eafe4dc
(Fwindow_list): Declare arg `window'.
Dave Love <fx@gnu.org>
parents:
30102
diff
changeset
|
1881 Lisp_Object window, minibuf, all_frames; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1882 { |
56456
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1883 Lisp_Object tail, list, rest; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1884 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1885 decode_next_window_args (&window, &minibuf, &all_frames); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1886 list = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1887 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1888 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
|
1889 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
|
1890 list = Fcons (XCAR (tail), list); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1891 |
56456
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1892 /* 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
|
1893 list = Fnreverse (list); |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1894 rest = Fmemq (window, list); |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1895 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
|
1896 { |
56616
76bd0e931318
(window_list_1): YAILOM.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56585
diff
changeset
|
1897 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
|
1898 ; |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1899 XSETCDR (tail, Qnil); |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1900 list = nconc2 (rest, list); |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1901 } |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
1902 return list; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1903 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1904 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1905 |
265 | 1906 |
1907 /* Look at all windows, performing an operation specified by TYPE | |
1908 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
|
1909 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
|
1910 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
|
1911 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
|
1912 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
|
1913 If MINI is non-zero, perform the operation on minibuffer windows too. */ |
265 | 1914 |
1915 enum window_loop | |
1916 { | |
1917 WINDOW_LOOP_UNUSED, | |
1918 GET_BUFFER_WINDOW, /* Arg is buffer */ | |
1919 GET_LRU_WINDOW, /* Arg is t for full-width windows only */ | |
1920 DELETE_OTHER_WINDOWS, /* Arg is window not to delete */ | |
1921 DELETE_BUFFER_WINDOWS, /* Arg is buffer */ | |
1922 GET_LARGEST_WINDOW, | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
1923 UNSHOW_BUFFER, /* Arg is buffer */ |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
1924 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
|
1925 CHECK_ALL_WINDOWS |
265 | 1926 }; |
1927 | |
1928 static Lisp_Object | |
769 | 1929 window_loop (type, obj, mini, frames) |
265 | 1930 enum window_loop type; |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1931 Lisp_Object obj, frames; |
265 | 1932 int mini; |
1933 { | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1934 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
|
1935 struct frame *f; |
30102
9406cb07bac7
(window_loop): Add missing gcpro1 local variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30093
diff
changeset
|
1936 struct gcpro gcpro1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1937 |
769 | 1938 /* If we're only looping through windows on a particular frame, |
1939 frame points to that frame. If we're looping through windows | |
1940 on all frames, frame is 0. */ | |
1941 if (FRAMEP (frames)) | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1942 f = XFRAME (frames); |
769 | 1943 else if (NILP (frames)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1944 f = SELECTED_FRAME (); |
265 | 1945 else |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1946 f = NULL; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1947 |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1948 if (f) |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1949 frame_arg = Qlambda; |
58448
f3a76c43ac80
(Fset_window_scroll_bars): Don't use XINT if it isn't int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58441
diff
changeset
|
1950 else if (EQ (frames, make_number (0))) |
8167
ae9b49cc645f
(Fnext_window, Fprevious_window): ALL_FRAMES = 0 means
Richard M. Stallman <rms@gnu.org>
parents:
8139
diff
changeset
|
1951 frame_arg = frames; |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1952 else if (EQ (frames, Qvisible)) |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1953 frame_arg = frames; |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1954 else |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1955 frame_arg = Qt; |
265 | 1956 |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1957 /* 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
|
1958 Qvisible to consider all visible frames, |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1959 or Qt otherwise. */ |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
1960 |
265 | 1961 /* 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
|
1962 if (WINDOWP (obj)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1963 window = obj; |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1964 else if (f) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1965 window = FRAME_SELECTED_WINDOW (f); |
265 | 1966 else |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1967 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
|
1968 |
33619
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
1969 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
|
1970 GCPRO1 (windows); |
265 | 1971 best_window = Qnil; |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1972 |
67234
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
1973 for (; CONSP (windows); windows = XCDR (windows)) |
265 | 1974 { |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1975 struct window *w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1976 |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1977 window = XCAR (windows); |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1978 w = XWINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1979 |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1980 /* 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
|
1981 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
|
1982 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
|
1983 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
|
1984 /* 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
|
1985 || type == UNSHOW_BUFFER |
265 | 1986 || (mini && minibuf_level > 0)) |
1987 switch (type) | |
1988 { | |
1989 case GET_BUFFER_WINDOW: | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1990 if (EQ (w->buffer, obj) |
16522
63ca7c6ceeff
(window_loop, case GET_BUFFER_WINDOW):
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
1991 /* Don't find any minibuffer window |
63ca7c6ceeff
(window_loop, case GET_BUFFER_WINDOW):
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
1992 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
|
1993 && (MINI_WINDOW_P (w) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1994 ? EQ (window, minibuf_window) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1995 : 1)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1996 { |
36068
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
1997 if (NILP (best_window)) |
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
1998 best_window = window; |
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
1999 else if (EQ (window, selected_window)) |
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
2000 /* 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
|
2001 selected-window. */ |
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
2002 best_window = window; |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2003 } |
265 | 2004 break; |
2005 | |
2006 case GET_LRU_WINDOW: | |
66711
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2007 /* `obj' is an integer encoding a bitvector. |
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2008 `obj & 1' means consider only full-width windows. |
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2009 `obj & 2' means consider also dedicated windows. */ |
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2010 if (((XINT (obj) & 1) && !WINDOW_FULL_WIDTH_P (w)) |
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2011 || (!(XINT (obj) & 2) && EQ (w->dedicated, Qt)) |
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2012 /* Minibuffer windows are always ignored. */ |
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2013 || MINI_WINDOW_P (w)) |
265 | 2014 break; |
485 | 2015 if (NILP (best_window) |
265 | 2016 || (XFASTINT (XWINDOW (best_window)->use_time) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2017 > XFASTINT (w->use_time))) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2018 best_window = window; |
265 | 2019 break; |
2020 | |
2021 case DELETE_OTHER_WINDOWS: | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2022 if (!EQ (window, obj)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2023 Fdelete_window (window); |
265 | 2024 break; |
2025 | |
2026 case DELETE_BUFFER_WINDOWS: | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2027 if (EQ (w->buffer, obj)) |
265 | 2028 { |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2029 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
|
2030 |
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
2031 /* 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
|
2032 kill the frame. */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2033 if (EQ (window, FRAME_ROOT_WINDOW (f)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2034 && !NILP (w->dedicated) |
10808
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
2035 && other_visible_frames (f)) |
265 | 2036 { |
10808
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
2037 /* 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
|
2038 There might be one, the minibuffer! */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2039 while (CONSP (XCDR (windows)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2040 && EQ (XWINDOW (XCAR (windows))->frame, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2041 XWINDOW (XCAR (XCDR (windows)))->frame)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2042 windows = XCDR (windows); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2043 |
10808
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
2044 /* 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
|
2045 Fdelete_frame (w->frame, Qnil); |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2046 } |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2047 else if (NILP (w->parent)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2048 { |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2049 /* 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
|
2050 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
|
2051 display there. */ |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2052 Lisp_Object buffer; |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2053 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
|
2054 Fset_window_buffer (window, buffer, Qnil); |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2055 if (EQ (window, selected_window)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2056 Fset_buffer (w->buffer); |
265 | 2057 } |
2058 else | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2059 Fdelete_window (window); |
265 | 2060 } |
2061 break; | |
2062 | |
2063 case GET_LARGEST_WINDOW: | |
66711
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2064 { /* nil `obj' means to ignore dedicated windows. */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2065 /* Ignore dedicated windows and minibuffers. */ |
66711
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2066 if (MINI_WINDOW_P (w) || (NILP (obj) && EQ (w->dedicated, Qt))) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2067 break; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2068 |
31393
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2069 if (NILP (best_window)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2070 best_window = window; |
31393
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2071 else |
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2072 { |
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2073 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
|
2074 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
|
2075 > 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
|
2076 best_window = window; |
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2077 } |
265 | 2078 } |
2079 break; | |
2080 | |
2081 case UNSHOW_BUFFER: | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2082 if (EQ (w->buffer, obj)) |
265 | 2083 { |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2084 Lisp_Object buffer; |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2085 struct frame *f = XFRAME (w->frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2086 |
265 | 2087 /* 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
|
2088 buffer = Fother_buffer (obj, Qnil, w->frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2089 |
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2090 /* 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
|
2091 kill the frame. */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2092 if (EQ (window, FRAME_ROOT_WINDOW (f)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2093 && !NILP (w->dedicated) |
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2094 && other_visible_frames (f)) |
8536
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2095 { |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2096 /* Skip the other windows on this frame. |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2097 There might be one, the minibuffer! */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2098 while (CONSP (XCDR (windows)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2099 && EQ (XWINDOW (XCAR (windows))->frame, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2100 XWINDOW (XCAR (XCDR (windows)))->frame)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2101 windows = XCDR (windows); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2102 |
8536
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2103 /* 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
|
2104 Fdelete_frame (w->frame, Qnil); |
8536
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2105 } |
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2106 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
|
2107 { |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2108 Lisp_Object window; |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2109 XSETWINDOW (window, w); |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2110 /* 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
|
2111 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
|
2112 Fdelete_window (window); |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2113 } |
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2114 else |
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2115 { |
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2116 /* 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
|
2117 w->dedicated = Qnil; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2118 Fset_window_buffer (window, buffer, Qnil); |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2119 if (EQ (window, selected_window)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2120 Fset_buffer (w->buffer); |
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2121 } |
265 | 2122 } |
2123 break; | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2124 |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2125 case REDISPLAY_BUFFER_WINDOWS: |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2126 if (EQ (w->buffer, obj)) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2127 { |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2128 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
|
2129 w->update_mode_line = Qt; |
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
2130 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
|
2131 ++update_mode_lines; |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2132 best_window = window; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2133 } |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2134 break; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2135 |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2136 /* 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
|
2137 case CHECK_ALL_WINDOWS: |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2138 if (! NILP (w->buffer) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2139 && NILP (XBUFFER (w->buffer)->name)) |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2140 abort (); |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2141 break; |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
2142 |
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
2143 case WINDOW_LOOP_UNUSED: |
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
2144 break; |
265 | 2145 } |
2146 } | |
2147 | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2148 UNGCPRO; |
265 | 2149 return best_window; |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
2150 } |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
2151 |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2152 /* 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
|
2153 |
25268 | 2154 void |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2155 check_all_windows () |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2156 { |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2157 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
|
2158 } |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2159 |
66598
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
2160 DEFUN ("get-lru-window", Fget_lru_window, Sget_lru_window, 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
|
2161 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
|
2162 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
|
2163 A minibuffer window is never a candidate. |
66598
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
2164 A dedicated window is never a candidate, unless DEDICATED is non-nil, |
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
2165 so if all windows are dedicated, the value is nil. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2166 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
|
2167 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
|
2168 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
|
2169 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
|
2170 If FRAME is a frame, search only that frame. */) |
66598
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
2171 (frame, dedicated) |
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
2172 Lisp_Object frame, dedicated; |
265 | 2173 { |
2174 register Lisp_Object w; | |
2175 /* First try for a window that is full-width */ | |
66711
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2176 w = window_loop (GET_LRU_WINDOW, |
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2177 NILP (dedicated) ? make_number (1) : make_number (3), |
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2178 0, frame); |
485 | 2179 if (!NILP (w) && !EQ (w, selected_window)) |
265 | 2180 return w; |
2181 /* If none of them, try the rest */ | |
66711
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2182 return window_loop (GET_LRU_WINDOW, |
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2183 NILP (dedicated) ? make_number (0) : make_number (2), |
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2184 0, frame); |
265 | 2185 } |
2186 | |
66598
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
2187 DEFUN ("get-largest-window", Fget_largest_window, Sget_largest_window, 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
|
2188 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
|
2189 A minibuffer window is never a candidate. |
66598
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
2190 A dedicated window is never a candidate unless DEDICATED is non-nil, |
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
2191 so if all windows are dedicated, the value is nil. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2192 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
|
2193 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
|
2194 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
|
2195 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
|
2196 If FRAME is a frame, search only that frame. */) |
66598
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
2197 (frame, dedicated) |
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
2198 Lisp_Object frame, dedicated; |
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
2199 { |
66711
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2200 return window_loop (GET_LARGEST_WINDOW, dedicated, 0, |
769 | 2201 frame); |
265 | 2202 } |
2203 | |
2204 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
|
2205 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
|
2206 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
|
2207 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
|
2208 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
|
2209 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
|
2210 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
|
2211 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
|
2212 (buffer, frame) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2213 Lisp_Object buffer, frame; |
265 | 2214 { |
2215 buffer = Fget_buffer (buffer); | |
9105
984a4b1be1d1
(Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents:
9028
diff
changeset
|
2216 if (BUFFERP (buffer)) |
769 | 2217 return window_loop (GET_BUFFER_WINDOW, buffer, 1, frame); |
265 | 2218 else |
2219 return Qnil; | |
2220 } | |
2221 | |
2222 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
|
2223 0, 1, "", |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2224 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
|
2225 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
|
2226 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
|
2227 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
|
2228 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
|
2229 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
|
2230 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
|
2231 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
|
2232 (window) |
265 | 2233 Lisp_Object window; |
2234 { | |
2235 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
|
2236 int startpos; |
35038
ac8eb6b4eee6
(Fdelete_other_windows): Set window's window_end_valid
Gerd Moellmann <gerd@gnu.org>
parents:
35024
diff
changeset
|
2237 int top, new_top; |
265 | 2238 |
485 | 2239 if (NILP (window)) |
265 | 2240 window = selected_window; |
2241 else | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
2242 CHECK_LIVE_WINDOW (window); |
265 | 2243 w = XWINDOW (window); |
9028
74119e5602eb
(Fdelete_other_windows): Nice error if WINDOW is minibuf.
Richard M. Stallman <rms@gnu.org>
parents:
8991
diff
changeset
|
2244 |
7348
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2245 startpos = marker_position (w->start); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2246 top = WINDOW_TOP_EDGE_LINE (w) - FRAME_TOP_MARGIN (XFRAME (WINDOW_FRAME (w))); |
265 | 2247 |
9028
74119e5602eb
(Fdelete_other_windows): Nice error if WINDOW is minibuf.
Richard M. Stallman <rms@gnu.org>
parents:
8991
diff
changeset
|
2248 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
|
2249 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
|
2250 |
2190
482c7827b968
(Fdelete_other_windows): Handle FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
2251 window_loop (DELETE_OTHER_WINDOWS, window, 0, WINDOW_FRAME (w)); |
265 | 2252 |
7348
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2253 /* 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
|
2254 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
|
2255 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
|
2256 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
|
2257 not current, due to typeahead). */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2258 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
|
2259 if (new_top != top |
ac8eb6b4eee6
(Fdelete_other_windows): Set window's window_end_valid
Gerd Moellmann <gerd@gnu.org>
parents:
35024
diff
changeset
|
2260 && 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
|
2261 && 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
|
2262 { |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2263 struct position pos; |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2264 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
|
2265 |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2266 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
|
2267 /* 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
|
2268 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
|
2269 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
|
2270 |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
2271 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
|
2272 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
|
2273 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
|
2274 || 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
|
2275 : Qnil); |
13198
43d90596da34
(Fdelete_other_windows): Set w->force_start.
Richard M. Stallman <rms@gnu.org>
parents:
13187
diff
changeset
|
2276 /* 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
|
2277 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
|
2278 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
|
2279 |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2280 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
|
2281 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2282 |
265 | 2283 return Qnil; |
2284 } | |
2285 | |
2286 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
|
2287 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
|
2288 doc: /* Delete all windows showing BUFFER. |
56393
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
2289 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
|
2290 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
|
2291 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
|
2292 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
|
2293 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
|
2294 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
|
2295 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
|
2296 (buffer, frame) |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
2297 Lisp_Object buffer, frame; |
265 | 2298 { |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
2299 /* 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
|
2300 expects. */ |
22223
5d15aed3a37c
(Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents:
22187
diff
changeset
|
2301 if (NILP (frame)) |
5d15aed3a37c
(Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents:
22187
diff
changeset
|
2302 frame = Qt; |
5d15aed3a37c
(Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents:
22187
diff
changeset
|
2303 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
|
2304 frame = Qnil; |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
2305 |
485 | 2306 if (!NILP (buffer)) |
265 | 2307 { |
2308 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
|
2309 CHECK_BUFFER (buffer); |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
2310 window_loop (DELETE_BUFFER_WINDOWS, buffer, 0, frame); |
265 | 2311 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2312 |
265 | 2313 return Qnil; |
2314 } | |
2315 | |
2316 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
|
2317 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
|
2318 1, 1, "bReplace buffer in windows: ", |
56393
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
2319 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
|
2320 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
|
2321 (buffer) |
265 | 2322 Lisp_Object buffer; |
2323 { | |
485 | 2324 if (!NILP (buffer)) |
265 | 2325 { |
2326 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
|
2327 CHECK_BUFFER (buffer); |
265 | 2328 window_loop (UNSHOW_BUFFER, buffer, 0, Qt); |
2329 } | |
2330 return Qnil; | |
2331 } | |
13918
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2332 |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2333 /* 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
|
2334 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
|
2335 |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2336 void |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2337 replace_buffer_in_all_windows (buffer) |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2338 Lisp_Object buffer; |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2339 { |
14204
c0b44d3a8312
(replace_buffer_in_all_windows): Don't change selected
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
2340 #ifdef MULTI_KBOARD |
13918
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2341 Lisp_Object tail, frame; |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2342 |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2343 /* 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
|
2344 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
|
2345 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
|
2346 FOR_EACH_FRAME (tail, frame) |
20066
affc9c857428
(replace_buffer_in_all_windows):
Karl Heuer <kwzh@gnu.org>
parents:
20046
diff
changeset
|
2347 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
|
2348 #else |
20066
affc9c857428
(replace_buffer_in_all_windows):
Karl Heuer <kwzh@gnu.org>
parents:
20046
diff
changeset
|
2349 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
|
2350 #endif |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2351 } |
265 | 2352 |
2353 /* 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
|
2354 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2355 /* 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
|
2356 might crash Emacs. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2357 |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2358 #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
|
2359 #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
|
2360 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2361 /* 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
|
2362 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
|
2363 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2364 static void |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2365 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
|
2366 { |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2367 /* 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
|
2368 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
|
2369 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
|
2370 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
|
2371 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
|
2372 } |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2373 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2374 /* 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
|
2375 minimum allowable size. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2376 |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
2377 void |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2378 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
|
2379 FRAME_PTR frame; |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
2380 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
|
2381 { |
4347
d6b289b1a6dc
* window.c (check_frame_size): Include the menu bar height in the
Jim Blandy <jimb@redhat.com>
parents:
4292
diff
changeset
|
2382 /* 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
|
2383 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
|
2384 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
|
2385 int min_height |
87fe94f01b8e
(check_frame_size): Fix minimum height calculation.
Richard M. Stallman <rms@gnu.org>
parents:
42862
diff
changeset
|
2386 = ((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
|
2387 ? MIN_SAFE_WINDOW_HEIGHT |
87fe94f01b8e
(check_frame_size): Fix minimum height calculation.
Richard M. Stallman <rms@gnu.org>
parents:
42862
diff
changeset
|
2388 : 2 * MIN_SAFE_WINDOW_HEIGHT); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2389 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2390 if (FRAME_TOP_MARGIN (frame) > 0) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2391 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
|
2392 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2393 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
|
2394 *rows = min_height; |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2395 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
|
2396 *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
|
2397 } |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2398 |
25254 | 2399 |
25268 | 2400 /* Value is non-zero if window W is fixed-size. WIDTH_P non-zero means |
2401 check if W's width can be changed, otherwise check W's height. | |
2402 CHECK_SIBLINGS_P non-zero means check resizablity of WINDOW's | |
2403 siblings, too. If none of the siblings is resizable, WINDOW isn't | |
2404 either. */ | |
2405 | |
2406 static int | |
2407 window_fixed_size_p (w, width_p, check_siblings_p) | |
2408 struct window *w; | |
2409 int width_p, check_siblings_p; | |
2410 { | |
2411 int fixed_p; | |
2412 struct window *c; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2413 |
25268 | 2414 if (!NILP (w->hchild)) |
2415 { | |
2416 c = XWINDOW (w->hchild); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2417 |
25268 | 2418 if (width_p) |
2419 { | |
2420 /* A horiz. combination is fixed-width if all of if its | |
2421 children are. */ | |
2422 while (c && window_fixed_size_p (c, width_p, 0)) | |
2423 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2424 fixed_p = c == NULL; | |
2425 } | |
2426 else | |
2427 { | |
2428 /* A horiz. combination is fixed-height if one of if its | |
2429 children is. */ | |
2430 while (c && !window_fixed_size_p (c, width_p, 0)) | |
2431 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2432 fixed_p = c != NULL; | |
2433 } | |
2434 } | |
2435 else if (!NILP (w->vchild)) | |
2436 { | |
2437 c = XWINDOW (w->vchild); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2438 |
25268 | 2439 if (width_p) |
2440 { | |
2441 /* A vert. combination is fixed-width if one of if its | |
2442 children is. */ | |
2443 while (c && !window_fixed_size_p (c, width_p, 0)) | |
2444 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2445 fixed_p = c != NULL; | |
2446 } | |
2447 else | |
2448 { | |
2449 /* A vert. combination is fixed-height if all of if its | |
2450 children are. */ | |
2451 while (c && window_fixed_size_p (c, width_p, 0)) | |
2452 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2453 fixed_p = c == NULL; | |
2454 } | |
2455 } | |
2456 else if (BUFFERP (w->buffer)) | |
2457 { | |
65602
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2458 struct buffer *old = current_buffer; |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2459 Lisp_Object val; |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2460 |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2461 current_buffer = XBUFFER (w->buffer); |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2462 val = find_symbol_value (Qwindow_size_fixed); |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2463 current_buffer = old; |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2464 |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2465 fixed_p = 0; |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2466 if (!EQ (val, Qunbound)) |
25268 | 2467 { |
65602
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2468 fixed_p = !NILP (val); |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2469 |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2470 if (fixed_p |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2471 && ((EQ (val, Qheight) && width_p) |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2472 || (EQ (val, Qwidth) && !width_p))) |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2473 fixed_p = 0; |
25268 | 2474 } |
2475 | |
2476 /* Can't tell if this one is resizable without looking at | |
2477 siblings. If all siblings are fixed-size this one is too. */ | |
2478 if (!fixed_p && check_siblings_p && WINDOWP (w->parent)) | |
2479 { | |
2480 Lisp_Object child; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2481 |
25268 | 2482 for (child = w->prev; !NILP (child); child = XWINDOW (child)->prev) |
2483 if (!window_fixed_size_p (XWINDOW (child), width_p, 0)) | |
2484 break; | |
2485 | |
2486 if (NILP (child)) | |
2487 for (child = w->next; !NILP (child); child = XWINDOW (child)->next) | |
2488 if (!window_fixed_size_p (XWINDOW (child), width_p, 0)) | |
2489 break; | |
2490 | |
2491 if (NILP (child)) | |
2492 fixed_p = 1; | |
2493 } | |
2494 } | |
2495 else | |
2496 fixed_p = 1; | |
2497 | |
2498 return fixed_p; | |
2499 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2500 |
25268 | 2501 |
2502 /* Return the minimum size of window W, not taking fixed-width windows | |
2503 into account. WIDTH_P non-zero means return the minimum width, | |
2504 otherwise return the minimum height. If W is a combination window, | |
2505 compute the minimum size from the minimum sizes of W's children. */ | |
2506 | |
2507 static int | |
2508 window_min_size_1 (w, width_p) | |
25254 | 2509 struct window *w; |
2510 int width_p; | |
2511 { | |
25268 | 2512 struct window *c; |
25254 | 2513 int size; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2514 |
25268 | 2515 if (!NILP (w->hchild)) |
2516 { | |
2517 c = XWINDOW (w->hchild); | |
2518 size = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2519 |
25268 | 2520 if (width_p) |
2521 { | |
2522 /* The min width of a horizontal combination is | |
2523 the sum of the min widths of its children. */ | |
2524 while (c) | |
2525 { | |
2526 size += window_min_size_1 (c, width_p); | |
2527 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2528 } | |
2529 } | |
2530 else | |
2531 { | |
2532 /* The min height a horizontal combination equals | |
2533 the maximum of all min height of its children. */ | |
2534 while (c) | |
2535 { | |
2536 int min_size = window_min_size_1 (c, width_p); | |
2537 size = max (min_size, size); | |
2538 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2539 } | |
2540 } | |
2541 } | |
2542 else if (!NILP (w->vchild)) | |
2543 { | |
2544 c = XWINDOW (w->vchild); | |
2545 size = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2546 |
25268 | 2547 if (width_p) |
2548 { | |
2549 /* The min width of a vertical combination is | |
2550 the maximum of the min widths of its children. */ | |
2551 while (c) | |
2552 { | |
2553 int min_size = window_min_size_1 (c, width_p); | |
2554 size = max (min_size, size); | |
2555 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2556 } | |
2557 } | |
2558 else | |
2559 { | |
2560 /* The min height of a vertical combination equals | |
2561 the sum of the min height of its children. */ | |
2562 while (c) | |
2563 { | |
2564 size += window_min_size_1 (c, width_p); | |
2565 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2566 } | |
2567 } | |
2568 } | |
25254 | 2569 else |
2570 { | |
25268 | 2571 if (width_p) |
68987
5d68b6ede0d1
* window.c (window_min_size_1): Ensure room for the scroll bar and
Chong Yidong <cyd@stupidchicken.com>
parents:
68971
diff
changeset
|
2572 size = max (window_min_width, |
5d68b6ede0d1
* window.c (window_min_size_1): Ensure room for the scroll bar and
Chong Yidong <cyd@stupidchicken.com>
parents:
68971
diff
changeset
|
2573 (MIN_SAFE_WINDOW_WIDTH |
5d68b6ede0d1
* window.c (window_min_size_1): Ensure room for the scroll bar and
Chong Yidong <cyd@stupidchicken.com>
parents:
68971
diff
changeset
|
2574 + WINDOW_FRINGE_COLS (w) |
5d68b6ede0d1
* window.c (window_min_size_1): Ensure room for the scroll bar and
Chong Yidong <cyd@stupidchicken.com>
parents:
68971
diff
changeset
|
2575 + WINDOW_SCROLL_BAR_COLS (w))); |
25254 | 2576 else |
25268 | 2577 { |
2578 if (MINI_WINDOW_P (w) | |
2579 || (!WINDOW_WANTS_MODELINE_P (w) | |
25546 | 2580 && !WINDOW_WANTS_HEADER_LINE_P (w))) |
25268 | 2581 size = 1; |
2582 else | |
2583 size = window_min_height; | |
2584 } | |
25254 | 2585 } |
2586 | |
2587 return size; | |
2588 } | |
2589 | |
2590 | |
25268 | 2591 /* Return the minimum size of window W, taking fixed-size windows into |
2592 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
|
2593 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
|
2594 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
|
2595 unless FIXED is null. */ |
25268 | 2596 |
2597 static int | |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2598 window_min_size (w, width_p, ignore_fixed_p, fixed) |
25268 | 2599 struct window *w; |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2600 int width_p, ignore_fixed_p, *fixed; |
25268 | 2601 { |
2602 int size, fixed_p; | |
2603 | |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2604 if (ignore_fixed_p) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2605 fixed_p = 0; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2606 else |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2607 fixed_p = window_fixed_size_p (w, width_p, 1); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2608 |
25268 | 2609 if (fixed) |
2610 *fixed = fixed_p; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2611 |
25268 | 2612 if (fixed_p) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2613 size = width_p ? XFASTINT (w->total_cols) : XFASTINT (w->total_lines); |
25268 | 2614 else |
2615 size = window_min_size_1 (w, width_p); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2616 |
25268 | 2617 return size; |
2618 } | |
2619 | |
2620 | |
51223
c1daf1c22f97
(Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents:
51207
diff
changeset
|
2621 /* 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
|
2622 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
|
2623 is still too narrow. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2624 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2625 static int |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2626 adjust_window_margins (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2627 struct window *w; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2628 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2629 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
|
2630 - WINDOW_FRINGE_COLS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2631 - WINDOW_SCROLL_BAR_COLS (w)); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2632 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
|
2633 + WINDOW_RIGHT_MARGIN_COLS (w)); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2634 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2635 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
|
2636 return 1; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2637 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2638 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
|
2639 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2640 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2641 /* 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
|
2642 margins will fix that. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2643 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
|
2644 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
|
2645 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2646 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
|
2647 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
|
2648 = make_number (margin_cols/2); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2649 else |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2650 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
|
2651 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2652 else |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2653 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
|
2654 return 1; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2655 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2656 |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2657 /* 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
|
2658 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
|
2659 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
|
2660 can shrink is SHRINKABLE. |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2661 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
|
2662 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
|
2663 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
|
2664 shrinking rows. |
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 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
|
2667 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
|
2668 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
|
2669 the second, and so on. |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2670 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2671 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
|
2672 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
|
2673 delete that window). |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2674 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2675 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
|
2676 shrink more than smaller windows. */ |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2677 static int * |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2678 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
|
2679 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
|
2680 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
|
2681 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
|
2682 Lisp_Object forward; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2683 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2684 int available_resize = 0; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2685 int *new_sizes; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2686 struct window *c; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2687 Lisp_Object child; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2688 int smallest = total; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2689 int total_removed = 0; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2690 int total_shrink = total - size; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2691 int i; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2692 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2693 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
|
2694 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2695 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
|
2696 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2697 int child_size; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2698 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2699 c = XWINDOW (child); |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2700 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
|
2701 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2702 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
|
2703 new_sizes[i] = -1; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2704 else |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2705 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2706 new_sizes[i] = child_size; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2707 if (child_size > min_size) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2708 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
|
2709 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2710 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2711 /* 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
|
2712 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
|
2713 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2714 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
|
2715 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2716 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
|
2717 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
|
2718 smallest = new_sizes[i]; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2719 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2720 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
|
2721 if (new_sizes[i] == smallest) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2722 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2723 /* 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
|
2724 new_sizes[i] = 0; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2725 if (smallest > min_size) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2726 available_resize -= smallest - min_size; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2727 available_resize += smallest; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2728 --shrinkable; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2729 total_removed += smallest; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2730 |
58217
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2731 /* We don't know what the smallest is now. */ |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2732 smallest = total; |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2733 |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2734 /* 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
|
2735 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
|
2736 break; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2737 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2738 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2739 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2740 /* 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
|
2741 proportional to its size. */ |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2742 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
|
2743 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2744 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
|
2745 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2746 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
|
2747 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
|
2748 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
|
2749 new_sizes[i] -= to_shrink; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2750 total_removed += to_shrink; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2751 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2752 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2753 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2754 /* 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
|
2755 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
|
2756 while (total_shrink > total_removed) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2757 { |
58217
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2758 int nonzero_sizes = 0; |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2759 int nonzero_idx = -1; |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2760 |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2761 for (i = 0; i < nchildren; ++i) |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2762 if (new_sizes[i] > 0) |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2763 { |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2764 ++nonzero_sizes; |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2765 nonzero_idx = i; |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2766 } |
58441
9b7ff064cb26
(set_window_buffer): Clear display_error_modiff.
Kim F. Storm <storm@cua.dk>
parents:
58265
diff
changeset
|
2767 |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2768 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
|
2769 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
|
2770 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2771 --new_sizes[i]; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2772 ++total_removed; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2773 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2774 /* 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
|
2775 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
|
2776 break; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2777 } |
58217
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2778 |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2779 |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2780 /* Special case, only one window left. */ |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2781 if (nonzero_sizes == 1) |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2782 break; |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2783 } |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2784 |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2785 /* Any surplus due to rounding, we add to windows that are left. */ |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2786 while (total_shrink < total_removed) |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2787 { |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2788 for (i = 0; i < nchildren; ++i) |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2789 { |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2790 if (new_sizes[i] != 0 && total_shrink < total_removed) |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2791 { |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2792 ++new_sizes[i]; |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2793 --total_removed; |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2794 break; |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2795 } |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2796 } |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2797 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2798 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2799 return new_sizes; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2800 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2801 |
25268 | 2802 /* Set WINDOW's height or width to SIZE. WIDTH_P non-zero means set |
2803 WINDOW's width. Resize WINDOW's children, if any, so that they | |
2804 keep their proportionate size relative to WINDOW. Propagate | |
2805 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
|
2806 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
|
2807 |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2808 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
|
2809 too small, even if they were too small before! */ |
25268 | 2810 |
2811 static void | |
2812 size_window (window, size, width_p, nodelete_p) | |
2813 Lisp_Object window; | |
2814 int size, width_p, nodelete_p; | |
2815 { | |
2816 struct window *w = XWINDOW (window); | |
2817 struct window *c; | |
2818 Lisp_Object child, *forward, *sideward; | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2819 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
|
2820 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2821 /* 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
|
2822 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
|
2823 if (nodelete_p == 2) |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2824 nodelete_p = 0; |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2825 |
25268 | 2826 check_min_window_sizes (); |
32824
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
2827 size = max (0, size); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2828 |
25268 | 2829 /* If the window has been "too small" at one point, |
2830 don't delete it for being "too small" in the future. | |
2831 Preserve it as long as that is at all possible. */ | |
2832 if (width_p) | |
2833 { | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2834 old_size = WINDOW_TOTAL_COLS (w); |
25268 | 2835 min_size = window_min_width; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2836 /* 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
|
2837 We may reduce display margins though. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2838 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
|
2839 + WINDOW_FRINGE_COLS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2840 + WINDOW_SCROLL_BAR_COLS (w)); |
25268 | 2841 } |
2842 else | |
2843 { | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2844 old_size = XINT (w->total_lines); |
25268 | 2845 min_size = window_min_height; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2846 safe_min_size = MIN_SAFE_WINDOW_HEIGHT; |
25268 | 2847 } |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2848 |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
2849 if (old_size < min_size && nodelete_p != 2) |
25268 | 2850 w->too_small_ok = Qt; |
2851 | |
2852 /* 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
|
2853 if (nodelete_p != 1 && !NILP (w->parent)) |
25268 | 2854 { |
2855 if (!MINI_WINDOW_P (w) && !NILP (w->too_small_ok)) | |
2856 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
|
2857 if (min_size < safe_min_size) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2858 min_size = safe_min_size; |
25268 | 2859 if (size < min_size) |
2860 { | |
2861 delete_window (window); | |
2862 return; | |
2863 } | |
2864 } | |
2865 | |
2866 /* Set redisplay hints. */ | |
32824
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
2867 w->last_modified = make_number (0); |
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
2868 w->last_overlay_modified = make_number (0); |
25268 | 2869 windows_or_buffers_changed++; |
32824
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
2870 FRAME_WINDOW_SIZES_CHANGED (XFRAME (w->frame)) = 1; |
25268 | 2871 |
2872 if (width_p) | |
2873 { | |
2874 sideward = &w->vchild; | |
2875 forward = &w->hchild; | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2876 w->total_cols = make_number (size); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2877 adjust_window_margins (w); |
25268 | 2878 } |
2879 else | |
2880 { | |
2881 sideward = &w->hchild; | |
2882 forward = &w->vchild; | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2883 w->total_lines = make_number (size); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2884 w->orig_total_lines = Qnil; |
25268 | 2885 } |
2886 | |
2887 if (!NILP (*sideward)) | |
2888 { | |
2889 for (child = *sideward; !NILP (child); child = c->next) | |
2890 { | |
2891 c = XWINDOW (child); | |
2892 if (width_p) | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2893 c->left_col = w->left_col; |
25268 | 2894 else |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2895 c->top_line = w->top_line; |
25268 | 2896 size_window (child, size, width_p, nodelete_p); |
2897 } | |
2898 } | |
2899 else if (!NILP (*forward)) | |
2900 { | |
2901 int fixed_size, each, extra, n; | |
2902 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
|
2903 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
|
2904 int *new_sizes = NULL; |
25268 | 2905 |
2906 /* Determine the fixed-size portion of the this window, and the | |
2907 number of child windows. */ | |
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
2908 fixed_size = nchildren = nfixed = total = 0; |
25268 | 2909 for (child = *forward; !NILP (child); child = c->next, ++nchildren) |
2910 { | |
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
2911 int child_size; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2912 |
25268 | 2913 c = XWINDOW (child); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2914 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
|
2915 total += child_size; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2916 |
25268 | 2917 if (window_fixed_size_p (c, width_p, 0)) |
2918 { | |
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
2919 fixed_size += child_size; |
25268 | 2920 ++nfixed; |
2921 } | |
2922 } | |
2923 | |
2924 /* If the new size is smaller than fixed_size, or if there | |
2925 aren't any resizable windows, allow resizing fixed-size | |
2926 windows. */ | |
2927 resize_fixed_p = nfixed == nchildren || size < fixed_size; | |
2928 | |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2929 /* Compute how many lines/columns to add/remove to each child. The |
25268 | 2930 value of extra takes care of rounding errors. */ |
2931 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
|
2932 if (size < total && n > 1) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2933 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
|
2934 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
|
2935 else |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2936 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2937 each = (size - total) / n; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2938 extra = (size - total) - n * each; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2939 } |
25268 | 2940 |
2941 /* 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
|
2942 first_pos = width_p ? XINT (w->left_col) : XINT (w->top_line); |
25268 | 2943 last_pos = first_pos; |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2944 for (n = 0, child = *forward; !NILP (child); child = c->next, ++n) |
25268 | 2945 { |
2946 int new_size, old_size; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2947 |
25268 | 2948 c = XWINDOW (child); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2949 old_size = width_p ? XFASTINT (c->total_cols) : XFASTINT (c->total_lines); |
25268 | 2950 new_size = old_size; |
2951 | |
2952 /* The top or left edge position of this child equals the | |
2953 bottom or right edge of its predecessor. */ | |
2954 if (width_p) | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2955 c->left_col = make_number (last_pos); |
25268 | 2956 else |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2957 c->top_line = make_number (last_pos); |
25268 | 2958 |
2959 /* If this child can be resized, do it. */ | |
2960 if (resize_fixed_p || !window_fixed_size_p (c, width_p, 0)) | |
2961 { | |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2962 new_size = new_sizes ? new_sizes[n] : old_size + each + extra; |
25268 | 2963 extra = 0; |
2964 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2965 |
25268 | 2966 /* Set new height. Note that size_window also propagates |
2967 edge positions to children, so it's not a no-op if we | |
2968 didn't change the child's size. */ | |
2969 size_window (child, new_size, width_p, 1); | |
2970 | |
2971 /* Remember the bottom/right edge position of this child; it | |
2972 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
|
2973 last_pos += new_size; |
25268 | 2974 } |
2975 | |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2976 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
|
2977 |
25268 | 2978 /* We should have covered the parent exactly with child windows. */ |
2979 xassert (size == last_pos - first_pos); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2980 |
25268 | 2981 /* Now delete any children that became too small. */ |
2982 if (!nodelete_p) | |
2983 for (child = *forward; !NILP (child); child = c->next) | |
2984 { | |
2985 int child_size; | |
2986 c = XWINDOW (child); | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2987 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
|
2988 size_window (child, child_size, width_p, 2); |
25268 | 2989 } |
2990 } | |
2991 } | |
2992 | |
2993 /* Set WINDOW's height to HEIGHT, and recursively change the height of | |
2994 WINDOW's children. NODELETE non-zero means don't delete windows | |
2995 that become too small in the process. (The caller should check | |
2996 later and do so if appropriate.) */ | |
265 | 2997 |
20351 | 2998 void |
265 | 2999 set_window_height (window, height, nodelete) |
3000 Lisp_Object window; | |
3001 int height; | |
3002 int nodelete; | |
3003 { | |
25268 | 3004 size_window (window, height, 0, nodelete); |
265 | 3005 } |
3006 | |
25268 | 3007 |
3008 /* Set WINDOW's width to WIDTH, and recursively change the width of | |
3009 WINDOW's children. NODELETE non-zero means don't delete windows | |
3010 that become too small in the process. (The caller should check | |
3011 later and do so if appropriate.) */ | |
265 | 3012 |
20351 | 3013 void |
265 | 3014 set_window_width (window, width, nodelete) |
3015 Lisp_Object window; | |
3016 int width; | |
3017 int nodelete; | |
3018 { | |
25268 | 3019 size_window (window, width, 1, nodelete); |
265 | 3020 } |
25268 | 3021 |
50367
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3022 /* 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
|
3023 |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3024 void |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3025 change_window_heights (window, n) |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3026 Lisp_Object window; |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3027 int n; |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3028 { |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3029 struct window *w = XWINDOW (window); |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3030 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3031 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
|
3032 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
|
3033 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3034 if (INTEGERP (w->orig_top_line)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3035 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
|
3036 if (INTEGERP (w->orig_total_lines)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3037 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
|
3038 |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3039 /* 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
|
3040 if (!NILP (w->vchild)) |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3041 change_window_heights (w->vchild, n); |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3042 |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3043 /* 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
|
3044 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
|
3045 { |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3046 w = XWINDOW (window); |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3047 change_window_heights (window, n); |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3048 } |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3049 } |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3050 |
265 | 3051 |
362 | 3052 int window_select_count; |
265 | 3053 |
14445
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
3054 Lisp_Object |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
3055 Fset_window_buffer_unwind (obuf) |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
3056 Lisp_Object obuf; |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
3057 { |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
3058 Fset_buffer (obuf); |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
3059 return Qnil; |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
3060 } |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
3061 |
51240
1fe905dd5836
(Fset_window_buffer): Add type of `keep_margins' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51223
diff
changeset
|
3062 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
|
3063 EXFUN (Fset_window_scroll_bars, 4); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3064 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3065 /* 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
|
3066 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
|
3067 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
|
3068 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
|
3069 reset from the buffer's local settings. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3070 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3071 void |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3072 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
|
3073 Lisp_Object window, buffer; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3074 int run_hooks_p, keep_margins_p; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3075 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3076 struct window *w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3077 struct buffer *b = XBUFFER (buffer); |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
3078 int count = SPECPDL_INDEX (); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3079 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3080 w->buffer = buffer; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3081 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3082 if (EQ (window, selected_window)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3083 b->last_selected_window = window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3084 |
58441
9b7ff064cb26
(set_window_buffer): Clear display_error_modiff.
Kim F. Storm <storm@cua.dk>
parents:
58265
diff
changeset
|
3085 /* Let redisplay errors through. */ |
9b7ff064cb26
(set_window_buffer): Clear display_error_modiff.
Kim F. Storm <storm@cua.dk>
parents:
58265
diff
changeset
|
3086 b->display_error_modiff = 0; |
9b7ff064cb26
(set_window_buffer): Clear display_error_modiff.
Kim F. Storm <storm@cua.dk>
parents:
58265
diff
changeset
|
3087 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3088 /* Update time stamps of buffer display. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3089 if (INTEGERP (b->display_count)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3090 XSETINT (b->display_count, XINT (b->display_count) + 1); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3091 b->display_time = Fcurrent_time (); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3092 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3093 XSETFASTINT (w->window_end_pos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3094 XSETFASTINT (w->window_end_vpos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3095 bzero (&w->last_cursor, sizeof w->last_cursor); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3096 w->window_end_valid = Qnil; |
36133
6eb00bee0989
(set_window_buffer): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36131
diff
changeset
|
3097 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
|
3098 w->vscroll = 0; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3099 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
|
3100 set_marker_restricted (w->start, |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3101 make_number (b->last_window_start), |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3102 buffer); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3103 w->start_at_line_beg = Qnil; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3104 w->force_start = Qnil; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3105 XSETFASTINT (w->last_modified, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3106 XSETFASTINT (w->last_overlay_modified, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3107 windows_or_buffers_changed++; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3108 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3109 /* 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
|
3110 If WINDOW is selected, switch permanently. |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3111 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
|
3112 if (EQ (window, selected_window)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3113 Fset_buffer (buffer); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3114 /* We can't check ! NILP (Vwindow_scroll_functions) here |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3115 because that might itself be a local variable. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3116 else if (window_initialized) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3117 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3118 record_unwind_protect (Fset_window_buffer_unwind, Fcurrent_buffer ()); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3119 Fset_buffer (buffer); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3120 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3121 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3122 if (!keep_margins_p) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3123 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3124 /* 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
|
3125 |
51223
c1daf1c22f97
(Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents:
51207
diff
changeset
|
3126 /* 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
|
3127 temporarily disable window margins. */ |
52617
f8adaf14f570
(set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents:
52565
diff
changeset
|
3128 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
|
3129 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
|
3130 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3131 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
|
3132 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3133 Fset_window_fringes (window, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3134 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
|
3135 b->fringes_outside_margins); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3136 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3137 Fset_window_scroll_bars (window, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3138 b->scroll_bar_width, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3139 b->vertical_scroll_bar_type, Qnil); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3140 |
52617
f8adaf14f570
(set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents:
52565
diff
changeset
|
3141 w->left_margin_cols = save_left; |
f8adaf14f570
(set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents:
52565
diff
changeset
|
3142 w->right_margin_cols = save_right; |
f8adaf14f570
(set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents:
52565
diff
changeset
|
3143 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3144 Fset_window_margins (window, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3145 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
|
3146 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3147 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3148 if (run_hooks_p) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3149 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3150 if (! NILP (Vwindow_scroll_functions)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3151 run_hook_with_args_2 (Qwindow_scroll_functions, window, |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3152 Fmarker_position (w->start)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3153 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3154 if (! NILP (Vwindow_configuration_change_hook) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3155 && ! NILP (Vrun_hooks)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3156 call1 (Vrun_hooks, Qwindow_configuration_change_hook); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3157 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3158 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3159 unbind_to (count, Qnil); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3160 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3161 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3162 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3163 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
|
3164 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
|
3165 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
|
3166 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
|
3167 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
|
3168 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
|
3169 defaults. |
0730ef55b4d8
(Fset_window_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56616
diff
changeset
|
3170 |
0730ef55b4d8
(Fset_window_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56616
diff
changeset
|
3171 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
|
3172 (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
|
3173 register Lisp_Object window, buffer, keep_margins; |
265 | 3174 { |
3175 register Lisp_Object tem; | |
3176 register struct window *w = decode_window (window); | |
3177 | |
27848
27b993d2ea05
(Fset_window_buffer): Set WINDOW to the window
Gerd Moellmann <gerd@gnu.org>
parents:
27699
diff
changeset
|
3178 XSETWINDOW (window, w); |
265 | 3179 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
|
3180 CHECK_BUFFER (buffer); |
265 | 3181 |
485 | 3182 if (NILP (XBUFFER (buffer)->name)) |
265 | 3183 error ("Attempt to display deleted buffer"); |
3184 | |
3185 tem = w->buffer; | |
485 | 3186 if (NILP (tem)) |
265 | 3187 error ("Window is deleted"); |
3188 else if (! EQ (tem, Qt)) /* w->buffer is t when the window | |
3189 is first being set up. */ | |
3190 { | |
485 | 3191 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
|
3192 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
|
3193 SDATA (XBUFFER (tem)->name)); |
265 | 3194 |
3195 unshow_buffer (w); | |
3196 } | |
3197 | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3198 set_window_buffer (window, buffer, 1, !NILP (keep_margins)); |
265 | 3199 return Qnil; |
3200 } | |
3201 | |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3202 /* Note that selected_window can be nil |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3203 when this is called from Fset_window_configuration. */ |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3204 |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3205 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
|
3206 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
|
3207 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
|
3208 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
|
3209 Optional second arg NORECORD non-nil means |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3210 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
|
3211 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3212 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
|
3213 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
|
3214 (window, norecord) |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3215 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
|
3216 { |
265 | 3217 register struct window *w; |
27869
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3218 register struct window *ow; |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3219 struct frame *sf; |
265 | 3220 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3221 CHECK_LIVE_WINDOW (window); |
265 | 3222 |
3223 w = XWINDOW (window); | |
39953
3a1666ed16b8
(select_window_1): Unfreeze window start. Remove a
Gerd Moellmann <gerd@gnu.org>
parents:
39952
diff
changeset
|
3224 w->frozen_window_start_p = 0; |
265 | 3225 |
58265
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
3226 ++window_select_count; |
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
3227 XSETFASTINT (w->use_time, window_select_count); |
265 | 3228 if (EQ (window, selected_window)) |
3229 return window; | |
3230 | |
61444 | 3231 /* Store the current buffer's actual point into the |
3232 old selected window. It belongs to that window, | |
3233 and when the window is not selected, must be in the window. */ | |
27869
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3234 if (!NILP (selected_window)) |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3235 { |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3236 ow = XWINDOW (selected_window); |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3237 if (! NILP (ow->buffer)) |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3238 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
|
3239 BUF_PT (XBUFFER (ow->buffer)), |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3240 BUF_PT_BYTE (XBUFFER (ow->buffer))); |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3241 } |
265 | 3242 |
3243 selected_window = window; | |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3244 sf = SELECTED_FRAME (); |
48927
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
3245 if (XFRAME (WINDOW_FRAME (w)) != sf) |
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
3246 { |
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
3247 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
|
3248 /* 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
|
3249 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
|
3250 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
|
3251 frame is active. */ |
63187
dd0624f7bb99
(Fselect_window): Adapt call to Fselect_frame.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63045
diff
changeset
|
3252 Fselect_frame (WINDOW_FRAME (w)); |
48927
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
3253 } |
148675770a17
(select_window_1): Undo 9/21 change.
Richard M. Stallman <rms@gnu.org>
parents:
48898
diff
changeset
|
3254 else |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3255 sf->selected_window = window; |
265 | 3256 |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3257 if (NILP (norecord)) |
22187
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
3258 record_buffer (w->buffer); |
265 | 3259 Fset_buffer (w->buffer); |
3260 | |
16068
b19129a8c644
(unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
3261 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
|
3262 |
265 | 3263 /* Go to the point recorded in the window. |
3264 This is important when the buffer is in more | |
3265 than one window. It also matters when | |
3266 redisplay_window has altered point after scrolling, | |
3267 because it makes the change only in the window. */ | |
3268 { | |
3269 register int new_point = marker_position (w->pointm); | |
3270 if (new_point < BEGV) | |
3271 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
|
3272 else if (new_point > ZV) |
265 | 3273 SET_PT (ZV); |
3274 else | |
3275 SET_PT (new_point); | |
3276 } | |
3277 | |
3278 windows_or_buffers_changed++; | |
3279 return window; | |
3280 } | |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3281 |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3282 static Lisp_Object |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3283 select_window_norecord (window) |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3284 Lisp_Object window; |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3285 { |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3286 return Fselect_window (window, Qt); |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3287 } |
22187
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
3288 |
14175
ace33b55f549
(display_buffer_1): Don't deiconify the selected frame.
Richard M. Stallman <rms@gnu.org>
parents:
14166
diff
changeset
|
3289 /* 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
|
3290 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
|
3291 then return WINDOW. |
ace33b55f549
(display_buffer_1): Don't deiconify the selected frame.
Richard M. Stallman <rms@gnu.org>
parents:
14166
diff
changeset
|
3292 |
ace33b55f549
(display_buffer_1): Don't deiconify the selected frame.
Richard M. Stallman <rms@gnu.org>
parents:
14166
diff
changeset
|
3293 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
|
3294 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
|
3295 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
|
3296 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
|
3297 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
|
3298 |
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3299 static Lisp_Object |
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3300 display_buffer_1 (window) |
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3301 Lisp_Object window; |
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3302 { |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3303 Lisp_Object frame = XWINDOW (window)->frame; |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3304 FRAME_PTR f = XFRAME (frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3305 |
13619
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3306 FRAME_SAMPLE_VISIBILITY (f); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3307 |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3308 if (EQ (frame, selected_frame)) |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3309 ; /* Assume the selected frame is already visible enough. */ |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3310 else if (minibuf_level > 0 |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3311 && MINI_WINDOW_P (XWINDOW (selected_window)) |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3312 && WINDOW_LIVE_P (minibuf_selected_window) |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3313 && EQ (frame, WINDOW_FRAME (XWINDOW (minibuf_selected_window)))) |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3314 ; /* 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
|
3315 else |
14535
8ca7e641c144
(display_buffer_1): Raise the frame if already visible.
Richard M. Stallman <rms@gnu.org>
parents:
14445
diff
changeset
|
3316 { |
8ca7e641c144
(display_buffer_1): Raise the frame if already visible.
Richard M. Stallman <rms@gnu.org>
parents:
14445
diff
changeset
|
3317 if (FRAME_ICONIFIED_P (f)) |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3318 Fmake_frame_visible (frame); |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
3319 else if (FRAME_VISIBLE_P (f)) |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3320 Fraise_frame (frame); |
14535
8ca7e641c144
(display_buffer_1): Raise the frame if already visible.
Richard M. Stallman <rms@gnu.org>
parents:
14445
diff
changeset
|
3321 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3322 |
13619
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3323 return window; |
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3324 } |
3fa8cd29e1da
(Fdisplay_buffer): Always deiconify the window's frame.
Richard M. Stallman <rms@gnu.org>
parents:
13583
diff
changeset
|
3325 |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3326 DEFUN ("special-display-p", Fspecial_display_p, Sspecial_display_p, 1, 1, 0, |
57508
22f6e207e697
(Fspecial_display_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57309
diff
changeset
|
3327 doc: /* Returns non-nil if a buffer named BUFFER-NAME gets a special frame. |
61871
dd7b3da13b8f
(Fsame_window_p, Fspecial_display_p): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
61755
diff
changeset
|
3328 If the value is t, `display-buffer' or `pop-to-buffer' would create a |
dd7b3da13b8f
(Fsame_window_p, Fspecial_display_p): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
61755
diff
changeset
|
3329 special frame for that buffer using the default frame parameters. |
dd7b3da13b8f
(Fsame_window_p, Fspecial_display_p): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
61755
diff
changeset
|
3330 |
dd7b3da13b8f
(Fsame_window_p, Fspecial_display_p): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
61755
diff
changeset
|
3331 If the value is a list, it is a list of frame parameters that would be used |
57508
22f6e207e697
(Fspecial_display_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57309
diff
changeset
|
3332 to make a frame for that buffer. |
22f6e207e697
(Fspecial_display_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57309
diff
changeset
|
3333 The variables `special-display-buffer-names' |
22f6e207e697
(Fspecial_display_p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57309
diff
changeset
|
3334 and `special-display-regexps' control this. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3335 (buffer_name) |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3336 Lisp_Object buffer_name; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3337 { |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3338 Lisp_Object tem; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3339 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3340 CHECK_STRING (buffer_name); |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3341 |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3342 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
|
3343 if (!NILP (tem)) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3344 return Qt; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3345 |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3346 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
|
3347 if (!NILP (tem)) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3348 return XCDR (tem); |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3349 |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3350 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
|
3351 { |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3352 Lisp_Object car = XCAR (tem); |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3353 if (STRINGP (car) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3354 && 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
|
3355 return Qt; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3356 else if (CONSP (car) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3357 && STRINGP (XCAR (car)) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3358 && 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
|
3359 return XCDR (car); |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3360 } |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3361 return Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3362 } |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3363 |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3364 DEFUN ("same-window-p", Fsame_window_p, Ssame_window_p, 1, 1, 0, |
61871
dd7b3da13b8f
(Fsame_window_p, Fspecial_display_p): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
61755
diff
changeset
|
3365 doc: /* Returns non-nil if a buffer named BUFFER-NAME would use the same window. |
dd7b3da13b8f
(Fsame_window_p, Fspecial_display_p): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
61755
diff
changeset
|
3366 More precisely, if `display-buffer' or `pop-to-buffer' would display |
dd7b3da13b8f
(Fsame_window_p, Fspecial_display_p): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
61755
diff
changeset
|
3367 that buffer in the selected window rather than (as usual) in some other window. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3368 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
|
3369 (buffer_name) |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3370 Lisp_Object buffer_name; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3371 { |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3372 Lisp_Object tem; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3373 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3374 CHECK_STRING (buffer_name); |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3375 |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3376 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
|
3377 if (!NILP (tem)) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3378 return Qt; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3379 |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3380 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
|
3381 if (!NILP (tem)) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3382 return Qt; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3383 |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3384 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
|
3385 { |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3386 Lisp_Object car = XCAR (tem); |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3387 if (STRINGP (car) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3388 && 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
|
3389 return Qt; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3390 else if (CONSP (car) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3391 && STRINGP (XCAR (car)) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3392 && 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
|
3393 return Qt; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3394 } |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3395 return Qnil; |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3396 } |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3397 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3398 /* 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
|
3399 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
|
3400 "BDisplay buffer: \nP", |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3401 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
|
3402 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
|
3403 a buffer. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3404 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
|
3405 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
|
3406 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
|
3407 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
|
3408 Returns the window displaying BUFFER. |
44155
d94cb7b3b165
(Fdisplay_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43713
diff
changeset
|
3409 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
|
3410 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
|
3411 |
54267
bd5ef1fde279
(Fdisplay_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
54229
diff
changeset
|
3412 The variables `special-display-buffer-names', |
bd5ef1fde279
(Fdisplay_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
54229
diff
changeset
|
3413 `special-display-regexps', `same-window-buffer-names', and |
bd5ef1fde279
(Fdisplay_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
54229
diff
changeset
|
3414 `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
|
3415 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
|
3416 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3417 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
|
3418 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
|
3419 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
|
3420 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
|
3421 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
|
3422 (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
|
3423 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
|
3424 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
|
3425 |
55563
a58f6db8bf3d
(Fdisplay_buffer, Fsplit_window, split-height-threshold): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
55402
diff
changeset
|
3426 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
|
3427 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
|
3428 `split-height-threshold'. |
a58f6db8bf3d
(Fdisplay_buffer, Fsplit_window, split-height-threshold): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
55402
diff
changeset
|
3429 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3430 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
|
3431 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
|
3432 displayed. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3433 (buffer, not_this_window, frame) |
20867
fccf74829150
(Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
20777
diff
changeset
|
3434 register Lisp_Object buffer, not_this_window, frame; |
265 | 3435 { |
25182
ef79ee0ceedd
(display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents:
25115
diff
changeset
|
3436 register Lisp_Object window, tem, swp; |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3437 struct frame *f; |
25182
ef79ee0ceedd
(display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents:
25115
diff
changeset
|
3438 |
ef79ee0ceedd
(display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents:
25115
diff
changeset
|
3439 swp = Qnil; |
265 | 3440 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
|
3441 CHECK_BUFFER (buffer); |
265 | 3442 |
485 | 3443 if (!NILP (Vdisplay_buffer_function)) |
265 | 3444 return call2 (Vdisplay_buffer_function, buffer, not_this_window); |
3445 | |
485 | 3446 if (NILP (not_this_window) |
265 | 3447 && 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
|
3448 return display_buffer_1 (selected_window); |
265 | 3449 |
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
3450 /* 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
|
3451 in the selected window. */ |
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
3452 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
|
3453 { |
25182
ef79ee0ceedd
(display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents:
25115
diff
changeset
|
3454 swp = Fsame_window_p (XBUFFER (buffer)->name); |
ef79ee0ceedd
(display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents:
25115
diff
changeset
|
3455 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
|
3456 { |
71304a70d0f6
(Fdisplay_buffer): Fix prev change--return selected window.
Richard M. Stallman <rms@gnu.org>
parents:
10958
diff
changeset
|
3457 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
|
3458 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
|
3459 } |
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
3460 } |
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
3461 |
44155
d94cb7b3b165
(Fdisplay_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
43713
diff
changeset
|
3462 /* 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
|
3463 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
|
3464 Otherwise search only the current frame. */ |
20867
fccf74829150
(Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
20777
diff
changeset
|
3465 if (! NILP (frame)) |
fccf74829150
(Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
20777
diff
changeset
|
3466 tem = frame; |
30560
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
3467 else if (pop_up_frames |
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
3468 || display_buffer_reuse_frames |
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
3469 || last_nonminibuf_frame == 0) |
11427
c4ee56df7173
(Fdisplay_buffer): Search the proper frame when the
Karl Heuer <kwzh@gnu.org>
parents:
11405
diff
changeset
|
3470 XSETFASTINT (tem, 0); |
c4ee56df7173
(Fdisplay_buffer): Search the proper frame when the
Karl Heuer <kwzh@gnu.org>
parents:
11405
diff
changeset
|
3471 else |
c4ee56df7173
(Fdisplay_buffer): Search the proper frame when the
Karl Heuer <kwzh@gnu.org>
parents:
11405
diff
changeset
|
3472 XSETFRAME (tem, last_nonminibuf_frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3473 |
11427
c4ee56df7173
(Fdisplay_buffer): Search the proper frame when the
Karl Heuer <kwzh@gnu.org>
parents:
11405
diff
changeset
|
3474 window = Fget_buffer_window (buffer, tem); |
485 | 3475 if (!NILP (window) |
3476 && (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
|
3477 return display_buffer_1 (window); |
265 | 3478 |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3479 /* Certain buffer names get special handling. */ |
25182
ef79ee0ceedd
(display-buffer): Don't get confused
Richard M. Stallman <rms@gnu.org>
parents:
25115
diff
changeset
|
3480 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
|
3481 { |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3482 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
|
3483 if (EQ (tem, Qt)) |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3484 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
|
3485 if (CONSP (tem)) |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
3486 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
|
3487 } |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3488 |
769 | 3489 /* If there are no frames open that have more than a minibuffer, |
3490 we need to create a new frame. */ | |
3491 if (pop_up_frames || last_nonminibuf_frame == 0) | |
265 | 3492 { |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
3493 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
|
3494 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
|
3495 return display_buffer_1 (window); |
265 | 3496 } |
3497 | |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3498 f = SELECTED_FRAME (); |
358 | 3499 if (pop_up_windows |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3500 || 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
|
3501 /* 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
|
3502 don't try to reuse its windows. */ |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3503 || !NILP (XWINDOW (FRAME_ROOT_WINDOW (f))->dedicated)) |
358 | 3504 { |
6517
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
3505 Lisp_Object frames; |
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
3506 |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
3507 frames = Qnil; |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3508 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
|
3509 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
|
3510 /* Don't try to create a window if we would get an error. */ |
265 | 3511 if (split_height_threshold < window_min_height << 1) |
3512 split_height_threshold = window_min_height << 1; | |
3513 | |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3514 /* 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
|
3515 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
|
3516 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
|
3517 |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3518 /* 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
|
3519 try other frames. */ |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3520 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
|
3521 { |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3522 /* Try visible frames first. */ |
66598
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
3523 window = Fget_largest_window (Qvisible, Qt); |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3524 /* 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
|
3525 if (NILP (window)) |
66598
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
3526 window = Fget_largest_window (make_number (0), Qt); |
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
3527 #if 0 /* Don't try windows on other displays. */ |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3528 if (NILP (window)) |
66598
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
3529 window = Fget_largest_window (Qt, Qt); |
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
3530 #endif |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3531 } |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3532 else |
66598
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
3533 window = Fget_largest_window (frames, Qt); |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3534 |
9567
cf4f4c8a3ef6
(Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents:
9324
diff
changeset
|
3535 /* 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
|
3536 split it. */ |
485 | 3537 if (!NILP (window) |
9567
cf4f4c8a3ef6
(Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents:
9324
diff
changeset
|
3538 && ! FRAME_NO_SPLIT_P (XFRAME (XWINDOW (window)->frame)) |
265 | 3539 && 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
|
3540 && WINDOW_FULL_WIDTH_P (XWINDOW (window))) |
265 | 3541 window = Fsplit_window (window, Qnil, Qnil); |
3542 else | |
3543 { | |
89542
2785238e3aea
(Fdisplay_buffer, Fframe_selected_window): Remove
Dave Love <fx@gnu.org>
parents:
88123
diff
changeset
|
3544 Lisp_Object upper, other; |
9614
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3545 |
66598
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
3546 window = Fget_lru_window (frames, Qt); |
9567
cf4f4c8a3ef6
(Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents:
9324
diff
changeset
|
3547 /* 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
|
3548 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
|
3549 if (!NILP (window) |
9567
cf4f4c8a3ef6
(Fdisplay_buffer): In desperation case of looking for
Richard M. Stallman <rms@gnu.org>
parents:
9324
diff
changeset
|
3550 && ! 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
|
3551 && (EQ (window, selected_window) |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3552 || EQ (XWINDOW (window)->parent, Qnil)) |
265 | 3553 && window_height (window) >= window_min_height << 1) |
3554 window = Fsplit_window (window, Qnil, Qnil); | |
66657
74fd87aeeaf4
(Fdisplay_buffer): Fix last change to not use a dedicated window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66598
diff
changeset
|
3555 else |
74fd87aeeaf4
(Fdisplay_buffer): Fix last change to not use a dedicated window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66598
diff
changeset
|
3556 window = Fget_lru_window (frames, Qnil); |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3557 /* 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
|
3558 |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3559 /* Try visible frames first. */ |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3560 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
|
3561 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
|
3562 if (NILP (window)) |
66598
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
3563 window = Fget_largest_window (Qvisible, Qnil); |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3564 /* 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
|
3565 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
|
3566 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
|
3567 if (NILP (window)) |
66598
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
3568 window = Fget_largest_window (make_number (0), Qnil); |
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
3569 |
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
3570 #if 0 /* Don't try frames on other displays. */ |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3571 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
|
3572 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
|
3573 if (NILP (window)) |
66598
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
3574 window = Fget_largest_window (Qt, Qnil); |
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
3575 #endif |
8263
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3576 /* 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
|
3577 if (NILP (window)) |
bae811318a57
(Fdisplay_buffer): Cope with unsplittable frames and dedicated windows.
Richard M. Stallman <rms@gnu.org>
parents:
8245
diff
changeset
|
3578 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
|
3579 /* 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
|
3580 even out their heights. */ |
89542
2785238e3aea
(Fdisplay_buffer, Fframe_selected_window): Remove
Dave Love <fx@gnu.org>
parents:
88123
diff
changeset
|
3581 other = upper = Qnil; |
9614
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3582 if (!NILP (XWINDOW (window)->prev)) |
89542
2785238e3aea
(Fdisplay_buffer, Fframe_selected_window): Remove
Dave Love <fx@gnu.org>
parents:
88123
diff
changeset
|
3583 other = upper = XWINDOW (window)->prev; |
9614
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3584 if (!NILP (XWINDOW (window)->next)) |
89542
2785238e3aea
(Fdisplay_buffer, Fframe_selected_window): Remove
Dave Love <fx@gnu.org>
parents:
88123
diff
changeset
|
3585 other = XWINDOW (window)->next, upper = window; |
9614
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3586 if (!NILP (other) |
34261
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
3587 && !NILP (Veven_window_heights) |
9614
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3588 /* 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
|
3589 && !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
|
3590 && (XFASTINT (XWINDOW (other)->total_lines) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3591 > 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
|
3592 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3593 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
|
3594 + XFASTINT (XWINDOW (window)->total_lines)); |
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
3595 enlarge_window (upper, |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3596 total / 2 - XFASTINT (XWINDOW (upper)->total_lines), |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
3597 0); |
9614
e466cdfd962e
(Fdisplay_buffer): If the other window is smaller
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
3598 } |
265 | 3599 } |
3600 } | |
3601 else | |
66598
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
3602 window = Fget_lru_window (Qnil, Qnil); |
265 | 3603 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3604 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
|
3605 return display_buffer_1 (window); |
265 | 3606 } |
3607 | |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3608 |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3609 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
|
3610 0, 1, 0, |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3611 doc: /* Force redisplay of all windows. |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3612 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
|
3613 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
|
3614 displaying that buffer. */) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3615 (object) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3616 Lisp_Object object; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3617 { |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3618 if (NILP (object)) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3619 { |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3620 windows_or_buffers_changed++; |
54178
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
3621 update_mode_lines++; |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3622 return Qt; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3623 } |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3624 |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3625 if (WINDOWP (object)) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3626 { |
54178
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
3627 struct window *w = XWINDOW (object); |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3628 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
|
3629 w->update_mode_line = Qt; |
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
3630 if (BUFFERP (w->buffer)) |
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
3631 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
|
3632 ++update_mode_lines; |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3633 return Qt; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3634 } |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
3635 |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3636 if (STRINGP (object)) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3637 object = Fget_buffer (object); |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3638 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
|
3639 { |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3640 /* 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
|
3641 of each of those windows. */ |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3642 |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3643 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
|
3644 return NILP (object) ? Qnil : Qt; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3645 } |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3646 |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3647 /* 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
|
3648 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
|
3649 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
|
3650 return Qnil; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3651 } |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3652 |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3653 |
265 | 3654 void |
3655 temp_output_buffer_show (buf) | |
3656 register Lisp_Object buf; | |
3657 { | |
3658 register struct buffer *old = current_buffer; | |
3659 register Lisp_Object window; | |
3660 register struct window *w; | |
3661 | |
18493
d65021d5c39e
(temp_output_buffer_show): Copy default-directory from current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18065
diff
changeset
|
3662 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
|
3663 |
265 | 3664 Fset_buffer (buf); |
10302
34556316a48a
(temp_output_buffer_show): Use BUF_SAVE_MODIFF.
Richard M. Stallman <rms@gnu.org>
parents:
10043
diff
changeset
|
3665 BUF_SAVE_MODIFF (XBUFFER (buf)) = MODIFF; |
265 | 3666 BEGV = BEG; |
3667 ZV = Z; | |
3668 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
|
3669 #if 0 /* rms: there should be no reason for this. */ |
25375 | 3670 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
|
3671 #endif |
265 | 3672 set_buffer_internal (old); |
3673 | |
67234
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
3674 if (!NILP (Vtemp_buffer_show_function)) |
265 | 3675 call1 (Vtemp_buffer_show_function, buf); |
3676 else | |
3677 { | |
20867
fccf74829150
(Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
20777
diff
changeset
|
3678 window = Fdisplay_buffer (buf, Qnil, Qnil); |
265 | 3679 |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3680 if (!EQ (XWINDOW (window)->frame, selected_frame)) |
769 | 3681 Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window))); |
265 | 3682 Vminibuf_scroll_window = window; |
3683 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
|
3684 XSETFASTINT (w->hscroll, 0); |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
3685 XSETFASTINT (w->min_hscroll, 0); |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3686 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
|
3687 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
|
3688 |
22149
ad3ee5ec90d1
(Fselect_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
21844
diff
changeset
|
3689 /* 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
|
3690 and its buffer current. */ |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3691 |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3692 if (!NILP (Vrun_hooks) |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3693 && !NILP (Fboundp (Qtemp_buffer_show_hook)) |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3694 && !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
|
3695 { |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3696 int count = SPECPDL_INDEX (); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3697 Lisp_Object prev_window, prev_buffer; |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3698 prev_window = selected_window; |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3699 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
|
3700 |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3701 /* 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
|
3702 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
|
3703 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
|
3704 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
|
3705 record_unwind_protect (Fset_buffer, prev_buffer); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3706 record_unwind_protect (select_window_norecord, prev_window); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3707 Fselect_window (window, Qt); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3708 Fset_buffer (w->buffer); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3709 call1 (Vrun_hooks, Qtemp_buffer_show_hook); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3710 unbind_to (count, Qnil); |
11405
645e3883da72
(temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents:
11307
diff
changeset
|
3711 } |
645e3883da72
(temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents:
11307
diff
changeset
|
3712 } |
265 | 3713 } |
3714 | |
21514 | 3715 static void |
265 | 3716 make_dummy_parent (window) |
3717 Lisp_Object window; | |
3718 { | |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3719 Lisp_Object new; |
265 | 3720 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
|
3721 int i; |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3722 |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3723 o = XWINDOW (window); |
36432
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
3724 p = allocate_window (); |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3725 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
|
3726 ((struct Lisp_Vector *) p)->contents[i] |
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
3727 = ((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
|
3728 XSETWINDOW (new, p); |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3729 |
58265
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
3730 ++sequence_number; |
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
3731 XSETFASTINT (p->sequence_number, sequence_number); |
265 | 3732 |
3733 /* Put new into window structure in place of window */ | |
3734 replace_window (window, new); | |
3735 | |
3736 o->next = Qnil; | |
3737 o->prev = Qnil; | |
3738 o->vchild = Qnil; | |
3739 o->hchild = Qnil; | |
3740 o->parent = new; | |
3741 | |
3742 p->start = Qnil; | |
3743 p->pointm = Qnil; | |
3744 p->buffer = Qnil; | |
3745 } | |
3746 | |
3747 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
|
3748 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
|
3749 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
|
3750 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
|
3751 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
|
3752 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
|
3753 Interactively, all arguments are nil. |
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
3754 |
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
3755 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
|
3756 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
|
3757 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
|
3758 (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
|
3759 Lisp_Object window, size, horflag; |
265 | 3760 { |
3761 register Lisp_Object new; | |
3762 register struct window *o, *p; | |
13723
4e170419e83c
(Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents:
13619
diff
changeset
|
3763 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
|
3764 register int size_int; |
265 | 3765 |
485 | 3766 if (NILP (window)) |
265 | 3767 window = selected_window; |
3768 else | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3769 CHECK_LIVE_WINDOW (window); |
265 | 3770 |
3771 o = XWINDOW (window); | |
13723
4e170419e83c
(Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents:
13619
diff
changeset
|
3772 fo = XFRAME (WINDOW_FRAME (o)); |
265 | 3773 |
13780
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3774 if (NILP (size)) |
265 | 3775 { |
485 | 3776 if (!NILP (horflag)) |
13723
4e170419e83c
(Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents:
13619
diff
changeset
|
3777 /* 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
|
3778 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
|
3779 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
|
3780 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
|
3781 size_int = (XFASTINT (o->total_cols) + 1) >> 1; |
265 | 3782 else |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3783 size_int = XFASTINT (o->total_lines) >> 1; |
265 | 3784 } |
3785 else | |
3786 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3787 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
|
3788 size_int = XINT (size); |
265 | 3789 } |
3790 | |
3791 if (MINI_WINDOW_P (o)) | |
3792 error ("Attempt to split minibuffer window"); | |
25268 | 3793 else if (window_fixed_size_p (o, !NILP (horflag), 0)) |
3794 error ("Attempt to split fixed-size window"); | |
265 | 3795 |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
3796 check_min_window_sizes (); |
265 | 3797 |
485 | 3798 if (NILP (horflag)) |
265 | 3799 { |
13780
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3800 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
|
3801 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
|
3802 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
|
3803 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
|
3804 XFASTINT (o->total_lines) - size_int); |
485 | 3805 if (NILP (o->parent) |
3806 || NILP (XWINDOW (o->parent)->vchild)) | |
265 | 3807 { |
3808 make_dummy_parent (window); | |
3809 new = o->parent; | |
3810 XWINDOW (new)->vchild = window; | |
3811 } | |
3812 } | |
3813 else | |
3814 { | |
13780
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3815 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
|
3816 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
|
3817 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3818 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
|
3819 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
|
3820 XFASTINT (o->total_cols) - size_int); |
485 | 3821 if (NILP (o->parent) |
3822 || NILP (XWINDOW (o->parent)->hchild)) | |
265 | 3823 { |
3824 make_dummy_parent (window); | |
3825 new = o->parent; | |
3826 XWINDOW (new)->hchild = window; | |
3827 } | |
3828 } | |
3829 | |
3830 /* Now we know that window's parent is a vertical combination | |
3831 if we are dividing vertically, or a horizontal combination | |
3832 if we are making side-by-side windows */ | |
3833 | |
3834 windows_or_buffers_changed++; | |
13723
4e170419e83c
(Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents:
13619
diff
changeset
|
3835 FRAME_WINDOW_SIZES_CHANGED (fo) = 1; |
265 | 3836 new = make_window (); |
3837 p = XWINDOW (new); | |
3838 | |
769 | 3839 p->frame = o->frame; |
265 | 3840 p->next = o->next; |
485 | 3841 if (!NILP (p->next)) |
265 | 3842 XWINDOW (p->next)->prev = new; |
3843 p->prev = window; | |
3844 o->next = new; | |
3845 p->parent = o->parent; | |
3846 p->buffer = Qt; | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3847 p->window_end_valid = Qnil; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3848 bzero (&p->last_cursor, sizeof p->last_cursor); |
265 | 3849 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3850 /* Duplicate special geometry settings. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3851 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3852 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
|
3853 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
|
3854 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
|
3855 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
|
3856 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
|
3857 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
|
3858 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
|
3859 |
769 | 3860 /* Apportion the available frame space among the two new windows */ |
265 | 3861 |
485 | 3862 if (!NILP (horflag)) |
265 | 3863 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3864 p->total_lines = o->total_lines; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3865 p->top_line = o->top_line; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3866 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
|
3867 XSETFASTINT (o->total_cols, size_int); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3868 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
|
3869 adjust_window_margins (p); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3870 adjust_window_margins (o); |
265 | 3871 } |
3872 else | |
3873 { | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3874 p->left_col = o->left_col; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3875 p->total_cols = o->total_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3876 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
|
3877 XSETFASTINT (o->total_lines, size_int); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3878 XSETFASTINT (p->top_line, XFASTINT (o->top_line) + size_int); |
265 | 3879 } |
3880 | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3881 /* Adjust glyph matrices. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3882 adjust_glyphs (fo); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3883 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3884 Fset_window_buffer (new, o->buffer, Qt); |
265 | 3885 return new; |
3886 } | |
3887 | |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
3888 DEFUN ("enlarge-window", Fenlarge_window, Senlarge_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
|
3889 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
|
3890 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
|
3891 Interactively, if an argument is not given, make the window one line bigger. |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
3892 If HORIZONTAL is non-nil, enlarge horizontally instead of vertically. |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
3893 This function can delete windows, even the second window, if they get |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
3894 too small. */) |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
3895 (arg, horizontal) |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
3896 Lisp_Object arg, horizontal; |
265 | 3897 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3898 CHECK_NUMBER (arg); |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
3899 enlarge_window (selected_window, XINT (arg), !NILP (horizontal)); |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3900 |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3901 if (! NILP (Vwindow_configuration_change_hook)) |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3902 call1 (Vrun_hooks, Qwindow_configuration_change_hook); |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3903 |
265 | 3904 return Qnil; |
3905 } | |
3906 | |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
3907 DEFUN ("shrink-window", Fshrink_window, Sshrink_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
|
3908 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
|
3909 From program, optional second arg non-nil means shrink sideways arg columns. |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
3910 Interactively, if an argument is not given, make the window one line smaller. Only |
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
3911 siblings to the right or below are changed. */) |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
3912 (arg, side) |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
3913 Lisp_Object arg, side; |
265 | 3914 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3915 CHECK_NUMBER (arg); |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
3916 enlarge_window (selected_window, -XINT (arg), !NILP (side)); |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3917 |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3918 if (! NILP (Vwindow_configuration_change_hook)) |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3919 call1 (Vrun_hooks, Qwindow_configuration_change_hook); |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3920 |
265 | 3921 return Qnil; |
3922 } | |
3923 | |
3924 int | |
3925 window_height (window) | |
3926 Lisp_Object window; | |
3927 { | |
3928 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
|
3929 return WINDOW_TOTAL_LINES (p); |
265 | 3930 } |
3931 | |
3932 int | |
3933 window_width (window) | |
3934 Lisp_Object window; | |
3935 { | |
3936 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
|
3937 return WINDOW_TOTAL_COLS (p); |
265 | 3938 } |
3939 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3940 |
265 | 3941 #define CURBEG(w) \ |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
3942 *(horiz_flag ? &(XWINDOW (w)->left_col) : &(XWINDOW (w)->top_line)) |
265 | 3943 |
3944 #define CURSIZE(w) \ | |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
3945 *(horiz_flag ? &(XWINDOW (w)->total_cols) : &(XWINDOW (w)->total_lines)) |
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
3946 |
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
3947 |
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
3948 /* Enlarge WINDOW by DELTA. |
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
3949 HORIZ_FLAG nonzero means enlarge it horizontally; |
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
3950 zero means do it vertically. |
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
3951 |
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
3952 Siblings of the selected window are resized to fulfill the size |
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
3953 request. If they become too small in the process, they will be |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
3954 deleted. */ |
265 | 3955 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3956 static void |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
3957 enlarge_window (window, delta, horiz_flag) |
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
3958 Lisp_Object window; |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
3959 int delta, horiz_flag; |
265 | 3960 { |
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
3961 Lisp_Object parent, next, prev; |
25268 | 3962 struct window *p; |
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
3963 Lisp_Object *sizep; |
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
3964 int maximum; |
20351 | 3965 int (*sizefun) P_ ((Lisp_Object)) |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
3966 = horiz_flag ? window_width : window_height; |
25268 | 3967 void (*setsizefun) P_ ((Lisp_Object, int, int)) |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
3968 = (horiz_flag ? set_window_width : set_window_height); |
25268 | 3969 |
3970 /* Check values of window_min_width and window_min_height for | |
3971 validity. */ | |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
3972 check_min_window_sizes (); |
265 | 3973 |
25268 | 3974 /* Give up if this window cannot be resized. */ |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
3975 if (window_fixed_size_p (XWINDOW (window), horiz_flag, 1)) |
25268 | 3976 error ("Window is not resizable"); |
3977 | |
3978 /* Find the parent of the selected window. */ | |
265 | 3979 while (1) |
3980 { | |
3981 p = XWINDOW (window); | |
3982 parent = p->parent; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3983 |
485 | 3984 if (NILP (parent)) |
265 | 3985 { |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
3986 if (horiz_flag) |
265 | 3987 error ("No other window to side of this one"); |
3988 break; | |
3989 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3990 |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
3991 if (horiz_flag |
25268 | 3992 ? !NILP (XWINDOW (parent)->hchild) |
485 | 3993 : !NILP (XWINDOW (parent)->vchild)) |
265 | 3994 break; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3995 |
265 | 3996 window = parent; |
3997 } | |
3998 | |
1049
25046e48ce9a
* window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents:
1016
diff
changeset
|
3999 sizep = &CURSIZE (window); |
25046e48ce9a
* window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents:
1016
diff
changeset
|
4000 |
265 | 4001 { |
4002 register int maxdelta; | |
4003 | |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
4004 /* 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
|
4005 |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4006 maxdelta = (!NILP (parent) ? (*sizefun) (parent) - XINT (*sizep) |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4007 /* This is a main window followed by a minibuffer. */ |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4008 : !NILP (p->next) ? ((*sizefun) (p->next) |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4009 - window_min_size (XWINDOW (p->next), |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4010 horiz_flag, 0, 0)) |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4011 /* This is a minibuffer following a main window. */ |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4012 : !NILP (p->prev) ? ((*sizefun) (p->prev) |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4013 - window_min_size (XWINDOW (p->prev), |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4014 horiz_flag, 0, 0)) |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4015 /* This is a frame with only one window, a minibuffer-only |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4016 or a minibufferless frame. */ |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4017 : (delta = 0)); |
265 | 4018 |
4019 if (delta > maxdelta) | |
4020 /* This case traps trying to make the minibuffer | |
769 | 4021 the full frame, or make the only window aside from the |
4022 minibuffer the full frame. */ | |
265 | 4023 delta = maxdelta; |
7618
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
4024 } |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
4025 |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
4026 if (XINT (*sizep) + delta < window_min_size (XWINDOW (window), horiz_flag, 0, 0)) |
7618
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
4027 { |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
4028 delete_window (window); |
432 | 4029 return; |
7618
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
4030 } |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
4031 |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
4032 if (delta == 0) |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
4033 return; |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
4034 |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
4035 /* 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
|
4036 maximum = 0; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4037 for (next = p->next; ! NILP (next); next = XWINDOW (next)->next) |
25254 | 4038 maximum += (*sizefun) (next) - window_min_size (XWINDOW (next), |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
4039 horiz_flag, 0, 0); |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4040 for (prev = p->prev; ! NILP (prev); prev = XWINDOW (prev)->prev) |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4041 maximum += (*sizefun) (prev) - window_min_size (XWINDOW (prev), |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4042 horiz_flag, 0, 0); |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
4043 |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
4044 /* 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
|
4045 if (delta <= maximum) |
265 | 4046 { |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4047 Lisp_Object first_unaffected; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4048 Lisp_Object first_affected; |
25268 | 4049 int fixed_p; |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4050 |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4051 next = p->next; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4052 prev = p->prev; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4053 first_affected = window; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4054 /* 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
|
4055 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
|
4056 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
|
4057 while (delta != 0 |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4058 && (!NILP (next) || !NILP (prev))) |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4059 { |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4060 if (! NILP (next)) |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4061 { |
25254 | 4062 int this_one = ((*sizefun) (next) |
25268 | 4063 - window_min_size (XWINDOW (next), |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
4064 horiz_flag, 0, &fixed_p)); |
25268 | 4065 if (!fixed_p) |
4066 { | |
4067 if (this_one > delta) | |
4068 this_one = delta; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4069 |
25268 | 4070 (*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
|
4071 (*setsizefun) (window, XINT (*sizep) + this_one, 0); |
25268 | 4072 |
4073 delta -= this_one; | |
4074 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4075 |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4076 next = XWINDOW (next)->next; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4077 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4078 |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4079 if (delta == 0) |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4080 break; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4081 |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4082 if (! NILP (prev)) |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4083 { |
25254 | 4084 int this_one = ((*sizefun) (prev) |
25268 | 4085 - window_min_size (XWINDOW (prev), |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
4086 horiz_flag, 0, &fixed_p)); |
25268 | 4087 if (!fixed_p) |
4088 { | |
4089 if (this_one > delta) | |
4090 this_one = delta; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4091 |
25268 | 4092 first_affected = prev; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4093 |
25268 | 4094 (*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
|
4095 (*setsizefun) (window, XINT (*sizep) + this_one, 0); |
25268 | 4096 |
4097 delta -= this_one; | |
4098 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4099 |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4100 prev = XWINDOW (prev)->prev; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4101 } |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4102 } |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4103 |
25268 | 4104 xassert (delta == 0); |
4105 | |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4106 /* 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
|
4107 based on the new sizes. */ |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4108 first_unaffected = next; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4109 prev = first_affected; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4110 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
|
4111 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
|
4112 { |
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
4113 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
|
4114 /* 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
|
4115 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
|
4116 (*setsizefun) (next, (*sizefun) (next), 0); |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4117 } |
265 | 4118 } |
4119 else | |
4120 { | |
4121 register int delta1; | |
4122 register int opht = (*sizefun) (parent); | |
4123 | |
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
4124 if (opht <= XINT (*sizep) + delta) |
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4125 { |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4126 /* 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
|
4127 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
|
4128 Lisp_Object start, tem, next; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4129 |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4130 start = XWINDOW (parent)->vchild; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4131 if (NILP (start)) |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4132 start = XWINDOW (parent)->hchild; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4133 |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4134 /* 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
|
4135 tem = XWINDOW (window)->next; |
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4136 while (! NILP (tem)) |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4137 { |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4138 next = XWINDOW (tem)->next; |
42862
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4139 delete_window (tem); |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4140 tem = next; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4141 } |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4142 |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4143 /* 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
|
4144 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
|
4145 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
|
4146 tem = start; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4147 while (! EQ (tem, window)) |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4148 { |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4149 next = XWINDOW (tem)->next; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4150 delete_window (tem); |
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4151 tem = next; |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4152 } |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4153 } |
265 | 4154 else |
25268 | 4155 { |
4156 /* Otherwise, make delta1 just right so that if we add | |
4157 delta1 lines to this window and to the parent, and then | |
4158 shrink the parent back to its original size, the new | |
4159 proportional size of this window will increase by delta. | |
4160 | |
4161 The function size_window will compute the new height h' | |
4162 of the window from delta1 as: | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4163 |
25268 | 4164 e = delta1/n |
4165 x = delta1 - delta1/n * n for the 1st resizable child | |
4166 h' = h + e + x | |
4167 | |
4168 where n is the number of children that can be resized. | |
4169 We can ignore x by choosing a delta1 that is a multiple of | |
4170 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
|
4171 |
25268 | 4172 h' = h + delta |
4173 | |
4174 So, delta1 must be | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4175 |
25268 | 4176 h + e = h + delta |
4177 delta1/n = delta | |
4178 delta1 = n * delta. | |
4179 | |
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
4180 The number of children n equals the number of resizable |
25268 | 4181 children of this window + 1 because we know window itself |
63611
e674f801b65f
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
63187
diff
changeset
|
4182 is resizable (otherwise we would have signalled an error). */ |
25268 | 4183 |
4184 struct window *w = XWINDOW (window); | |
4185 Lisp_Object s; | |
4186 int n = 1; | |
4187 | |
4188 for (s = w->next; !NILP (s); s = XWINDOW (s)->next) | |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
4189 if (!window_fixed_size_p (XWINDOW (s), horiz_flag, 0)) |
25268 | 4190 ++n; |
4191 for (s = w->prev; !NILP (s); s = XWINDOW (s)->prev) | |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
4192 if (!window_fixed_size_p (XWINDOW (s), horiz_flag, 0)) |
25268 | 4193 ++n; |
4194 | |
4195 delta1 = n * delta; | |
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4196 |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4197 /* 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
|
4198 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
|
4199 XSETINT (CURSIZE (parent), opht + delta1); |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4200 (*setsizefun) (window, XINT (*sizep) + delta1, 0); |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4201 |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4202 /* 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
|
4203 shriking this window and siblings proportionately. |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4204 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
|
4205 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
|
4206 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
|
4207 (*setsizefun) (parent, opht, 0); |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4208 |
25268 | 4209 } |
265 | 4210 } |
4211 | |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
4212 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
|
4213 XSETFASTINT (p->last_overlay_modified, 0); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4214 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4215 /* Adjust glyph matrices. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4216 adjust_glyphs (XFRAME (WINDOW_FRAME (XWINDOW (window)))); |
265 | 4217 } |
25254 | 4218 |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4219 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4220 /* Adjust the size of WINDOW by DELTA, moving only its trailing edge. |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4221 HORIZ_FLAG nonzero means adjust the width, moving the right edge. |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4222 zero means adjust the height, moving the bottom edge. |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4223 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4224 Following siblings of the selected window are resized to fulfill |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4225 the size request. If they become too small in the process, they |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4226 are not deleted; instead, we signal an error. */ |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4227 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4228 static void |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4229 adjust_window_trailing_edge (window, delta, horiz_flag) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4230 Lisp_Object window; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4231 int delta, horiz_flag; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4232 { |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4233 Lisp_Object parent, child; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4234 struct window *p; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4235 Lisp_Object old_config = Fcurrent_window_configuration (Qnil); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4236 int delcount = window_deletion_count; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4237 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4238 /* Check values of window_min_width and window_min_height for |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4239 validity. */ |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4240 check_min_window_sizes (); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4241 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4242 if (NILP (window)) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4243 window = Fselected_window (); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4244 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4245 CHECK_WINDOW (window); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4246 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4247 /* Give up if this window cannot be resized. */ |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4248 if (window_fixed_size_p (XWINDOW (window), horiz_flag, 1)) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4249 error ("Window is not resizable"); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4250 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4251 while (1) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4252 { |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4253 p = XWINDOW (window); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4254 parent = p->parent; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4255 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4256 /* Make sure there is a following window. */ |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4257 if (NILP (parent) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4258 && (horiz_flag ? 1 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4259 : NILP (XWINDOW (window)->next))) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4260 { |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4261 Fset_window_configuration (old_config); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4262 error ("No other window following this one"); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4263 } |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4264 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4265 /* Don't make this window too small. */ |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4266 if (XINT (CURSIZE (window)) + delta |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4267 < (horiz_flag ? window_min_width : window_min_height)) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4268 { |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4269 Fset_window_configuration (old_config); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4270 error ("Cannot adjust window size as specified"); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4271 } |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4272 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4273 /* Clear out some redisplay caches. */ |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4274 XSETFASTINT (p->last_modified, 0); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4275 XSETFASTINT (p->last_overlay_modified, 0); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4276 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4277 /* Adjust this window's edge. */ |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4278 XSETINT (CURSIZE (window), |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4279 XINT (CURSIZE (window)) + delta); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4280 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4281 /* If this window has following siblings in the desired dimension, |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4282 make them smaller. |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4283 (If we reach the top of the tree and can never do this, |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4284 we will fail and report an error, above.) */ |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4285 if (horiz_flag |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4286 ? !NILP (XWINDOW (parent)->hchild) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4287 : !NILP (XWINDOW (parent)->vchild)) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4288 { |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4289 if (!NILP (XWINDOW (window)->next)) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4290 { |
68724
fb5a31085a6f
* window.c (adjust_window_trailing_edge): Check that shrinking
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
4291 /* This may happen for the minibuffer. In that case |
fb5a31085a6f
* window.c (adjust_window_trailing_edge): Check that shrinking
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
4292 the window_deletion_count check below does not work. */ |
68971
f8b092ff513c
(Fset_window_scroll_bars): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
68724
diff
changeset
|
4293 if (XINT (CURSIZE (p->next)) - delta <= 0) |
68724
fb5a31085a6f
* window.c (adjust_window_trailing_edge): Check that shrinking
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
4294 { |
fb5a31085a6f
* window.c (adjust_window_trailing_edge): Check that shrinking
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
4295 Fset_window_configuration (old_config); |
fb5a31085a6f
* window.c (adjust_window_trailing_edge): Check that shrinking
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
4296 error ("Cannot adjust window size as specified"); |
fb5a31085a6f
* window.c (adjust_window_trailing_edge): Check that shrinking
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
4297 } |
fb5a31085a6f
* window.c (adjust_window_trailing_edge): Check that shrinking
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
4298 |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4299 XSETINT (CURBEG (p->next), |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4300 XINT (CURBEG (p->next)) + delta); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4301 size_window (p->next, XINT (CURSIZE (p->next)) - delta, |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4302 horiz_flag, 0); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4303 break; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4304 } |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4305 } |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4306 else |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4307 /* Here we have a chain of parallel siblings, in the other dimension. |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4308 Change the size of the other siblings. */ |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4309 for (child = (horiz_flag |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4310 ? XWINDOW (parent)->vchild |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4311 : XWINDOW (parent)->hchild); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4312 ! NILP (child); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4313 child = XWINDOW (child)->next) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4314 if (! EQ (child, window)) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4315 size_window (child, XINT (CURSIZE (child)) + delta, |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4316 horiz_flag, 0); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4317 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4318 window = parent; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4319 } |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4320 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4321 /* If we made a window so small it got deleted, |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4322 we failed. Report failure. */ |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4323 if (delcount != window_deletion_count) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4324 { |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4325 Fset_window_configuration (old_config); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4326 error ("Cannot adjust window size as specified"); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4327 } |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4328 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4329 /* Adjust glyph matrices. */ |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4330 adjust_glyphs (XFRAME (WINDOW_FRAME (XWINDOW (window)))); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4331 } |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4332 |
265 | 4333 #undef CURBEG |
4334 #undef CURSIZE | |
4335 | |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4336 DEFUN ("adjust-window-trailing-edge", Fadjust_window_trailing_edge, |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4337 Sadjust_window_trailing_edge, 3, 3, 0, |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4338 doc: /* Adjust the bottom or right edge of WINDOW by DELTA. |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4339 If HORIZONTAL is non-nil, that means adjust the width, moving the right edge. |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4340 Otherwise, adjust the height, moving the bottom edge. |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4341 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4342 Following siblings of the selected window are resized to fulfill |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4343 the size request. If they become too small in the process, they |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4344 are not deleted; instead, we signal an error. */) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4345 (window, delta, horizontal) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4346 Lisp_Object window, delta, horizontal; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4347 { |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4348 CHECK_NUMBER (delta); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4349 adjust_window_trailing_edge (window, XINT (delta), !NILP (horizontal)); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4350 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4351 if (! NILP (Vwindow_configuration_change_hook)) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4352 call1 (Vrun_hooks, Qwindow_configuration_change_hook); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4353 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4354 return Qnil; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4355 } |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4356 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4357 |
25792
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 Resizing Mini-Windows |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4361 ***********************************************************************/ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4362 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4363 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
|
4364 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4365 enum save_restore_action |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4366 { |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4367 CHECK_ORIG_SIZES, |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4368 SAVE_ORIG_SIZES, |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4369 RESTORE_ORIG_SIZES |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4370 }; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4371 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4372 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
|
4373 enum save_restore_action)); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4374 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4375 /* 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
|
4376 from lowest windows first. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4377 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4378 static void |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4379 shrink_window_lowest_first (w, height) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4380 struct window *w; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4381 int height; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4382 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4383 struct window *c; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4384 Lisp_Object child; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4385 int old_height; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4386 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4387 xassert (!MINI_WINDOW_P (w)); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4388 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4389 /* Set redisplay hints. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4390 XSETFASTINT (w->last_modified, 0); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4391 XSETFASTINT (w->last_overlay_modified, 0); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4392 windows_or_buffers_changed++; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4393 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
|
4394 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4395 old_height = XFASTINT (w->total_lines); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4396 XSETFASTINT (w->total_lines, height); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4397 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4398 if (!NILP (w->hchild)) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4399 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4400 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
|
4401 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4402 c = XWINDOW (child); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4403 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
|
4404 shrink_window_lowest_first (c, height); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4405 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4406 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4407 else if (!NILP (w->vchild)) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4408 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4409 Lisp_Object last_child; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4410 int delta = old_height - height; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4411 int last_top; |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
4412 |
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
4413 last_child = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4414 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4415 /* 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
|
4416 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
|
4417 backwards. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4418 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
|
4419 last_child = child; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4420 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4421 /* 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
|
4422 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
|
4423 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4424 int this_one; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4425 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4426 c = XWINDOW (child); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4427 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
|
4428 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4429 if (this_one > delta) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4430 this_one = delta; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4431 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4432 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
|
4433 delta -= this_one; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4434 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4435 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4436 /* Compute new positions. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4437 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
|
4438 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
|
4439 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4440 c = XWINDOW (child); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4441 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
|
4442 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
|
4443 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
|
4444 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4445 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4446 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4447 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4448 |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4449 /* 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
|
4450 rooted at W. ACTION says what to do. |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4451 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4452 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
|
4453 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
|
4454 tree. Value is non-zero if they are valid. |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4455 |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4456 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
|
4457 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
|
4458 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4459 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
|
4460 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
|
4461 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4462 static int |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4463 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
|
4464 struct window *w; |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4465 enum save_restore_action action; |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4466 { |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4467 int success_p = 1; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4468 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4469 while (w) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4470 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4471 if (!NILP (w->hchild)) |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4472 { |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4473 if (!save_restore_orig_size (XWINDOW (w->hchild), action)) |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4474 success_p = 0; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4475 } |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4476 else if (!NILP (w->vchild)) |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4477 { |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4478 if (!save_restore_orig_size (XWINDOW (w->vchild), action)) |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4479 success_p = 0; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4480 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4481 |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4482 switch (action) |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4483 { |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4484 case CHECK_ORIG_SIZES: |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4485 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
|
4486 return 0; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4487 break; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4488 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4489 case SAVE_ORIG_SIZES: |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4490 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
|
4491 w->orig_total_lines = w->total_lines; |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4492 XSETFASTINT (w->last_modified, 0); |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4493 XSETFASTINT (w->last_overlay_modified, 0); |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4494 break; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4495 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4496 case RESTORE_ORIG_SIZES: |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4497 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
|
4498 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
|
4499 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
|
4500 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
|
4501 XSETFASTINT (w->last_modified, 0); |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4502 XSETFASTINT (w->last_overlay_modified, 0); |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4503 break; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4504 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4505 default: |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4506 abort (); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4507 } |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4508 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4509 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
|
4510 } |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4511 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4512 return success_p; |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4513 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4514 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4515 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4516 /* 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
|
4517 without deleting other windows. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4518 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4519 void |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4520 grow_mini_window (w, delta) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4521 struct window *w; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4522 int delta; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4523 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4524 struct frame *f = XFRAME (w->frame); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4525 struct window *root; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4526 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4527 xassert (MINI_WINDOW_P (w)); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4528 xassert (delta >= 0); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4529 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4530 /* 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
|
4531 validity. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4532 check_min_window_sizes (); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4533 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4534 /* 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
|
4535 other windows. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4536 root = XWINDOW (FRAME_ROOT_WINDOW (f)); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4537 if (delta) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4538 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4539 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
|
4540 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
|
4541 /* 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
|
4542 min_height. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4543 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
|
4544 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4545 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4546 if (delta) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4547 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4548 /* 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
|
4549 if (!save_restore_orig_size (root, CHECK_ORIG_SIZES)) |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4550 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
|
4551 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4552 /* Shrink other windows. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4553 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
|
4554 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4555 /* Grow the mini-window. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4556 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
|
4557 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
|
4558 XSETFASTINT (w->last_modified, 0); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4559 XSETFASTINT (w->last_overlay_modified, 0); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4560 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4561 adjust_glyphs (f); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4562 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4563 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4564 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4565 |
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
4566 /* 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
|
4567 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
|
4568 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
|
4569 line. */ |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4570 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4571 void |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4572 shrink_mini_window (w) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4573 struct window *w; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4574 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4575 struct frame *f = XFRAME (w->frame); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4576 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
|
4577 |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4578 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
|
4579 { |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4580 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
|
4581 adjust_glyphs (f); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4582 FRAME_WINDOW_SIZES_CHANGED (f) = 1; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4583 windows_or_buffers_changed = 1; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4584 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4585 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
|
4586 { |
35621
5f154b8fc2bd
(size_window): Set the window's orig_top to nil when
Gerd Moellmann <gerd@gnu.org>
parents:
35483
diff
changeset
|
4587 /* 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
|
4588 among the other windows. */ |
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
4589 Lisp_Object window; |
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
4590 XSETWINDOW (window, w); |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4591 enlarge_window (window, 1 - XFASTINT (w->total_lines), 0); |
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
4592 } |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4593 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4594 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4595 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4596 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4597 /* 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
|
4598 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
|
4599 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
|
4600 the frame are cleared. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4601 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4602 void |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4603 mark_window_cursors_off (w) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4604 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4605 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4606 while (w) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4607 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4608 if (!NILP (w->hchild)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4609 mark_window_cursors_off (XWINDOW (w->hchild)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4610 else if (!NILP (w->vchild)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4611 mark_window_cursors_off (XWINDOW (w->vchild)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4612 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4613 w->phys_cursor_on_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4614 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4615 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4616 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4617 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4618 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4619 |
37270
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4620 /* Return number of lines of text (not counting mode lines) in W. */ |
265 | 4621 |
4622 int | |
4623 window_internal_height (w) | |
4624 struct window *w; | |
4625 { | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4626 int ht = XFASTINT (w->total_lines); |
265 | 4627 |
37270
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4628 if (!MINI_WINDOW_P (w)) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4629 { |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4630 if (!NILP (w->parent) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4631 || !NILP (w->vchild) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4632 || !NILP (w->hchild) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4633 || !NILP (w->next) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4634 || !NILP (w->prev) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4635 || WINDOW_WANTS_MODELINE_P (w)) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4636 --ht; |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4637 |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4638 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
|
4639 --ht; |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4640 } |
265 | 4641 |
4642 return ht; | |
4643 } | |
4644 | |
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4645 |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4646 /* 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
|
4647 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
|
4648 separating W from the sibling to its right. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4649 |
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4650 int |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4651 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
|
4652 struct window *w; |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4653 { |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4654 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
|
4655 int width = XINT (w->total_cols); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4656 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4657 if (WINDOW_HAS_VERTICAL_SCROLL_BAR (w)) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4658 /* 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
|
4659 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
|
4660 else if (!FRAME_WINDOW_P (f) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4661 && !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
|
4662 /* The column of `|' characters separating side-by-side windows |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4663 occupies one column only. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4664 width -= 1; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4665 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4666 if (FRAME_WINDOW_P (f)) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4667 /* 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
|
4668 used for normal text. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4669 width -= (WINDOW_FRINGE_COLS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4670 + WINDOW_LEFT_MARGIN_COLS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4671 + 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
|
4672 |
701db778b7a4
(Fwindow_edges): Use new WINDOW_RIGHT_EDGE macro.
Richard M. Stallman <rms@gnu.org>
parents:
16208
diff
changeset
|
4673 return width; |
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4674 } |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4675 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4676 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4677 /************************************************************************ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4678 Window Scrolling |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4679 ***********************************************************************/ |
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 /* 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
|
4682 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
|
4683 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
|
4684 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
|
4685 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
|
4686 respectively. */ |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4687 |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4688 static void |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4689 window_scroll (window, n, whole, noerror) |
265 | 4690 Lisp_Object window; |
4691 int n; | |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4692 int whole; |
522 | 4693 int noerror; |
265 | 4694 { |
47865
22b1643144e9
(window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents:
47567
diff
changeset
|
4695 immediate_quit = 1; |
22b1643144e9
(window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents:
47567
diff
changeset
|
4696 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4697 /* 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
|
4698 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
|
4699 if (FRAME_WINDOW_P (XFRAME (XWINDOW (window)->frame))) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4700 window_scroll_pixel_based (window, n, whole, noerror); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4701 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4702 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
|
4703 |
22b1643144e9
(window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents:
47567
diff
changeset
|
4704 immediate_quit = 0; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4705 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4706 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4707 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4708 /* 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
|
4709 heights. See the comment of window_scroll for parameter |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4710 descriptions. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4711 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4712 static void |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4713 window_scroll_pixel_based (window, n, whole, noerror) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4714 Lisp_Object window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4715 int n; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4716 int whole; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4717 int noerror; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4718 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4719 struct it it; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4720 struct window *w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4721 struct text_pos start; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4722 Lisp_Object tem; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4723 int this_scroll_margin; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4724 int preserve_y; |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4725 /* 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
|
4726 int vscrolled = 0; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4727 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4728 SET_TEXT_POS_FROM_MARKER (start, w->start); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4729 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4730 /* 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
|
4731 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
|
4732 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
|
4733 the partially visible one would recenter. */ |
a6f5dfd3e5f4
(window_scroll_pixel_based): Don't recenter if
Gerd Moellmann <gerd@gnu.org>
parents:
38722
diff
changeset
|
4734 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
|
4735 if (NILP (tem)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4736 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4737 /* 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
|
4738 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
|
4739 results for variable height lines. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4740 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
|
4741 it.current_y = it.last_visible_y; |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
4742 move_it_vertically_backward (&it, window_box_height (w) / 2); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4743 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4744 /* 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
|
4745 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
|
4746 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
|
4747 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
|
4748 start of the line containing PT in this case. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4749 if (it.current_y <= 0) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4750 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4751 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID); |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
4752 move_it_vertically_backward (&it, 0); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4753 it.current_y = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4754 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4755 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4756 start = it.current.pos; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4757 } |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4758 else if (auto_window_vscroll_p) |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4759 { |
59700
c401b93db575
* window.c (Fpos_visible_in_window_p): Simplify return value for
Kim F. Storm <storm@cua.dk>
parents:
59695
diff
changeset
|
4760 if (tem = XCAR (XCDR (XCDR (tem))), CONSP (tem)) |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4761 { |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4762 int px; |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4763 int dy = WINDOW_FRAME_LINE_HEIGHT (w); |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4764 if (whole) |
59717
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4765 dy = max ((window_box_height (w) |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4766 - next_screen_context_lines * dy), |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4767 dy); |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4768 dy *= n; |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4769 |
59700
c401b93db575
* window.c (Fpos_visible_in_window_p): Simplify return value for
Kim F. Storm <storm@cua.dk>
parents:
59695
diff
changeset
|
4770 if (n < 0 && (px = XINT (XCAR (tem))) > 0) |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4771 { |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4772 px = max (0, -w->vscroll - min (px, -dy)); |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4773 Fset_window_vscroll (window, make_number (px), Qt); |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4774 return; |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4775 } |
59700
c401b93db575
* window.c (Fpos_visible_in_window_p): Simplify return value for
Kim F. Storm <storm@cua.dk>
parents:
59695
diff
changeset
|
4776 if (n > 0 && (px = XINT (XCDR (tem))) > 0) |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4777 { |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4778 px = max (0, -w->vscroll + min (px, dy)); |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4779 Fset_window_vscroll (window, make_number (px), Qt); |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4780 return; |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4781 } |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4782 } |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4783 Fset_window_vscroll (window, make_number (0), Qt); |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4784 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4785 |
58083 | 4786 /* If scroll_preserve_screen_position is non-nil, we try to set |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4787 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
|
4788 if (!NILP (Vscroll_preserve_screen_position)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4789 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4790 start_display (&it, w, start); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4791 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
|
4792 preserve_y = it.current_y; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4793 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4794 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4795 preserve_y = -1; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4796 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4797 /* 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
|
4798 backward. The result is the new window start. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4799 start_display (&it, w, start); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4800 if (whole) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4801 { |
59717
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4802 int start_pos = IT_CHARPOS (it); |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4803 int dy = WINDOW_FRAME_LINE_HEIGHT (w); |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4804 dy = max ((window_box_height (w) |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4805 - next_screen_context_lines * dy), |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4806 dy) * n; |
34717
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4807 |
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4808 /* 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
|
4809 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
|
4810 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
|
4811 if (dy <= 0) |
59717
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4812 { |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4813 move_it_vertically_backward (&it, -dy); |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4814 /* Ensure we actually does move, e.g. in case we are currently |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4815 looking at an image that is taller that the window height. */ |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4816 while (start_pos == IT_CHARPOS (it) |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4817 && start_pos > BEGV) |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4818 move_it_by_lines (&it, -1, 1); |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4819 } |
34717
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4820 else if (dy > 0) |
59695
75b50deae4e9
(window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents:
59677
diff
changeset
|
4821 { |
75b50deae4e9
(window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents:
59677
diff
changeset
|
4822 move_it_to (&it, ZV, -1, it.current_y + dy, -1, |
75b50deae4e9
(window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents:
59677
diff
changeset
|
4823 MOVE_TO_POS | MOVE_TO_Y); |
75b50deae4e9
(window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents:
59677
diff
changeset
|
4824 /* Ensure we actually does move, e.g. in case we are currently |
75b50deae4e9
(window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents:
59677
diff
changeset
|
4825 looking at an image that is taller that the window height. */ |
75b50deae4e9
(window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents:
59677
diff
changeset
|
4826 while (start_pos == IT_CHARPOS (it) |
75b50deae4e9
(window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents:
59677
diff
changeset
|
4827 && start_pos < ZV) |
75b50deae4e9
(window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents:
59677
diff
changeset
|
4828 move_it_by_lines (&it, 1, 1); |
75b50deae4e9
(window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents:
59677
diff
changeset
|
4829 } |
24997
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 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4832 move_it_by_lines (&it, n, 1); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4833 |
49011
594a08370cb3
(window_scroll_pixel_based): Partially undo last change.
Richard M. Stallman <rms@gnu.org>
parents:
48945
diff
changeset
|
4834 /* 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
|
4835 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
|
4836 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
|
4837 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
|
4838 || (n < 0 && IT_CHARPOS (it) == CHARPOS (start))) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4839 { |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4840 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
|
4841 { |
48945
a96801f68a82
(window_scroll_pixel_based): Fix check for reaching BEGV.
Richard M. Stallman <rms@gnu.org>
parents:
48927
diff
changeset
|
4842 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
|
4843 && (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
|
4844 >= it.last_visible_y)) |
35126
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4845 { |
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4846 /* 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
|
4847 visible. */ |
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4848 w->vscroll = (it.last_visible_y |
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4849 - 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
|
4850 adjust_glyphs (it.f); |
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4851 } |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4852 else if (noerror) |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4853 return; |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4854 else |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4855 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
|
4856 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4857 else |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4858 { |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4859 if (w->vscroll != 0) |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4860 /* 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
|
4861 visible. */ |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4862 w->vscroll = 0; |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4863 else if (noerror) |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4864 return; |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4865 else |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4866 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
|
4867 } |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4868 |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4869 /* 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
|
4870 |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4871 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
|
4872 |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4873 /* 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
|
4874 vscrolled = 1; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4875 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4876 |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4877 if (! vscrolled) |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4878 { |
45562
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
4879 int pos = IT_CHARPOS (it); |
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
4880 int bytepos; |
49836
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4881 |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4882 /* 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
|
4883 the next character. */ |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4884 if (in_display_vector_p (&it)) |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4885 { |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4886 ++pos; |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4887 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
|
4888 } |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4889 |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4890 /* 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
|
4891 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
|
4892 w->buffer); |
45562
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
4893 bytepos = XMARKER (w->start)->bytepos; |
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
4894 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
|
4895 ? Qt : Qnil); |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4896 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
|
4897 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
|
4898 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
|
4899 /* 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
|
4900 window-scroll-functions. */ |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4901 w->force_start = Qt; |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4902 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4903 |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
4904 /* The rest of this function uses current_y in a nonstandard way, |
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
4905 not including the height of the header line if any. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4906 it.current_y = it.vpos = 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4907 |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4908 /* Move PT out of scroll margins. |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4909 This code wants current_y to be zero at the window start position |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4910 even if there is a header line. */ |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4911 this_scroll_margin = max (0, scroll_margin); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4912 this_scroll_margin = min (this_scroll_margin, XFASTINT (w->total_lines) / 4); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4913 this_scroll_margin *= FRAME_LINE_HEIGHT (it.f); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4914 |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4915 if (n > 0) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4916 { |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4917 /* We moved the window start towards ZV, so PT may be now |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4918 in the scroll margin at the top. */ |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4919 move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS); |
63865
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
4920 if (IT_CHARPOS (it) == PT && it.current_y >= this_scroll_margin |
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
4921 && (NILP (Vscroll_preserve_screen_position) |
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
4922 || EQ (Vscroll_preserve_screen_position, Qt))) |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4923 /* We found PT at a legitimate height. Leave it alone. */ |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4924 ; |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4925 else if (preserve_y >= 0) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4926 { |
59342
132e8f3a36a1
(window_scroll_pixel_based): Don't correct preserve_y
Richard M. Stallman <rms@gnu.org>
parents:
59258
diff
changeset
|
4927 /* If we have a header line, take account of it. |
132e8f3a36a1
(window_scroll_pixel_based): Don't correct preserve_y
Richard M. Stallman <rms@gnu.org>
parents:
59258
diff
changeset
|
4928 This is necessary because we set it.current_y to 0, above. */ |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4929 if (WINDOW_WANTS_HEADER_LINE_P (w)) |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4930 preserve_y -= CURRENT_HEADER_LINE_HEIGHT (w); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4931 |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4932 move_it_to (&it, -1, -1, preserve_y, -1, MOVE_TO_Y); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4933 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4934 } |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4935 else |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4936 { |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4937 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
|
4938 { |
6bcf9f9c10df
(window_scroll_pixel_based): Exit the move_it_by_lines
Richard M. Stallman <rms@gnu.org>
parents:
44155
diff
changeset
|
4939 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
|
4940 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
|
4941 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
|
4942 break; |
6bcf9f9c10df
(window_scroll_pixel_based): Exit the move_it_by_lines
Richard M. Stallman <rms@gnu.org>
parents:
44155
diff
changeset
|
4943 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4944 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4945 } |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4946 } |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4947 else if (n < 0) |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4948 { |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4949 int charpos, bytepos; |
60198
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4950 int partial_p; |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4951 |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4952 /* Save our position, for the preserve_y case. */ |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4953 charpos = IT_CHARPOS (it); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4954 bytepos = IT_BYTEPOS (it); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4955 |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4956 /* We moved the window start towards BEGV, so PT may be now |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4957 in the scroll margin at the bottom. */ |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4958 move_it_to (&it, PT, -1, |
63953
5ce023c9db0d
(window_scroll_pixel_based): Take account of this_scroll_margin when
Richard M. Stallman <rms@gnu.org>
parents:
63865
diff
changeset
|
4959 (it.last_visible_y - CURRENT_HEADER_LINE_HEIGHT (w) |
5ce023c9db0d
(window_scroll_pixel_based): Take account of this_scroll_margin when
Richard M. Stallman <rms@gnu.org>
parents:
63865
diff
changeset
|
4960 - this_scroll_margin - 1), |
5ce023c9db0d
(window_scroll_pixel_based): Take account of this_scroll_margin when
Richard M. Stallman <rms@gnu.org>
parents:
63865
diff
changeset
|
4961 -1, |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4962 MOVE_TO_POS | MOVE_TO_Y); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4963 |
60198
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4964 /* Save our position, in case it's correct. */ |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4965 charpos = IT_CHARPOS (it); |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4966 bytepos = IT_BYTEPOS (it); |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4967 |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4968 /* See if point is on a partially visible line at the end. */ |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4969 if (it.what == IT_EOB) |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4970 partial_p = it.current_y + it.ascent + it.descent > it.last_visible_y; |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4971 else |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4972 { |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4973 move_it_by_lines (&it, 1, 1); |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4974 partial_p = it.current_y > it.last_visible_y; |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4975 } |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
4976 |
63865
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
4977 if (charpos == PT && !partial_p |
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
4978 && (NILP (Vscroll_preserve_screen_position) |
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
4979 || EQ (Vscroll_preserve_screen_position, Qt))) |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4980 /* We found PT before we found the display margin, so PT is ok. */ |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4981 ; |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4982 else if (preserve_y >= 0) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4983 { |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4984 SET_TEXT_POS_FROM_MARKER (start, w->start); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4985 start_display (&it, w, start); |
59342
132e8f3a36a1
(window_scroll_pixel_based): Don't correct preserve_y
Richard M. Stallman <rms@gnu.org>
parents:
59258
diff
changeset
|
4986 #if 0 /* It's wrong to subtract this here |
132e8f3a36a1
(window_scroll_pixel_based): Don't correct preserve_y
Richard M. Stallman <rms@gnu.org>
parents:
59258
diff
changeset
|
4987 because we called start_display again |
132e8f3a36a1
(window_scroll_pixel_based): Don't correct preserve_y
Richard M. Stallman <rms@gnu.org>
parents:
59258
diff
changeset
|
4988 and did not alter it.current_y this time. */ |
132e8f3a36a1
(window_scroll_pixel_based): Don't correct preserve_y
Richard M. Stallman <rms@gnu.org>
parents:
59258
diff
changeset
|
4989 |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4990 /* If we have a header line, take account of it. */ |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4991 if (WINDOW_WANTS_HEADER_LINE_P (w)) |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4992 preserve_y -= CURRENT_HEADER_LINE_HEIGHT (w); |
59342
132e8f3a36a1
(window_scroll_pixel_based): Don't correct preserve_y
Richard M. Stallman <rms@gnu.org>
parents:
59258
diff
changeset
|
4993 #endif |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4994 |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4995 move_it_to (&it, -1, -1, preserve_y, -1, MOVE_TO_Y); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4996 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4997 } |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4998 else |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4999 { |
60198
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
5000 if (partial_p) |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5001 /* 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
|
5002 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
|
5003 { |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5004 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
|
5005 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
|
5006 } |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5007 else |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5008 /* 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
|
5009 SET_PT_BOTH (charpos, bytepos); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5010 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5011 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5012 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5013 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5014 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5015 /* 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
|
5016 See the comment of window_scroll for parameter descriptions. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5017 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5018 static void |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5019 window_scroll_line_based (window, n, whole, noerror) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5020 Lisp_Object window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5021 int n; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5022 int whole; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5023 int noerror; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5024 { |
265 | 5025 register struct window *w = XWINDOW (window); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5026 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
|
5027 register int pos, pos_byte; |
265 | 5028 register int ht = window_internal_height (w); |
5029 register Lisp_Object tem; | |
5030 int lose; | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5031 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
|
5032 int startpos; |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5033 struct position posit; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5034 int original_vpos; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5035 |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5036 /* 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
|
5037 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
|
5038 if (whole) |
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5039 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
|
5040 |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5041 startpos = marker_position (w->start); |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5042 |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5043 posit = *compute_motion (startpos, 0, 0, 0, |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5044 PT, ht, 0, |
56585
f2ea7576ac6e
(window_scroll_line_based): Let compute_motion
Kim F. Storm <storm@cua.dk>
parents:
56542
diff
changeset
|
5045 -1, XINT (w->hscroll), |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5046 0, w); |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5047 original_vpos = posit.vpos; |
13102
960db92441d8
(window_scroll): Always set force_start.
Richard M. Stallman <rms@gnu.org>
parents:
12981
diff
changeset
|
5048 |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
5049 XSETFASTINT (tem, PT); |
32773
a7fdbf39d4de
(window_scroll_pixel_based, window_scroll_line_based):
Miles Bader <miles@gnu.org>
parents:
32752
diff
changeset
|
5050 tem = Fpos_visible_in_window_p (tem, window, Qnil); |
265 | 5051 |
485 | 5052 if (NILP (tem)) |
265 | 5053 { |
6341
dfc758dd2b08
(window_scroll, Fmove_to_window_line): Avoid dividing negative numbers,
Karl Heuer <kwzh@gnu.org>
parents:
6326
diff
changeset
|
5054 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
|
5055 startpos = PT; |
265 | 5056 } |
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
|
5057 |
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
|
5058 SET_PT (startpos); |
7347 | 5059 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
|
5060 Fvertical_motion (make_number (n), window); |
7347 | 5061 pos = PT; |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5062 pos_byte = PT_BYTE; |
265 | 5063 bolp = Fbolp (); |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5064 SET_PT_BOTH (opoint, opoint_byte); |
265 | 5065 |
5066 if (lose) | |
522 | 5067 { |
5068 if (noerror) | |
5069 return; | |
5070 else | |
5071 Fsignal (Qbeginning_of_buffer, Qnil); | |
5072 } | |
265 | 5073 |
5074 if (pos < ZV) | |
5075 { | |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5076 int this_scroll_margin = scroll_margin; |
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5077 |
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5078 /* 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
|
5079 if (this_scroll_margin < 0) |
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5080 this_scroll_margin = 0; |
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5081 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5082 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
|
5083 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
|
5084 |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5085 set_marker_restricted_both (w->start, w->buffer, pos, pos_byte); |
265 | 5086 w->start_at_line_beg = bolp; |
5087 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
|
5088 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
|
5089 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
|
5090 /* 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
|
5091 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
|
5092 w->force_start = Qt; |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5093 |
63865
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
5094 if (!NILP (Vscroll_preserve_screen_position) |
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
5095 && (whole || !EQ (Vscroll_preserve_screen_position, Qt))) |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5096 { |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5097 SET_PT_BOTH (pos, pos_byte); |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5098 Fvertical_motion (make_number (original_vpos), window); |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5099 } |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5100 /* 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
|
5101 that it is outside the scroll margin. */ |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5102 else if (n > 0) |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5103 { |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5104 int top_margin; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5105 |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5106 if (this_scroll_margin > 0) |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5107 { |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5108 SET_PT_BOTH (pos, pos_byte); |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5109 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
|
5110 top_margin = PT; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5111 } |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5112 else |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5113 top_margin = pos; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5114 |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5115 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
|
5116 SET_PT_BOTH (opoint, opoint_byte); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5117 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
|
5118 { |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5119 SET_PT_BOTH (pos, pos_byte); |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5120 Fvertical_motion (make_number (original_vpos), window); |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5121 } |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
5122 else |
20046
8baac8399a29
(window_scroll): When scrolling forward and point is
Karl Heuer <kwzh@gnu.org>
parents:
19667
diff
changeset
|
5123 SET_PT (top_margin); |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5124 } |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5125 else if (n < 0) |
265 | 5126 { |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5127 int bottom_margin; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5128 |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5129 /* 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
|
5130 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
|
5131 SET_PT_BOTH (pos, pos_byte); |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5132 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
|
5133 if (XFASTINT (tem) == ht - this_scroll_margin) |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5134 bottom_margin = PT; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5135 else |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5136 bottom_margin = PT + 1; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5137 |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5138 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
|
5139 SET_PT_BOTH (opoint, opoint_byte); |
265 | 5140 else |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5141 { |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5142 if (!NILP (Vscroll_preserve_screen_position)) |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
5143 { |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5144 SET_PT_BOTH (pos, pos_byte); |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
5145 Fvertical_motion (make_number (original_vpos), window); |
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
5146 } |
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
5147 else |
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
5148 Fvertical_motion (make_number (-1), window); |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5149 } |
265 | 5150 } |
5151 } | |
5152 else | |
522 | 5153 { |
5154 if (noerror) | |
5155 return; | |
5156 else | |
5157 Fsignal (Qend_of_buffer, Qnil); | |
5158 } | |
265 | 5159 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5160 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5161 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5162 /* 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
|
5163 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
|
5164 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
|
5165 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
|
5166 up. This is the guts of Fscroll_up and Fscroll_down. */ |
265 | 5167 |
5168 static void | |
5169 scroll_command (n, direction) | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5170 Lisp_Object n; |
265 | 5171 int direction; |
5172 { | |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46271
diff
changeset
|
5173 int count = SPECPDL_INDEX (); |
265 | 5174 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5175 xassert (abs (direction) == 1); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5176 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5177 /* 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
|
5178 the moment. But don't screw up if window_scroll gets an error. */ |
265 | 5179 if (XBUFFER (XWINDOW (selected_window)->buffer) != current_buffer) |
548 | 5180 { |
5181 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
5182 Fset_buffer (XWINDOW (selected_window)->buffer); | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5183 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5184 /* Make redisplay consider other windows than just selected_window. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5185 ++windows_or_buffers_changed; |
548 | 5186 } |
265 | 5187 |
485 | 5188 if (NILP (n)) |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5189 window_scroll (selected_window, direction, 1, 0); |
265 | 5190 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
|
5191 window_scroll (selected_window, -direction, 1, 0); |
265 | 5192 else |
5193 { | |
5194 n = Fprefix_numeric_value (n); | |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5195 window_scroll (selected_window, XINT (n) * direction, 0, 0); |
265 | 5196 } |
548 | 5197 |
5198 unbind_to (count, Qnil); | |
265 | 5199 } |
5200 | |
5201 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
|
5202 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
|
5203 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
|
5204 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
|
5205 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
|
5206 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
|
5207 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
|
5208 (arg) |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5209 Lisp_Object arg; |
265 | 5210 { |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5211 scroll_command (arg, 1); |
265 | 5212 return Qnil; |
5213 } | |
5214 | |
5215 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
|
5216 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
|
5217 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
|
5218 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
|
5219 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
|
5220 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
|
5221 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
|
5222 (arg) |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5223 Lisp_Object arg; |
265 | 5224 { |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5225 scroll_command (arg, -1); |
265 | 5226 return Qnil; |
5227 } | |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5228 |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5229 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
|
5230 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
|
5231 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
|
5232 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
|
5233 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
|
5234 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
|
5235 `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
|
5236 () |
265 | 5237 { |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5238 Lisp_Object window; |
265 | 5239 |
5240 if (MINI_WINDOW_P (XWINDOW (selected_window)) | |
485 | 5241 && !NILP (Vminibuf_scroll_window)) |
265 | 5242 window = Vminibuf_scroll_window; |
5243 /* If buffer is specified, scroll that buffer. */ | |
485 | 5244 else if (!NILP (Vother_window_scroll_buffer)) |
265 | 5245 { |
5246 window = Fget_buffer_window (Vother_window_scroll_buffer, Qnil); | |
485 | 5247 if (NILP (window)) |
20867
fccf74829150
(Fdisplay_buffer): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
20777
diff
changeset
|
5248 window = Fdisplay_buffer (Vother_window_scroll_buffer, Qt, Qnil); |
265 | 5249 } |
5250 else | |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5251 { |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5252 /* 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
|
5253 frame. */ |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5254 window = Fnext_window (selected_window, Qnil, Qnil); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5255 |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5256 if (EQ (window, selected_window)) |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5257 /* 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
|
5258 visible frame. */ |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5259 do |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5260 window = Fnext_window (window, Qnil, Qt); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5261 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
|
5262 && ! EQ (window, selected_window)); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5263 } |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5264 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
5265 CHECK_LIVE_WINDOW (window); |
265 | 5266 |
5267 if (EQ (window, selected_window)) | |
5268 error ("There is no other window"); | |
5269 | |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5270 return window; |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5271 } |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5272 |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5273 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
|
5274 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
|
5275 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
|
5276 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
|
5277 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
|
5278 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
|
5279 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
|
5280 |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
5281 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
|
5282 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
|
5283 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
|
5284 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
|
5285 `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
|
5286 (arg) |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5287 Lisp_Object arg; |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5288 { |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5289 Lisp_Object window; |
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5290 struct window *w; |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46271
diff
changeset
|
5291 int count = SPECPDL_INDEX (); |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5292 |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5293 window = Fother_window_for_scrolling (); |
265 | 5294 w = XWINDOW (window); |
5295 | |
5296 /* Don't screw up if window_scroll gets an error. */ | |
5297 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
|
5298 ++windows_or_buffers_changed; |
265 | 5299 |
5300 Fset_buffer (w->buffer); | |
5301 SET_PT (marker_position (w->pointm)); | |
5302 | |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5303 if (NILP (arg)) |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5304 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
|
5305 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
|
5306 window_scroll (window, -1, 1, 1); |
265 | 5307 else |
5308 { | |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5309 if (CONSP (arg)) |
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5310 arg = Fcar (arg); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
5311 CHECK_NUMBER (arg); |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5312 window_scroll (window, XINT (arg), 0, 1); |
265 | 5313 } |
5314 | |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5315 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
|
5316 unbind_to (count, Qnil); |
265 | 5317 |
5318 return Qnil; | |
5319 } | |
5320 | |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5321 DEFUN ("scroll-left", Fscroll_left, Sscroll_left, 0, 2, "P\np", |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5322 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
|
5323 Default for ARG is window width minus 2. |
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
5324 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
|
5325 effect after the change. |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5326 If SET_MINIMUM is non-nil, the new scroll amount becomes the |
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5327 lower bound for automatic scrolling, i.e. automatic scrolling |
40459
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
5328 will not scroll a window to a column less than the value returned |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5329 by this function. This happens in an interactive call. */) |
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5330 (arg, set_minimum) |
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5331 register Lisp_Object arg, set_minimum; |
265 | 5332 { |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5333 Lisp_Object result; |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5334 int hscroll; |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5335 struct window *w = XWINDOW (selected_window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5336 |
485 | 5337 if (NILP (arg)) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5338 XSETFASTINT (arg, window_box_text_cols (w) - 2); |
265 | 5339 else |
5340 arg = Fprefix_numeric_value (arg); | |
5341 | |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5342 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
|
5343 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
|
5344 |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5345 if (!NILP (set_minimum)) |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5346 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
|
5347 |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5348 return result; |
265 | 5349 } |
5350 | |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5351 DEFUN ("scroll-right", Fscroll_right, Sscroll_right, 0, 2, "P\np", |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5352 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
|
5353 Default for ARG is window width minus 2. |
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
5354 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
|
5355 effect after the change. |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5356 If SET_MINIMUM is non-nil, the new scroll amount becomes the |
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5357 lower bound for automatic scrolling, i.e. automatic scrolling |
40459
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
5358 will not scroll a window to a column less than the value returned |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5359 by this function. This happens in an interactive call. */) |
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5360 (arg, set_minimum) |
57898
f85e0cc87926
(Fscroll_right): Fix last change.
Andreas Schwab <schwab@suse.de>
parents:
57874
diff
changeset
|
5361 register Lisp_Object arg, set_minimum; |
265 | 5362 { |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5363 Lisp_Object result; |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5364 int hscroll; |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5365 struct window *w = XWINDOW (selected_window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5366 |
485 | 5367 if (NILP (arg)) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5368 XSETFASTINT (arg, window_box_text_cols (w) - 2); |
265 | 5369 else |
5370 arg = Fprefix_numeric_value (arg); | |
5371 | |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5372 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
|
5373 result = Fset_window_hscroll (selected_window, make_number (hscroll)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5374 |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5375 if (!NILP (set_minimum)) |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5376 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
|
5377 |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5378 return result; |
265 | 5379 } |
5380 | |
43624
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5381 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
|
5382 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
|
5383 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
|
5384 () |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5385 { |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5386 if (minibuf_level > 0 |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5387 && MINI_WINDOW_P (XWINDOW (selected_window)) |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5388 && WINDOW_LIVE_P (minibuf_selected_window)) |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5389 return minibuf_selected_window; |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5390 |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5391 return Qnil; |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5392 } |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5393 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5394 /* 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
|
5395 as opposed to its height. */ |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5396 |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5397 static int |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5398 displayed_window_lines (w) |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5399 struct window *w; |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5400 { |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5401 struct it it; |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5402 struct text_pos start; |
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
5403 int height = window_box_height (w); |
33059
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5404 struct buffer *old_buffer; |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5405 int bottom_y; |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5406 |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5407 if (XBUFFER (w->buffer) != current_buffer) |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5408 { |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5409 old_buffer = current_buffer; |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5410 set_buffer_internal (XBUFFER (w->buffer)); |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5411 } |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5412 else |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5413 old_buffer = NULL; |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5414 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5415 /* 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
|
5416 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
|
5417 calls (recenter -1) while W->start is 1. */ |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5418 if (XMARKER (w->start)->charpos < BEGV) |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5419 SET_TEXT_POS (start, BEGV, BEGV_BYTE); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5420 else if (XMARKER (w->start)->charpos > ZV) |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5421 SET_TEXT_POS (start, ZV, ZV_BYTE); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5422 else |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5423 SET_TEXT_POS_FROM_MARKER (start, w->start); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5424 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5425 start_display (&it, w, start); |
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
5426 move_it_vertically (&it, height); |
36202
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5427 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
|
5428 |
47234
ca48173ebf57
(displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents:
46410
diff
changeset
|
5429 /* 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
|
5430 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
|
5431 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
|
5432 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
|
5433 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
|
5434 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
|
5435 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
|
5436 height++; |
ca48173ebf57
(displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents:
46410
diff
changeset
|
5437 |
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
5438 /* 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
|
5439 if (bottom_y < height) |
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
5440 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5441 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
|
5442 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
|
5443 } |
34384
9669bb49fca2
(Fmove_to_window_line): Skip past any partially visible first line.
Miles Bader <miles@gnu.org>
parents:
34381
diff
changeset
|
5444 |
36202
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5445 if (old_buffer) |
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5446 set_buffer_internal (old_buffer); |
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5447 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5448 return it.vpos; |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5449 } |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5450 |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5451 |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5452 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
|
5453 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
|
5454 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
|
5455 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
|
5456 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
|
5457 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5458 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
|
5459 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
|
5460 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
|
5461 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
|
5462 (arg) |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5463 register Lisp_Object arg; |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5464 { |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5465 struct window *w = XWINDOW (selected_window); |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5466 struct buffer *buf = XBUFFER (w->buffer); |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5467 struct buffer *obuf = current_buffer; |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5468 int center_p = 0; |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5469 int charpos, bytepos; |
64114
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5470 int iarg; |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5471 int this_scroll_margin; |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5472 |
42089
ca7101bea5ee
(Frecenter): Clear display_error_modiff field.
Richard M. Stallman <rms@gnu.org>
parents:
41980
diff
changeset
|
5473 /* 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
|
5474 obuf->display_error_modiff = 0; |
ca7101bea5ee
(Frecenter): Clear display_error_modiff field.
Richard M. Stallman <rms@gnu.org>
parents:
41980
diff
changeset
|
5475 |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5476 if (NILP (arg)) |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5477 { |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5478 int i; |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5479 |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5480 /* Invalidate pixel data calculated for all compositions. */ |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5481 for (i = 0; i < n_compositions; i++) |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5482 composition_table[i]->font = NULL; |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5483 |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5484 Fredraw_frame (w->frame); |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5485 SET_FRAME_GARBAGED (XFRAME (WINDOW_FRAME (w))); |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5486 center_p = 1; |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5487 } |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5488 else if (CONSP (arg)) /* Just C-u. */ |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5489 center_p = 1; |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5490 else |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5491 { |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5492 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
|
5493 CHECK_NUMBER (arg); |
64133
7e06f331c228
(Frecenter): Fix last change (set iarg before use).
Kim F. Storm <storm@cua.dk>
parents:
64114
diff
changeset
|
5494 iarg = XINT (arg); |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5495 } |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5496 |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5497 set_buffer_internal (buf); |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5498 |
64114
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5499 /* Do this after making BUF current |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5500 in case scroll_margin is buffer-local. */ |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5501 this_scroll_margin = max (0, scroll_margin); |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5502 this_scroll_margin = min (this_scroll_margin, |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5503 XFASTINT (w->total_lines) / 4); |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5504 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5505 /* 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
|
5506 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
|
5507 line counts would lead to strange effects. */ |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5508 if (FRAME_WINDOW_P (XFRAME (w->frame))) |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5509 { |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5510 if (center_p) |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5511 { |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5512 struct it it; |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5513 struct text_pos pt; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5514 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5515 SET_TEXT_POS (pt, PT, PT_BYTE); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5516 start_display (&it, w, pt); |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5517 move_it_vertically_backward (&it, window_box_height (w) / 2); |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5518 charpos = IT_CHARPOS (it); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5519 bytepos = IT_BYTEPOS (it); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5520 } |
64114
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5521 else if (iarg < 0) |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5522 { |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5523 struct it it; |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5524 struct text_pos pt; |
64114
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5525 int nlines = -iarg; |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5526 int extra_line_spacing; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5527 int h = window_box_height (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5528 |
64114
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5529 iarg = - max (-iarg, this_scroll_margin); |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5530 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5531 SET_TEXT_POS (pt, PT, PT_BYTE); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5532 start_display (&it, w, pt); |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5533 |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5534 /* Be sure we have the exact height of the full line containing PT. */ |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5535 move_it_by_lines (&it, 0, 1); |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5536 |
38722
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
5537 /* 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
|
5538 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
|
5539 and the lines below. */ |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5540 it.current_y = 0; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5541 it.vpos = 0; |
38722
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
5542 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
|
5543 |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5544 if (it.vpos == nlines) |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5545 h -= it.current_y; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5546 else |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5547 { |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5548 /* Last line has no newline */ |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5549 h -= line_bottom_y (&it); |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5550 it.vpos++; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5551 } |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5552 |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5553 /* Don't reserve space for extra line spacing of last line. */ |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5554 extra_line_spacing = it.max_extra_line_spacing; |
38722
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
5555 |
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
5556 /* 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
|
5557 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
|
5558 if (it.vpos < nlines) |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5559 { |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5560 nlines -= it.vpos; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5561 extra_line_spacing = it.extra_line_spacing; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5562 h -= nlines * (FRAME_LINE_HEIGHT (it.f) + extra_line_spacing); |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5563 } |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5564 if (h <= 0) |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5565 return Qnil; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5566 |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5567 /* Now find the new top line (starting position) of the window. */ |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5568 start_display (&it, w, pt); |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5569 it.current_y = 0; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5570 move_it_vertically_backward (&it, h); |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5571 |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5572 /* If extra line spacing is present, we may move too far |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5573 back. This causes the last line to be only partially |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5574 visible (which triggers redisplay to recenter that line |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5575 in the middle), so move forward. |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5576 But ignore extra line spacing on last line, as it is not |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5577 considered to be part of the visible height of the line. |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5578 */ |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5579 h += extra_line_spacing; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5580 while (-it.current_y > h) |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5581 move_it_by_lines (&it, 1, 1); |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5582 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5583 charpos = IT_CHARPOS (it); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5584 bytepos = IT_BYTEPOS (it); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5585 } |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5586 else |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5587 { |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5588 struct position pos; |
64114
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5589 |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5590 iarg = max (iarg, this_scroll_margin); |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5591 |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5592 pos = *vmotion (PT, -iarg, w); |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5593 charpos = pos.bufpos; |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5594 bytepos = pos.bytepos; |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5595 } |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5596 } |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5597 else |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5598 { |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5599 struct position pos; |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5600 int ht = window_internal_height (w); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5601 |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5602 if (center_p) |
64236
667d6d6c7fd9
(Frecenter): Yet another int/Lisp_Object mixup (YAILOM).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64134
diff
changeset
|
5603 iarg = ht / 2; |
64134
0fcb7f3236c9
(Frecenter): Remove superfluous settings of iarg.
Kim F. Storm <storm@cua.dk>
parents:
64133
diff
changeset
|
5604 else if (iarg < 0) |
0fcb7f3236c9
(Frecenter): Remove superfluous settings of iarg.
Kim F. Storm <storm@cua.dk>
parents:
64133
diff
changeset
|
5605 iarg += ht; |
64114
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5606 |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5607 /* Don't let it get into the margin at either top or bottom. */ |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5608 iarg = max (iarg, this_scroll_margin); |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5609 iarg = min (iarg, ht - this_scroll_margin - 1); |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5610 |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5611 pos = *vmotion (PT, - iarg, w); |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5612 charpos = pos.bufpos; |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5613 bytepos = pos.bytepos; |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5614 } |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5615 |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5616 /* Set the new window start. */ |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5617 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
|
5618 w->window_end_valid = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5619 |
46108
7b8b4ec9573c
(Frecenter): With arg, set optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
46021
diff
changeset
|
5620 w->optional_new_start = Qt; |
7b8b4ec9573c
(Frecenter): With arg, set optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
46021
diff
changeset
|
5621 |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5622 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
|
5623 w->start_at_line_beg = Qt; |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5624 else |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5625 w->start_at_line_beg = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5626 |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5627 set_buffer_internal (obuf); |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5628 return Qnil; |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5629 } |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5630 |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5631 |
34416
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5632 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
|
5633 0, 1, 0, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5634 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
|
5635 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
|
5636 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
|
5637 (window) |
34416
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5638 Lisp_Object window; |
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5639 { |
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5640 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
|
5641 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
|
5642 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
|
5643 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
|
5644 } |
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5645 |
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5646 |
265 | 5647 |
5648 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
|
5649 1, 1, "P", |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5650 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
|
5651 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
|
5652 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
|
5653 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
|
5654 (arg) |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5655 Lisp_Object arg; |
265 | 5656 { |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5657 struct window *w = XWINDOW (selected_window); |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5658 int lines, start; |
6326
5e662ad3f594
(Fdelete_other_windows): Pass new arg to Fvertical_motion.
Richard M. Stallman <rms@gnu.org>
parents:
6269
diff
changeset
|
5659 Lisp_Object window; |
64114
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5660 #if 0 |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5661 int this_scroll_margin; |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5662 #endif |
265 | 5663 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5664 window = selected_window; |
265 | 5665 start = marker_position (w->start); |
5666 if (start < BEGV || start > ZV) | |
5667 { | |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5668 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
|
5669 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
|
5670 set_marker_both (w->start, w->buffer, PT, PT_BYTE); |
265 | 5671 w->start_at_line_beg = Fbolp (); |
5672 w->force_start = Qt; | |
5673 } | |
5674 else | |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5675 Fgoto_char (w->start); |
265 | 5676 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5677 lines = displayed_window_lines (w); |
64114
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5678 |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5679 #if 0 |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5680 this_scroll_margin = max (0, scroll_margin); |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5681 this_scroll_margin = min (this_scroll_margin, lines / 4); |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5682 #endif |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5683 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5684 if (NILP (arg)) |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5685 XSETFASTINT (arg, lines / 2); |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5686 else |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5687 { |
64114
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5688 int iarg = XINT (Fprefix_numeric_value (arg)); |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5689 |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5690 if (iarg < 0) |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5691 iarg = iarg + lines; |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5692 |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5693 #if 0 /* This code would prevent move-to-window-line from moving point |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5694 to a place inside the scroll margins (which would cause the |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5695 next redisplay to scroll). I wrote this code, but then concluded |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5696 it is probably better not to install it. However, it is here |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5697 inside #if 0 so as not to lose it. -- rms. */ |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5698 |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5699 /* Don't let it get into the margin at either top or bottom. */ |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5700 iarg = max (iarg, this_scroll_margin); |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5701 iarg = min (iarg, lines - this_scroll_margin - 1); |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5702 #endif |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5703 |
51f6009d047b
(Frecenter): When arg is inside the scroll margin, move it out of the margin.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
5704 arg = make_number (iarg); |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5705 } |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5706 |
36202
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5707 /* 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
|
5708 if (w->vscroll) |
9669bb49fca2
(Fmove_to_window_line): Skip past any partially visible first line.
Miles Bader <miles@gnu.org>
parents:
34381
diff
changeset
|
5709 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
|
5710 |
6326
5e662ad3f594
(Fdelete_other_windows): Pass new arg to Fvertical_motion.
Richard M. Stallman <rms@gnu.org>
parents:
6269
diff
changeset
|
5711 return Fvertical_motion (arg, window); |
265 | 5712 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5713 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5714 |
265 | 5715 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5716 /*********************************************************************** |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5717 Window Configuration |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5718 ***********************************************************************/ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5719 |
265 | 5720 struct save_window_data |
5721 { | |
15712
a272ccf6c225
(struct save_window_data, struct saved_window): First
Karl Heuer <kwzh@gnu.org>
parents:
15385
diff
changeset
|
5722 EMACS_INT size_from_Lisp_Vector_struct; |
265 | 5723 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
|
5724 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
|
5725 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
|
5726 Lisp_Object selected_frame; |
265 | 5727 Lisp_Object current_window; |
5728 Lisp_Object current_buffer; | |
5729 Lisp_Object minibuf_scroll_window; | |
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
5730 Lisp_Object minibuf_selected_window; |
265 | 5731 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
|
5732 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
|
5733 /* 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
|
5734 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
|
5735 Lisp_Object min_width, min_height; |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5736 /* 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
|
5737 for one window. */ |
265 | 5738 Lisp_Object saved_windows; |
5739 }; | |
1326
709532b86646
* window.c (SAVE_WINDOW_DATA_SIZE): Define this using sizeof,
Jim Blandy <jimb@redhat.com>
parents:
1325
diff
changeset
|
5740 |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5741 /* This is saved as a Lisp_Vector */ |
265 | 5742 struct saved_window |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5743 { |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5744 /* 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
|
5745 EMACS_INT size_from_Lisp_Vector_struct; |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5746 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
|
5747 |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5748 Lisp_Object window; |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5749 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
|
5750 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
|
5751 Lisp_Object hscroll, min_hscroll; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5752 Lisp_Object parent, prev; |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5753 Lisp_Object start_at_line_beg; |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5754 Lisp_Object display_table; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5755 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
|
5756 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
|
5757 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
|
5758 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
|
5759 }; |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5760 |
265 | 5761 #define SAVED_WINDOW_N(swv,n) \ |
5762 ((struct saved_window *) (XVECTOR ((swv)->contents[(n)]))) | |
5763 | |
5764 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
|
5765 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
|
5766 (object) |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5767 Lisp_Object object; |
265 | 5768 { |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5769 if (WINDOW_CONFIGURATIONP (object)) |
265 | 5770 return Qt; |
5771 return Qnil; | |
5772 } | |
5773 | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5774 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
|
5775 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
|
5776 (config) |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5777 Lisp_Object config; |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5778 { |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5779 register struct save_window_data *data; |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5780 struct Lisp_Vector *saved_windows; |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5781 |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5782 if (! WINDOW_CONFIGURATIONP (config)) |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5783 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
|
5784 |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5785 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
|
5786 saved_windows = XVECTOR (data->saved_windows); |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5787 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
|
5788 } |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5789 |
2297
bb88d48c290f
(Fselect_window): Use Fhandle_switch_frame.
Richard M. Stallman <rms@gnu.org>
parents:
2210
diff
changeset
|
5790 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
|
5791 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
|
5792 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
|
5793 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
|
5794 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
|
5795 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
|
5796 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
|
5797 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
|
5798 (configuration) |
1016
817b0ce337d7
* window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents:
983
diff
changeset
|
5799 Lisp_Object configuration; |
265 | 5800 { |
5801 register struct save_window_data *data; | |
5802 struct Lisp_Vector *saved_windows; | |
5803 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
|
5804 Lisp_Object frame; |
769 | 5805 FRAME_PTR f; |
45835
aab759361c24
(Fset_window_configuration): Explicitly preserve
Richard M. Stallman <rms@gnu.org>
parents:
45645
diff
changeset
|
5806 int old_point = -1; |
265 | 5807 |
9105
984a4b1be1d1
(Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents:
9028
diff
changeset
|
5808 while (!WINDOW_CONFIGURATIONP (configuration)) |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5809 wrong_type_argument (Qwindow_configuration_p, configuration); |
265 | 5810 |
1016
817b0ce337d7
* window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents:
983
diff
changeset
|
5811 data = (struct save_window_data *) XVECTOR (configuration); |
265 | 5812 saved_windows = XVECTOR (data->saved_windows); |
5813 | |
5814 new_current_buffer = data->current_buffer; | |
485 | 5815 if (NILP (XBUFFER (new_current_buffer)->name)) |
265 | 5816 new_current_buffer = Qnil; |
45835
aab759361c24
(Fset_window_configuration): Explicitly preserve
Richard M. Stallman <rms@gnu.org>
parents:
45645
diff
changeset
|
5817 else |
48898
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
5818 { |
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
5819 if (XBUFFER (new_current_buffer) == current_buffer) |
67234
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
5820 /* The code further down "preserves point" by saving here PT in |
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
5821 old_point and then setting it later back into PT. When the |
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
5822 current-selected-window and the final-selected-window both show |
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
5823 the current buffer, this suffers from the problem that the |
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
5824 current PT is the window-point of the current-selected-window, |
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
5825 while the final PT is the point of the final-selected-window, so |
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
5826 this copy from one PT to the other would end up moving the |
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
5827 window-point of the final-selected-window to the window-point of |
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
5828 the current-selected-window. So we have to be careful which |
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
5829 point of the current-buffer we copy into old_point. */ |
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
5830 if (EQ (XWINDOW (data->current_window)->buffer, new_current_buffer) |
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
5831 && WINDOWP (selected_window) |
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
5832 && EQ (XWINDOW (selected_window)->buffer, new_current_buffer) |
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
5833 && !EQ (selected_window, data->current_window)) |
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
5834 old_point = XMARKER (XWINDOW (data->current_window)->pointm)->charpos; |
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
5835 else |
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
5836 old_point = PT; |
48898
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
5837 else |
61511
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5838 /* BUF_PT (XBUFFER (new_current_buffer)) gives us the position of |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5839 point in new_current_buffer as of the last time this buffer was |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5840 used. This can be non-deterministic since it can be changed by |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5841 things like jit-lock by mere temporary selection of some random |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5842 window that happens to show this buffer. |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5843 So if possible we want this arbitrary choice of "which point" to |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5844 be the one from the to-be-selected-window so as to prevent this |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5845 window's cursor from being copied from another window. */ |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5846 if (EQ (XWINDOW (data->current_window)->buffer, new_current_buffer) |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5847 /* If current_window = selected_window, its point is in BUF_PT. */ |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5848 && !EQ (selected_window, data->current_window)) |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5849 old_point = XMARKER (XWINDOW (data->current_window)->pointm)->charpos; |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5850 else |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5851 old_point = BUF_PT (XBUFFER (new_current_buffer)); |
48898
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
5852 } |
265 | 5853 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5854 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
|
5855 f = XFRAME (frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5856 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5857 /* 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
|
5858 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
|
5859 if (FRAME_LIVE_P (f)) |
265 | 5860 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5861 register struct window *w; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5862 register struct saved_window *p; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5863 struct window *root_window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5864 struct window **leaf_windows; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5865 int n_leaf_windows; |
33277
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5866 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
|
5867 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5868 /* 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
|
5869 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
|
5870 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
|
5871 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
|
5872 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
|
5873 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
|
5874 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
|
5875 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
|
5876 |
18657 | 5877 /* The mouse highlighting code could get screwed up |
5878 if it runs during this. */ | |
5879 BLOCK_INPUT; | |
5880 | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5881 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
|
5882 || 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
|
5883 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
|
5884 XFASTINT (data->frame_cols), 0, 0, 0); |
16051
ccf489f8596e
Removed support for !MULTI_FRAME.
Karl Heuer <kwzh@gnu.org>
parents:
16039
diff
changeset
|
5885 #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
|
5886 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
|
5887 != previous_frame_menu_bar_lines) |
21533
b7df83bf15ff
(Fset_window_configuration): Fix mixing of Lisp_Object
Andreas Schwab <schwab@suse.de>
parents:
21514
diff
changeset
|
5888 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
|
5889 #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
|
5890 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
|
5891 != 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
|
5892 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
|
5893 #endif |
25115
2105537c5916
(Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25044
diff
changeset
|
5894 #endif |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5895 |
61444 | 5896 /* "Swap out" point from the selected window's buffer |
5897 into the window itself. (Normally the pointm of the selected | |
5898 window holds garbage.) We do this now, before | |
27869
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
5899 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
|
5900 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
|
5901 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
|
5902 { |
0753fa7a67f3
(Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents:
20535
diff
changeset
|
5903 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
|
5904 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
|
5905 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
|
5906 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
|
5907 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
|
5908 } |
0753fa7a67f3
(Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents:
20535
diff
changeset
|
5909 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5910 windows_or_buffers_changed++; |
10666
e1dfb47b664e
(Fdelete_window, set_window_height, set_window_width)
Richard M. Stallman <rms@gnu.org>
parents:
10461
diff
changeset
|
5911 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
|
5912 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5913 /* Problem: Freeing all matrices and later allocating them again |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5914 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
|
5915 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
|
5916 below. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5917 root_window = XWINDOW (FRAME_ROOT_WINDOW (f)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5918 leaf_windows |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5919 = (struct window **) alloca (count_windows (root_window) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5920 * sizeof (struct window *)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5921 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
|
5922 |
8931
c64388cd7346
(struct saved_window_data): New slots min_width, min_height.
Richard M. Stallman <rms@gnu.org>
parents:
8536
diff
changeset
|
5923 /* 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
|
5924 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
|
5925 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
|
5926 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
|
5927 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5928 /* Kludge Alert! |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5929 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
|
5930 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
|
5931 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5932 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
|
5933 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
|
5934 dead. */ |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5935 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
|
5936 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5937 for (k = 0; k < saved_windows->size; k++) |
265 | 5938 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5939 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
|
5940 w = XWINDOW (p->window); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5941 w->next = Qnil; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5942 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5943 if (!NILP (p->parent)) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5944 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
|
5945 XFASTINT (p->parent))->window; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5946 else |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5947 w->parent = Qnil; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5948 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5949 if (!NILP (p->prev)) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5950 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5951 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
|
5952 XFASTINT (p->prev))->window; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5953 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
|
5954 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5955 else |
265 | 5956 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5957 w->prev = Qnil; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5958 if (!NILP (w->parent)) |
265 | 5959 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5960 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
|
5961 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5962 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
|
5963 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
|
5964 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5965 else |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5966 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5967 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
|
5968 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
|
5969 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5970 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5971 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5972 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5973 /* 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
|
5974 restore it now. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5975 if (BUFFERP (w->total_lines)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5976 w->buffer = w->total_lines; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5977 w->left_col = p->left_col; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5978 w->top_line = p->top_line; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5979 w->total_cols = p->total_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5980 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
|
5981 w->hscroll = p->hscroll; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5982 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
|
5983 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
|
5984 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
|
5985 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
|
5986 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
|
5987 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
|
5988 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
|
5989 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
|
5990 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
|
5991 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
|
5992 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
|
5993 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
|
5994 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
|
5995 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5996 /* 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
|
5997 if (NILP (p->buffer)) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5998 w->buffer = p->buffer; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5999 else |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6000 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6001 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
|
6002 /* 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
|
6003 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6004 w->buffer = p->buffer; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6005 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
|
6006 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
|
6007 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
|
6008 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
|
6009 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
|
6010 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6011 /* 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
|
6012 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
|
6013 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
|
6014 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
|
6015 && 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
|
6016 Fgoto_char (w->pointm); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6017 } |
3535
581c09f72dbd
(Fset_window_configuration): If a window is supposed
Richard M. Stallman <rms@gnu.org>
parents:
3354
diff
changeset
|
6018 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
|
6019 /* 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
|
6020 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6021 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
|
6022 /* 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
|
6023 range. */ |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6024 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
|
6025 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
|
6026 w->start_at_line_beg = Qt; |
265 | 6027 } |
6028 else | |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6029 /* 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
|
6030 are real. */ |
265 | 6031 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6032 /* 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
|
6033 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
|
6034 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
|
6035 w->buffer); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6036 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
|
6037 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
|
6038 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
|
6039 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
|
6040 w->start_at_line_beg = Qt; |
265 | 6041 } |
6042 } | |
6043 } | |
1237
3929b2135e58
* window.c (delete_all_subwindows): Save the window's buffer in
Jim Blandy <jimb@redhat.com>
parents:
1123
diff
changeset
|
6044 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6045 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
|
6046 /* 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
|
6047 using the buffer that has been restored into it. |
61444 | 6048 We already swapped out point that from that window's old buffer. */ |
27869
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
6049 selected_window = Qnil; |
61444 | 6050 |
6051 /* Arrange *not* to restore point in the buffer that was | |
6052 current when the window configuration was saved. */ | |
45584
5fd12f9027a3
(Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents:
45562
diff
changeset
|
6053 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
|
6054 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
|
6055 make_number (old_point), |
45584
5fd12f9027a3
(Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents:
45562
diff
changeset
|
6056 XWINDOW (data->current_window)->buffer); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6057 |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
6058 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
|
6059 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
|
6060 = selected_window; |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6061 |
1716
95db936d47c0
* keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents:
1685
diff
changeset
|
6062 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
|
6063 || (FRAMEP (data->focus_frame) |
1716
95db936d47c0
* keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents:
1685
diff
changeset
|
6064 && FRAME_LIVE_P (XFRAME (data->focus_frame)))) |
95db936d47c0
* keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents:
1685
diff
changeset
|
6065 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
|
6066 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6067 #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
|
6068 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
|
6069 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
|
6070 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
|
6071 0, 0); |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6072 #endif |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6073 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6074 /* 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
|
6075 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
|
6076 || previous_frame_cols != FRAME_COLS (f)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6077 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
|
6078 0, 0, 0); |
16051
ccf489f8596e
Removed support for !MULTI_FRAME.
Karl Heuer <kwzh@gnu.org>
parents:
16039
diff
changeset
|
6079 #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
|
6080 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
|
6081 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
|
6082 make_number (0)); |
25115
2105537c5916
(Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25044
diff
changeset
|
6083 #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
|
6084 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
|
6085 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
|
6086 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
|
6087 #endif |
25115
2105537c5916
(Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25044
diff
changeset
|
6088 #endif |
18657 | 6089 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6090 /* 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
|
6091 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
|
6092 { |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
6093 if (NILP (leaf_windows[i]->buffer)) |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
6094 { |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
6095 /* Assert it's not reused as a combination. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6096 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
|
6097 && NILP (leaf_windows[i]->vchild)); |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
6098 free_window_matrices (leaf_windows[i]); |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
6099 } |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
6100 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
|
6101 ++n; |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
6102 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6103 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6104 adjust_glyphs (f); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6105 |
18657 | 6106 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
|
6107 |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
6108 /* 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
|
6109 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
|
6110 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
|
6111 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
|
6112 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
|
6113 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
|
6114 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
|
6115 |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
6116 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
|
6117 && ! 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
|
6118 call1 (Vrun_hooks, Qwindow_configuration_change_hook); |
265 | 6119 } |
6120 | |
1325
f03e559aac3e
* window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents:
1280
diff
changeset
|
6121 if (!NILP (new_current_buffer)) |
45584
5fd12f9027a3
(Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents:
45562
diff
changeset
|
6122 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
|
6123 |
21198
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
6124 /* 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
|
6125 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
|
6126 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
|
6127 |
265 | 6128 Vminibuf_scroll_window = data->minibuf_scroll_window; |
43594
23cddac4d0b7
(minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents:
43571
diff
changeset
|
6129 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
|
6130 |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
6131 return (FRAME_LIVE_P (f) ? Qt : Qnil); |
265 | 6132 } |
6133 | |
769 | 6134 /* Mark all windows now on frame as deleted |
265 | 6135 by setting their buffers to nil. */ |
6136 | |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6137 void |
265 | 6138 delete_all_subwindows (w) |
6139 register struct window *w; | |
6140 { | |
485 | 6141 if (!NILP (w->next)) |
265 | 6142 delete_all_subwindows (XWINDOW (w->next)); |
485 | 6143 if (!NILP (w->vchild)) |
265 | 6144 delete_all_subwindows (XWINDOW (w->vchild)); |
485 | 6145 if (!NILP (w->hchild)) |
265 | 6146 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
|
6147 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6148 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
|
6149 |
16068
b19129a8c644
(unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
6150 if (!NILP (w->buffer)) |
b19129a8c644
(unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
6151 unshow_buffer (w); |
b19129a8c644
(unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
6152 |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
6153 /* 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
|
6154 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
|
6155 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
|
6156 vchild or hchild set. */ |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
6157 w->buffer = Qnil; |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
6158 w->vchild = Qnil; |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
6159 w->hchild = Qnil; |
30045
ff2db81c11c1
(delete_all_subwindows): Reset Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents:
30039
diff
changeset
|
6160 |
ff2db81c11c1
(delete_all_subwindows): Reset Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents:
30039
diff
changeset
|
6161 Vwindow_list = Qnil; |
265 | 6162 } |
6163 | |
6164 static int | |
6165 count_windows (window) | |
6166 register struct window *window; | |
6167 { | |
6168 register int count = 1; | |
485 | 6169 if (!NILP (window->next)) |
265 | 6170 count += count_windows (XWINDOW (window->next)); |
485 | 6171 if (!NILP (window->vchild)) |
265 | 6172 count += count_windows (XWINDOW (window->vchild)); |
485 | 6173 if (!NILP (window->hchild)) |
265 | 6174 count += count_windows (XWINDOW (window->hchild)); |
6175 return count; | |
6176 } | |
6177 | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6178 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6179 /* 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
|
6180 Value is last index + 1. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6181 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6182 static int |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6183 get_leaf_windows (w, flat, i) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6184 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6185 struct window **flat; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6186 int i; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6187 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6188 while (w) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6189 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6190 if (!NILP (w->hchild)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6191 i = get_leaf_windows (XWINDOW (w->hchild), flat, i); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6192 else if (!NILP (w->vchild)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6193 i = get_leaf_windows (XWINDOW (w->vchild), flat, i); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6194 else |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6195 flat[i++] = w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6196 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6197 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
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 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6200 return i; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6201 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6202 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6203 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6204 /* 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
|
6205 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
|
6206 can be returned. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6207 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6208 struct glyph * |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6209 get_phys_cursor_glyph (w) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6210 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6211 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6212 struct glyph_row *row; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6213 struct glyph *glyph; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6214 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6215 if (w->phys_cursor.vpos >= 0 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6216 && w->phys_cursor.vpos < w->current_matrix->nrows |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6217 && (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
|
6218 row->enabled_p) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6219 && row->used[TEXT_AREA] > w->phys_cursor.hpos) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6220 glyph = row->glyphs[TEXT_AREA] + w->phys_cursor.hpos; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6221 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6222 glyph = NULL; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6223 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6224 return glyph; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6225 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6226 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6227 |
265 | 6228 static int |
6229 save_window_save (window, vector, i) | |
6230 Lisp_Object window; | |
6231 struct Lisp_Vector *vector; | |
6232 int i; | |
6233 { | |
6234 register struct saved_window *p; | |
6235 register struct window *w; | |
6236 register Lisp_Object tem; | |
6237 | |
485 | 6238 for (;!NILP (window); window = w->next) |
265 | 6239 { |
6240 p = SAVED_WINDOW_N (vector, i); | |
6241 w = XWINDOW (window); | |
6242 | |
58265
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
6243 XSETFASTINT (w->temslot, i); i++; |
265 | 6244 p->window = window; |
6245 p->buffer = w->buffer; | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6246 p->left_col = w->left_col; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6247 p->top_line = w->top_line; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6248 p->total_cols = w->total_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6249 p->total_lines = w->total_lines; |
265 | 6250 p->hscroll = w->hscroll; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
6251 p->min_hscroll = w->min_hscroll; |
265 | 6252 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
|
6253 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
|
6254 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
|
6255 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
|
6256 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
|
6257 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
|
6258 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
|
6259 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
|
6260 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
|
6261 p->vertical_scroll_bar_type = w->vertical_scroll_bar_type; |
485 | 6262 if (!NILP (w->buffer)) |
265 | 6263 { |
6264 /* Save w's value of point in the window configuration. | |
6265 If w is the selected window, then get the value of point | |
6266 from the buffer; pointm is garbage in the selected window. */ | |
6267 if (EQ (window, selected_window)) | |
6268 { | |
6269 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
|
6270 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
|
6271 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
|
6272 BUF_PT_BYTE (XBUFFER (w->buffer))); |
265 | 6273 } |
6274 else | |
12981
7a540e9cb21a
(save_window_save): Pass the new arg to Fcopy_marker.
Richard M. Stallman <rms@gnu.org>
parents:
12643
diff
changeset
|
6275 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
|
6276 |
7a540e9cb21a
(save_window_save): Pass the new arg to Fcopy_marker.
Richard M. Stallman <rms@gnu.org>
parents:
12643
diff
changeset
|
6277 p->start = Fcopy_marker (w->start, Qnil); |
265 | 6278 p->start_at_line_beg = w->start_at_line_beg; |
6279 | |
6280 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
|
6281 p->mark = Fcopy_marker (tem, Qnil); |
265 | 6282 } |
6283 else | |
6284 { | |
6285 p->pointm = Qnil; | |
6286 p->start = Qnil; | |
6287 p->mark = Qnil; | |
6288 p->start_at_line_beg = Qnil; | |
6289 } | |
6290 | |
485 | 6291 if (NILP (w->parent)) |
265 | 6292 p->parent = Qnil; |
6293 else | |
6294 p->parent = XWINDOW (w->parent)->temslot; | |
6295 | |
485 | 6296 if (NILP (w->prev)) |
265 | 6297 p->prev = Qnil; |
6298 else | |
6299 p->prev = XWINDOW (w->prev)->temslot; | |
6300 | |
485 | 6301 if (!NILP (w->vchild)) |
265 | 6302 i = save_window_save (w->vchild, vector, i); |
485 | 6303 if (!NILP (w->hchild)) |
265 | 6304 i = save_window_save (w->hchild, vector, i); |
6305 } | |
6306 | |
6307 return i; | |
6308 } | |
6309 | |
16485
9b919c5464a4
Reorganize function definitions so etags finds them.
Erik Naggum <erik@naggum.no>
parents:
16392
diff
changeset
|
6310 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
|
6311 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
|
6312 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
|
6313 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
|
6314 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
|
6315 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
|
6316 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
|
6317 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
|
6318 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
|
6319 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
|
6320 (frame) |
769 | 6321 Lisp_Object frame; |
265 | 6322 { |
6323 register Lisp_Object tem; | |
6324 register int n_windows; | |
6325 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
|
6326 register struct Lisp_Vector *vec; |
265 | 6327 register int i; |
769 | 6328 FRAME_PTR f; |
265 | 6329 |
769 | 6330 if (NILP (frame)) |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6331 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
6332 CHECK_LIVE_FRAME (frame); |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6333 f = XFRAME (frame); |
358 | 6334 |
769 | 6335 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
|
6336 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
|
6337 data = (struct save_window_data *)vec; |
5cda62e4222a
(Fcurrent_window_configuration): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9970
diff
changeset
|
6338 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6339 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
|
6340 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
|
6341 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
|
6342 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
|
6343 data->selected_frame = selected_frame; |
769 | 6344 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
|
6345 XSETBUFFER (data->current_buffer, current_buffer); |
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
6346 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
|
6347 data->minibuf_selected_window = minibuf_level > 0 ? minibuf_selected_window : Qnil; |
769 | 6348 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
|
6349 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
|
6350 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
|
6351 XSETINT (data->min_width, window_min_width); |
265 | 6352 tem = Fmake_vector (make_number (n_windows), Qnil); |
6353 data->saved_windows = tem; | |
6354 for (i = 0; i < n_windows; i++) | |
6355 XVECTOR (tem)->contents[i] | |
65004
bc5cf5fc0f9e
(SAVED_WINDOW_VECTOR_SIZE): Remove dangerous define.
Kim F. Storm <storm@cua.dk>
parents:
64770
diff
changeset
|
6356 = Fmake_vector (make_number (VECSIZE (struct saved_window)), Qnil); |
34090
7721faa485ea
(struct saved_window): Add members orig_top and
Gerd Moellmann <gerd@gnu.org>
parents:
33957
diff
changeset
|
6357 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
|
6358 XSETWINDOW_CONFIGURATION (tem, data); |
265 | 6359 return (tem); |
6360 } | |
6361 | |
6362 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
|
6363 0, UNEVALLED, 0, |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
6364 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
|
6365 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
|
6366 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
|
6367 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
|
6368 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
|
6369 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
|
6370 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
|
6371 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
|
6372 (args) |
265 | 6373 Lisp_Object args; |
6374 { | |
6375 register Lisp_Object val; | |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
6376 register int count = SPECPDL_INDEX (); |
265 | 6377 |
6378 record_unwind_protect (Fset_window_configuration, | |
358 | 6379 Fcurrent_window_configuration (Qnil)); |
265 | 6380 val = Fprogn (args); |
6381 return unbind_to (count, val); | |
6382 } | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6383 |
65826
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6384 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6385 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6386 /*********************************************************************** |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6387 Window Split Tree |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6388 ***********************************************************************/ |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6389 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6390 static Lisp_Object |
65908
454a4a463081
(window_tree, Fwindow_tree): Rename fns added 2005-10-04.
Kim F. Storm <storm@cua.dk>
parents:
65826
diff
changeset
|
6391 window_tree (w) |
65826
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6392 struct window *w; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6393 { |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6394 Lisp_Object tail = Qnil; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6395 Lisp_Object result = Qnil; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6396 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6397 while (w) |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6398 { |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6399 Lisp_Object wn; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6400 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6401 XSETWINDOW (wn, w); |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6402 if (!NILP (w->hchild)) |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6403 wn = Fcons (Qnil, Fcons (Fwindow_edges (wn), |
65908
454a4a463081
(window_tree, Fwindow_tree): Rename fns added 2005-10-04.
Kim F. Storm <storm@cua.dk>
parents:
65826
diff
changeset
|
6404 window_tree (XWINDOW (w->hchild)))); |
65826
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6405 else if (!NILP (w->vchild)) |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6406 wn = Fcons (Qt, Fcons (Fwindow_edges (wn), |
65908
454a4a463081
(window_tree, Fwindow_tree): Rename fns added 2005-10-04.
Kim F. Storm <storm@cua.dk>
parents:
65826
diff
changeset
|
6407 window_tree (XWINDOW (w->vchild)))); |
65826
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6408 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6409 if (NILP (result)) |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6410 { |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6411 result = tail = Fcons (wn, Qnil); |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6412 } |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6413 else |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6414 { |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6415 XSETCDR (tail, Fcons (wn, Qnil)); |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6416 tail = XCDR (tail); |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6417 } |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6418 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6419 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6420 } |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6421 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6422 return result; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6423 } |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6424 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6425 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6426 |
65908
454a4a463081
(window_tree, Fwindow_tree): Rename fns added 2005-10-04.
Kim F. Storm <storm@cua.dk>
parents:
65826
diff
changeset
|
6427 DEFUN ("window-tree", Fwindow_tree, Swindow_tree, |
65826
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6428 0, 1, 0, |
65908
454a4a463081
(window_tree, Fwindow_tree): Rename fns added 2005-10-04.
Kim F. Storm <storm@cua.dk>
parents:
65826
diff
changeset
|
6429 doc: /* Return the window tree for frame FRAME. |
65826
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6430 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6431 The return value is a list of the form (ROOT MINI), where ROOT |
65908
454a4a463081
(window_tree, Fwindow_tree): Rename fns added 2005-10-04.
Kim F. Storm <storm@cua.dk>
parents:
65826
diff
changeset
|
6432 represents the window tree of the frame's root window, and MINI |
65826
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6433 is the frame's minibuffer window. |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6434 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6435 If the root window is not split, ROOT is the root window itself. |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6436 Otherwise, ROOT is a list (DIR EDGES W1 W2 ...) where DIR is nil for a |
65975
a234d371d212
(Fwindow_tree): Fix spelling.
Juanma Barranquero <lekktu@gmail.com>
parents:
65950
diff
changeset
|
6437 horizontal split, and t for a vertical split, EDGES gives the combined |
65826
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6438 size and position of the subwindows in the split, and the rest of the |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6439 elements are the subwindows in the split. Each of the subwindows may |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6440 again be a window or a list representing a window split, and so on. |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6441 EDGES is a list \(LEFT TOP RIGHT BOTTOM) as returned by `window-edges'. |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6442 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6443 If FRAME is nil or omitted, return information on the currently |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6444 selected frame. */) |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6445 (frame) |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6446 Lisp_Object frame; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6447 { |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6448 FRAME_PTR f; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6449 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6450 if (NILP (frame)) |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6451 frame = selected_frame; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6452 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6453 CHECK_FRAME (frame); |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6454 f = XFRAME (frame); |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6455 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6456 if (!FRAME_LIVE_P (f)) |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6457 return Qnil; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6458 |
65908
454a4a463081
(window_tree, Fwindow_tree): Rename fns added 2005-10-04.
Kim F. Storm <storm@cua.dk>
parents:
65826
diff
changeset
|
6459 return window_tree (XWINDOW (FRAME_ROOT_WINDOW (f))); |
65826
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6460 } |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6461 |
265 | 6462 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6463 /*********************************************************************** |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6464 Marginal Areas |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6465 ***********************************************************************/ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6466 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6467 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
|
6468 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
|
6469 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
|
6470 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
|
6471 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
|
6472 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
|
6473 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
|
6474 means no margin. */) |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6475 (window, left_width, right_width) |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6476 Lisp_Object window, left_width, right_width; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6477 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6478 struct window *w = decode_window (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6479 |
52852
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6480 /* Translate negative or zero widths to nil. |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6481 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
|
6482 |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6483 if (!NILP (left_width)) |
52852
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6484 { |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6485 CHECK_NUMBER (left_width); |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6486 if (XINT (left_width) <= 0) |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6487 left_width = Qnil; |
52852
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6488 } |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6489 |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6490 if (!NILP (right_width)) |
52852
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6491 { |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6492 CHECK_NUMBER (right_width); |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6493 if (XINT (right_width) <= 0) |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6494 right_width = Qnil; |
52852
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6495 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6496 |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6497 if (!EQ (w->left_margin_cols, left_width) |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6498 || !EQ (w->right_margin_cols, right_width)) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6499 { |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6500 w->left_margin_cols = left_width; |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6501 w->right_margin_cols = right_width; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6502 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6503 adjust_window_margins (w); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6504 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6505 ++windows_or_buffers_changed; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6506 adjust_glyphs (XFRAME (WINDOW_FRAME (w))); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6507 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6508 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6509 return Qnil; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6510 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6511 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6512 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6513 DEFUN ("window-margins", Fwindow_margins, Swindow_margins, |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6514 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
|
6515 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
|
6516 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
|
6517 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
|
6518 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
|
6519 as nil. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6520 (window) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6521 Lisp_Object window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6522 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6523 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
|
6524 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
|
6525 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6526 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6527 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6528 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6529 /*********************************************************************** |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6530 Fringes |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6531 ***********************************************************************/ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6532 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6533 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
|
6534 2, 4, 0, |
52853
91a9da753e30
(Fset_window_fringes): Clarify docstring.
Lute Kamstra <lute@gnu.org>
parents:
52852
diff
changeset
|
6535 doc: /* Set the fringe widths of window WINDOW. |
91a9da753e30
(Fset_window_fringes): Clarify docstring.
Lute Kamstra <lute@gnu.org>
parents:
52852
diff
changeset
|
6536 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
|
6537 window. |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
6538 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
|
6539 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
|
6540 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
|
6541 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
|
6542 the command `set-fringe-style'. |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
6543 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
|
6544 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
|
6545 display marginal areas and the text area. */) |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6546 (window, left_width, right_width, outside_margins) |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6547 Lisp_Object window, 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
|
6548 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6549 struct window *w = decode_window (window); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6550 |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6551 if (!NILP (left_width)) |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6552 CHECK_NATNUM (left_width); |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6553 if (!NILP (right_width)) |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6554 CHECK_NATNUM (right_width); |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6555 |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6556 if (!EQ (w->left_fringe_width, left_width) |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6557 || !EQ (w->right_fringe_width, right_width) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6558 || !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
|
6559 { |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6560 w->left_fringe_width = left_width; |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6561 w->right_fringe_width = right_width; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6562 w->fringes_outside_margins = outside_margins; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6563 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6564 adjust_window_margins (w); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6565 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6566 clear_glyph_matrix (w->current_matrix); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6567 w->window_end_valid = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6568 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6569 ++windows_or_buffers_changed; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6570 adjust_glyphs (XFRAME (WINDOW_FRAME (w))); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6571 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6572 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6573 return Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6574 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6575 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6576 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6577 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
|
6578 0, 1, 0, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6579 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
|
6580 If WINDOW is omitted or nil, use the currently selected window. |
53927 | 6581 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
|
6582 (window) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6583 Lisp_Object window; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6584 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6585 struct window *w = decode_window (window); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6586 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
|
6587 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
|
6588 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
|
6589 Qt : Qnil), Qnil))); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6590 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6591 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6592 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6593 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6594 /*********************************************************************** |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6595 Scroll bars |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6596 ***********************************************************************/ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6597 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6598 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
|
6599 2, 4, 0, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6600 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
|
6601 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
|
6602 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
|
6603 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
|
6604 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
|
6605 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
|
6606 If WIDTH is nil, use the frame's scroll-bar width. |
68971
f8b092ff513c
(Fset_window_scroll_bars): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
68724
diff
changeset
|
6607 If VERTICAL-TYPE is t, use the frame's scroll-bar type. |
f8b092ff513c
(Fset_window_scroll_bars): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
68724
diff
changeset
|
6608 Fourth parameter HORIZONTAL-TYPE is currently unused. */) |
51223
c1daf1c22f97
(Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents:
51207
diff
changeset
|
6609 (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
|
6610 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
|
6611 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6612 struct window *w = decode_window (window); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6613 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6614 if (!NILP (width)) |
58448
f3a76c43ac80
(Fset_window_scroll_bars): Don't use XINT if it isn't int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58441
diff
changeset
|
6615 { |
f3a76c43ac80
(Fset_window_scroll_bars): Don't use XINT if it isn't int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58441
diff
changeset
|
6616 CHECK_NATNUM (width); |
f3a76c43ac80
(Fset_window_scroll_bars): Don't use XINT if it isn't int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58441
diff
changeset
|
6617 |
f3a76c43ac80
(Fset_window_scroll_bars): Don't use XINT if it isn't int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58441
diff
changeset
|
6618 if (XINT (width) == 0) |
f3a76c43ac80
(Fset_window_scroll_bars): Don't use XINT if it isn't int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58441
diff
changeset
|
6619 vertical_type = Qnil; |
f3a76c43ac80
(Fset_window_scroll_bars): Don't use XINT if it isn't int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58441
diff
changeset
|
6620 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6621 |
52565
26d1a4665f6c
(Fset_window_scroll_bars): Validate the value of `vertical_type'.
Masatake YAMATO <jet@gyve.org>
parents:
52560
diff
changeset
|
6622 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
|
6623 || 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
|
6624 || EQ (vertical_type, Qright) |
26d1a4665f6c
(Fset_window_scroll_bars): Validate the value of `vertical_type'.
Masatake YAMATO <jet@gyve.org>
parents:
52560
diff
changeset
|
6625 || EQ (vertical_type, Qt))) |
26d1a4665f6c
(Fset_window_scroll_bars): Validate the value of `vertical_type'.
Masatake YAMATO <jet@gyve.org>
parents:
52560
diff
changeset
|
6626 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
|
6627 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6628 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
|
6629 || !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
|
6630 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6631 w->scroll_bar_width = width; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6632 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
|
6633 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6634 adjust_window_margins (w); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6635 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6636 clear_glyph_matrix (w->current_matrix); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6637 w->window_end_valid = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6638 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6639 ++windows_or_buffers_changed; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6640 adjust_glyphs (XFRAME (WINDOW_FRAME (w))); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6641 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6642 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6643 return Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6644 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6645 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6646 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6647 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
|
6648 0, 1, 0, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6649 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
|
6650 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
|
6651 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
|
6652 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
|
6653 value. */) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6654 (window) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6655 Lisp_Object window; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6656 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6657 struct window *w = decode_window (window); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6658 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
|
6659 ? WINDOW_CONFIG_SCROLL_BAR_WIDTH (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6660 : WINDOW_SCROLL_BAR_AREA_WIDTH (w))), |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6661 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
|
6662 Fcons (w->vertical_scroll_bar_type, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6663 Fcons (Qnil, Qnil)))); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6664 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6665 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6666 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6667 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6668 /*********************************************************************** |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6669 Smooth scrolling |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6670 ***********************************************************************/ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6671 |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6672 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
|
6673 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
|
6674 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
|
6675 Normally, value is a multiple of the canonical character height of WINDOW; |
68490
36ac94b7246c
(Fother_window, Fwindow_vscroll, Fset_window_vscroll): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
67328
diff
changeset
|
6676 optional second arg PIXELS-P means value is measured in pixels. */) |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6677 (window, pixels_p) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6678 Lisp_Object window, pixels_p; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6679 { |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6680 Lisp_Object result; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6681 struct frame *f; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6682 struct window *w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6683 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6684 if (NILP (window)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6685 window = selected_window; |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6686 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
6687 CHECK_WINDOW (window); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6688 w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6689 f = XFRAME (w->frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6690 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6691 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
|
6692 result = (NILP (pixels_p) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6693 ? 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
|
6694 : make_number (-w->vscroll)); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6695 else |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6696 result = make_number (0); |
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6697 return result; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6698 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6699 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6700 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6701 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
|
6702 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
|
6703 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
|
6704 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
|
6705 non-negative multiple of the canonical character height of WINDOW; |
68490
36ac94b7246c
(Fother_window, Fwindow_vscroll, Fset_window_vscroll): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
67328
diff
changeset
|
6706 optional third arg PIXELS-P non-nil means that VSCROLL is in pixels. |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
6707 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
|
6708 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
|
6709 result of this rounding. |
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
6710 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
|
6711 (window, vscroll, pixels_p) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6712 Lisp_Object window, vscroll, pixels_p; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6713 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6714 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6715 struct frame *f; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6716 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6717 if (NILP (window)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6718 window = selected_window; |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6719 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
6720 CHECK_WINDOW (window); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
6721 CHECK_NUMBER_OR_FLOAT (vscroll); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6722 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6723 w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6724 f = XFRAME (w->frame); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6725 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6726 if (FRAME_WINDOW_P (f)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6727 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6728 int old_dy = w->vscroll; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6729 |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6730 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
|
6731 ? 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
|
6732 : XFLOATINT (vscroll)); |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6733 w->vscroll = min (w->vscroll, 0); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6734 |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6735 if (w->vscroll != old_dy) |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6736 { |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6737 /* Adjust glyph matrix of the frame if the virtual display |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6738 area becomes larger than before. */ |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6739 if (w->vscroll < 0 && w->vscroll < old_dy) |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6740 adjust_glyphs (f); |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6741 |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6742 /* Prevent redisplay shortcuts. */ |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6743 XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1; |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6744 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6745 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6746 |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6747 return Fwindow_vscroll (window, pixels_p); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6748 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6749 |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6750 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6751 /* 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
|
6752 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
|
6753 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
|
6754 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6755 void |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6756 foreach_window (f, fn, user_data) |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6757 struct frame *f; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6758 int (* fn) P_ ((struct window *, void *)); |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6759 void *user_data; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6760 { |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6761 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
|
6762 } |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6763 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6764 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6765 /* 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
|
6766 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
|
6767 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
|
6768 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
|
6769 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6770 static int |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6771 foreach_window_1 (w, fn, user_data) |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6772 struct window *w; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6773 int (* fn) P_ ((struct window *, void *)); |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6774 void *user_data; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6775 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6776 int cont; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6777 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6778 for (cont = 1; w && cont;) |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6779 { |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6780 if (!NILP (w->hchild)) |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6781 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
|
6782 else if (!NILP (w->vchild)) |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6783 cont = foreach_window_1 (XWINDOW (w->vchild), fn, user_data); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6784 else |
30366
8dd313fc287d
(foreach_window_1): Fix typo reversing an if-condition.
Gerd Moellmann <gerd@gnu.org>
parents:
30362
diff
changeset
|
6785 cont = fn (w, user_data); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6786 |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6787 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6788 } |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6789 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6790 return cont; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6791 } |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6792 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6793 |
39952 | 6794 /* 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
|
6795 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
|
6796 the window start. */ |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6797 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6798 static int |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6799 freeze_window_start (w, freeze_p) |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6800 struct window *w; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6801 void *freeze_p; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6802 { |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6803 if (w == XWINDOW (selected_window) |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6804 || MINI_WINDOW_P (w) |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6805 || (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
|
6806 && ! NILP (Vminibuf_scroll_window) |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6807 && w == XWINDOW (Vminibuf_scroll_window))) |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6808 freeze_p = NULL; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6809 |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6810 w->frozen_window_start_p = freeze_p != NULL; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6811 return 1; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6812 } |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6813 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6814 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6815 /* 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
|
6816 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
|
6817 means freeze the window start. */ |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6818 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6819 void |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6820 freeze_window_starts (f, freeze_p) |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6821 struct frame *f; |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6822 int freeze_p; |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6823 { |
31903
3e0a1f91c149
(freeze_window_starts): Construct last argument for
Gerd Moellmann <gerd@gnu.org>
parents:
31829
diff
changeset
|
6824 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
|
6825 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6826 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6827 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6828 /*********************************************************************** |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6829 Initialization |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6830 ***********************************************************************/ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6831 |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6832 /* Return 1 if window configurations C1 and C2 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6833 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
|
6834 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6835 int |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6836 compare_window_configurations (c1, c2, ignore_positions) |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6837 Lisp_Object c1, c2; |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6838 int ignore_positions; |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6839 { |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6840 register struct save_window_data *d1, *d2; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6841 struct Lisp_Vector *sw1, *sw2; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6842 int i; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6843 |
28505
b5a7eb24964c
(compare_window_configurations): Signal an error
Gerd Moellmann <gerd@gnu.org>
parents:
28463
diff
changeset
|
6844 if (!WINDOW_CONFIGURATIONP (c1)) |
b5a7eb24964c
(compare_window_configurations): Signal an error
Gerd Moellmann <gerd@gnu.org>
parents:
28463
diff
changeset
|
6845 wrong_type_argument (Qwindow_configuration_p, c1); |
b5a7eb24964c
(compare_window_configurations): Signal an error
Gerd Moellmann <gerd@gnu.org>
parents:
28463
diff
changeset
|
6846 if (!WINDOW_CONFIGURATIONP (c2)) |
b5a7eb24964c
(compare_window_configurations): Signal an error
Gerd Moellmann <gerd@gnu.org>
parents:
28463
diff
changeset
|
6847 wrong_type_argument (Qwindow_configuration_p, c2); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6848 |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6849 d1 = (struct save_window_data *) XVECTOR (c1); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6850 d2 = (struct save_window_data *) XVECTOR (c2); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6851 sw1 = XVECTOR (d1->saved_windows); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6852 sw2 = XVECTOR (d2->saved_windows); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6853 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6854 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
|
6855 return 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6856 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
|
6857 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6858 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
|
6859 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6860 if (! EQ (d1->selected_frame, d2->selected_frame)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6861 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6862 /* Don't compare the current_window field directly. |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6863 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
|
6864 if (! EQ (d1->current_buffer, d2->current_buffer)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6865 return 0; |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6866 if (! ignore_positions) |
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
6867 { |
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
6868 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
|
6869 return 0; |
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
6870 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
|
6871 return 0; |
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
6872 } |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6873 /* Don't compare the root_window field. |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6874 We don't require the two configurations |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6875 to use the same window object, |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6876 and the two root windows must be equivalent |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6877 if everything else compares equal. */ |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6878 if (! EQ (d1->focus_frame, d2->focus_frame)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6879 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6880 if (! EQ (d1->min_width, d2->min_width)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6881 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6882 if (! EQ (d1->min_height, d2->min_height)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6883 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6884 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6885 /* 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
|
6886 if (sw1->size != sw2->size) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6887 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6888 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6889 for (i = 0; i < sw1->size; i++) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6890 { |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6891 struct saved_window *p1, *p2; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6892 int w1_is_current, w2_is_current; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6893 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6894 p1 = SAVED_WINDOW_N (sw1, i); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6895 p2 = SAVED_WINDOW_N (sw2, i); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6896 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6897 /* Verify that the current windows in the two |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6898 configurations correspond to each other. */ |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6899 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
|
6900 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
|
6901 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6902 if (w1_is_current != w2_is_current) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6903 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6904 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6905 /* Verify that the corresponding windows do match. */ |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6906 if (! EQ (p1->buffer, p2->buffer)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6907 return 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6908 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
|
6909 return 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6910 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
|
6911 return 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6912 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
|
6913 return 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6914 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
|
6915 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6916 if (! EQ (p1->display_table, p2->display_table)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6917 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6918 if (! EQ (p1->parent, p2->parent)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6919 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6920 if (! EQ (p1->prev, p2->prev)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6921 return 0; |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6922 if (! ignore_positions) |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6923 { |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6924 if (! EQ (p1->hscroll, p2->hscroll)) |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6925 return 0; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
6926 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
|
6927 return 0; |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6928 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
|
6929 return 0; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6930 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
|
6931 return 0; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6932 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
|
6933 return 0; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6934 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
|
6935 return 0; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6936 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6937 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
|
6938 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6939 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
|
6940 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6941 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
|
6942 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6943 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
|
6944 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6945 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
|
6946 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6947 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
|
6948 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6949 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
|
6950 return 0; |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6951 } |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6952 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6953 return 1; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6954 } |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6955 |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6956 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
|
6957 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
|
6958 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
|
6959 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
|
6960 and scrolling positions. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6961 (x, y) |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6962 Lisp_Object x, y; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6963 { |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6964 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
|
6965 return Qt; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6966 return Qnil; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6967 } |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6968 |
21514 | 6969 void |
265 | 6970 init_window_once () |
6971 { | |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6972 struct frame *f = make_terminal_frame (); |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6973 XSETFRAME (selected_frame, f); |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6974 Vterminal_frame = selected_frame; |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6975 minibuf_window = f->minibuffer_window; |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6976 selected_window = f->selected_window; |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6977 last_nonminibuf_frame = f; |
14445
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
6978 |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
6979 window_initialized = 1; |
265 | 6980 } |
6981 | |
21514 | 6982 void |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6983 init_window () |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6984 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6985 Vwindow_list = Qnil; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6986 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6987 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6988 void |
265 | 6989 syms_of_window () |
6990 { | |
25540
2b4bdd114899
(Qwindow_size_fixed): Replaces Qfixed_window_size.
Gerd Moellmann <gerd@gnu.org>
parents:
25517
diff
changeset
|
6991 Qwindow_size_fixed = intern ("window-size-fixed"); |
2b4bdd114899
(Qwindow_size_fixed): Replaces Qfixed_window_size.
Gerd Moellmann <gerd@gnu.org>
parents:
25517
diff
changeset
|
6992 staticpro (&Qwindow_size_fixed); |
61755
71259596d397
(window_size_fixed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
61635
diff
changeset
|
6993 Fset (Qwindow_size_fixed, Qnil); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6994 |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
6995 staticpro (&Qwindow_configuration_change_hook); |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
6996 Qwindow_configuration_change_hook |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
6997 = intern ("window-configuration-change-hook"); |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
6998 |
265 | 6999 Qwindowp = intern ("windowp"); |
7000 staticpro (&Qwindowp); | |
7001 | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
7002 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
|
7003 staticpro (&Qwindow_configuration_p); |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
7004 |
2210
22d78dbb3cc7
Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents:
2190
diff
changeset
|
7005 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
|
7006 staticpro (&Qwindow_live_p); |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
7007 |
11405
645e3883da72
(temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents:
11307
diff
changeset
|
7008 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
|
7009 staticpro (&Qtemp_buffer_show_hook); |
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
7010 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
7011 staticpro (&Vwindow_list); |
43597
8097923cfe85
(syms_of_window): Initialize minibuf_selected_window.
Kim F. Storm <storm@cua.dk>
parents:
43594
diff
changeset
|
7012 |
8097923cfe85
(syms_of_window): Initialize minibuf_selected_window.
Kim F. Storm <storm@cua.dk>
parents:
43594
diff
changeset
|
7013 minibuf_selected_window = Qnil; |
43594
23cddac4d0b7
(minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents:
43571
diff
changeset
|
7014 staticpro (&minibuf_selected_window); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
7015 |
265 | 7016 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
|
7017 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
|
7018 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
|
7019 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
|
7020 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
|
7021 the buffer; `temp-buffer-show-hook' is not run unless this function runs it. */); |
265 | 7022 Vtemp_buffer_show_function = Qnil; |
7023 | |
7024 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
|
7025 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
|
7026 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
|
7027 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
|
7028 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
|
7029 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
|
7030 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
|
7031 work using this function. */); |
265 | 7032 Vdisplay_buffer_function = Qnil; |
7033 | |
34261
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
7034 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
|
7035 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
|
7036 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
|
7037 Veven_window_heights = Qt; |
c50a8c8171b7
(Veven_window_heights): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
34097
diff
changeset
|
7038 |
265 | 7039 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
|
7040 doc: /* Non-nil means it is the window that C-M-v in minibuffer should scroll. */); |
265 | 7041 Vminibuf_scroll_window = Qnil; |
7042 | |
43281
a4ea76de57c9
(Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents:
43241
diff
changeset
|
7043 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
|
7044 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
|
7045 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
|
7046 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
|
7047 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
|
7048 |
265 | 7049 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
|
7050 doc: /* If non-nil, this is a buffer and \\[scroll-other-window] should scroll its window. */); |
265 | 7051 Vother_window_scroll_buffer = Qnil; |
7052 | |
769 | 7053 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
|
7054 doc: /* *Non-nil means `display-buffer' should make a separate frame. */); |
769 | 7055 pop_up_frames = 0; |
265 | 7056 |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
7057 DEFVAR_BOOL ("auto-window-vscroll", &auto_window_vscroll_p, |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
7058 doc: /* *Non-nil means to automatically adjust `window-vscroll' to view tall lines. */); |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
7059 auto_window_vscroll_p = 1; |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
7060 |
30560
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
7061 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
|
7062 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
|
7063 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
|
7064 display_buffer_reuse_frames = 0; |
e4ba830b426d
(display_buffer_reuse_frames): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30446
diff
changeset
|
7065 |
769 | 7066 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
|
7067 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
|
7068 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
|
7069 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
7070 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
|
7071 where `pop-up-frame-alist' would hold the default frame parameters. */); |
769 | 7072 Vpop_up_frame_function = Qnil; |
265 | 7073 |
7056
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
7074 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
|
7075 doc: /* *List of buffer names that should have their own special frames. |
61871
dd7b3da13b8f
(Fsame_window_p, Fspecial_display_p): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
61755
diff
changeset
|
7076 Displaying a buffer with `display-buffer' or `pop-to-buffer', |
dd7b3da13b8f
(Fsame_window_p, Fspecial_display_p): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
61755
diff
changeset
|
7077 if its name is in this list, makes a special frame for it |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
7078 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
|
7079 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
7080 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
|
7081 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
|
7082 (BUFFER FRAME-PARAMETERS...) (BUFFER FUNCTION OTHER-ARGS...) |
56174
7b713bd3dad4
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56089
diff
changeset
|
7083 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
|
7084 \(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
|
7085 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
|
7086 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
|
7087 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
|
7088 |
52836
a832ae359532
(Fset_window_margins): Allow only integers as args.
Richard M. Stallman <rms@gnu.org>
parents:
52831
diff
changeset
|
7089 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
|
7090 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
|
7091 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
|
7092 in the currently selected frame. |
a832ae359532
(Fset_window_margins): Allow only integers as args.
Richard M. Stallman <rms@gnu.org>
parents:
52831
diff
changeset
|
7093 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
7094 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
|
7095 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
|
7096 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
|
7097 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
|
7098 Vspecial_display_buffer_names = Qnil; |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
7099 |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
7100 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
|
7101 doc: /* *List of regexps saying which buffers should have their own special frames. |
61871
dd7b3da13b8f
(Fsame_window_p, Fspecial_display_p): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
61755
diff
changeset
|
7102 When displaying a buffer with `display-buffer' or `pop-to-buffer', |
dd7b3da13b8f
(Fsame_window_p, Fspecial_display_p): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
61755
diff
changeset
|
7103 if any regexp in this list matches the buffer name, it makes a |
dd7b3da13b8f
(Fsame_window_p, Fspecial_display_p): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
61755
diff
changeset
|
7104 special frame for the buffer by calling `special-display-function'. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
7105 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
7106 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
|
7107 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
|
7108 (REGEXP FRAME-PARAMETERS...) (REGEXP FUNCTION OTHER-ARGS...) |
56174
7b713bd3dad4
(syms_of_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56089
diff
changeset
|
7109 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
|
7110 \(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
|
7111 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
|
7112 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
|
7113 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
|
7114 |
52836
a832ae359532
(Fset_window_margins): Allow only integers as args.
Richard M. Stallman <rms@gnu.org>
parents:
52831
diff
changeset
|
7115 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
|
7116 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
|
7117 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
|
7118 in the currently selected frame. |
a832ae359532
(Fset_window_margins): Allow only integers as args.
Richard M. Stallman <rms@gnu.org>
parents:
52831
diff
changeset
|
7119 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
7120 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
|
7121 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
|
7122 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
|
7123 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
|
7124 Vspecial_display_regexps = Qnil; |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
7125 |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
7126 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
|
7127 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
|
7128 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
|
7129 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
|
7130 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
|
7131 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
|
7132 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
|
7133 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
|
7134 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
|
7135 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
|
7136 |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
7137 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
|
7138 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
|
7139 Vspecial_display_function = Qnil; |
0a18af7eb587
Implement special frames for specified buffers.
Richard M. Stallman <rms@gnu.org>
parents:
6982
diff
changeset
|
7140 |
10958
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
7141 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
|
7142 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
|
7143 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
|
7144 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
|
7145 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
|
7146 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
7147 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
|
7148 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
|
7149 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
|
7150 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
|
7151 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
7152 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
|
7153 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
|
7154 |
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
7155 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
|
7156 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
|
7157 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
|
7158 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
|
7159 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
|
7160 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
7161 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
|
7162 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
|
7163 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
|
7164 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
|
7165 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
7166 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
|
7167 Vsame_window_regexps = Qnil; |
c0d821d95739
(Vsame_window_buffer_names, Vsame_window_regexps): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10808
diff
changeset
|
7168 |
265 | 7169 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
|
7170 doc: /* *Non-nil means display-buffer should make new windows. */); |
265 | 7171 pop_up_windows = 1; |
7172 | |
7173 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
|
7174 doc: /* *Number of lines of continuity when scrolling by screenfuls. */); |
265 | 7175 next_screen_context_lines = 2; |
7176 | |
7177 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
|
7178 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
|
7179 If there is only one window, it is split regardless of this value. */); |
265 | 7180 split_height_threshold = 500; |
7181 | |
7182 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
|
7183 doc: /* *Delete any window less than this tall (including its mode line). */); |
265 | 7184 window_min_height = 4; |
7185 | |
7186 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
|
7187 doc: /* *Delete any window less than this wide. */); |
265 | 7188 window_min_width = 10; |
7189 | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
7190 DEFVAR_LISP ("scroll-preserve-screen-position", |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
7191 &Vscroll_preserve_screen_position, |
63865
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
7192 doc: /* *Controls if scroll commands move point to keep its screen line unchanged. |
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
7193 A value of nil means point does not keep its screen position except |
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
7194 at the scroll margin or window boundary respectively. |
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
7195 A value of t means point keeps its screen position if the scroll |
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
7196 command moved it vertically out of the window, e.g. when scrolling |
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
7197 by full screens. |
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
7198 Any other value means point always keeps its screen position. */); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
7199 Vscroll_preserve_screen_position = Qnil; |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
7200 |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
7201 DEFVAR_LISP ("window-configuration-change-hook", |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
7202 &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
|
7203 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
|
7204 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
|
7205 Vwindow_configuration_change_hook = Qnil; |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
7206 |
265 | 7207 defsubr (&Sselected_window); |
7208 defsubr (&Sminibuffer_window); | |
7209 defsubr (&Swindow_minibuffer_p); | |
7210 defsubr (&Swindowp); | |
2210
22d78dbb3cc7
Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents:
2190
diff
changeset
|
7211 defsubr (&Swindow_live_p); |
265 | 7212 defsubr (&Spos_visible_in_window_p); |
7213 defsubr (&Swindow_buffer); | |
7214 defsubr (&Swindow_height); | |
7215 defsubr (&Swindow_width); | |
7216 defsubr (&Swindow_hscroll); | |
7217 defsubr (&Sset_window_hscroll); | |
13457
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
7218 defsubr (&Swindow_redisplay_end_trigger); |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
7219 defsubr (&Sset_window_redisplay_end_trigger); |
265 | 7220 defsubr (&Swindow_edges); |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
7221 defsubr (&Swindow_pixel_edges); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
7222 defsubr (&Swindow_inside_edges); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
7223 defsubr (&Swindow_inside_pixel_edges); |
432 | 7224 defsubr (&Scoordinates_in_window_p); |
7225 defsubr (&Swindow_at); | |
265 | 7226 defsubr (&Swindow_point); |
7227 defsubr (&Swindow_start); | |
7228 defsubr (&Swindow_end); | |
7229 defsubr (&Sset_window_point); | |
7230 defsubr (&Sset_window_start); | |
7231 defsubr (&Swindow_dedicated_p); | |
722
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
7232 defsubr (&Sset_window_dedicated_p); |
265 | 7233 defsubr (&Swindow_display_table); |
7234 defsubr (&Sset_window_display_table); | |
7235 defsubr (&Snext_window); | |
7236 defsubr (&Sprevious_window); | |
7237 defsubr (&Sother_window); | |
7238 defsubr (&Sget_lru_window); | |
7239 defsubr (&Sget_largest_window); | |
7240 defsubr (&Sget_buffer_window); | |
7241 defsubr (&Sdelete_other_windows); | |
7242 defsubr (&Sdelete_windows_on); | |
7243 defsubr (&Sreplace_buffer_in_windows); | |
7244 defsubr (&Sdelete_window); | |
7245 defsubr (&Sset_window_buffer); | |
7246 defsubr (&Sselect_window); | |
16390
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
7247 defsubr (&Sspecial_display_p); |
77051008303f
(Fspecial_display_p, Fsame_window_p): New functions.
Erik Naggum <erik@naggum.no>
parents:
16338
diff
changeset
|
7248 defsubr (&Ssame_window_p); |
265 | 7249 defsubr (&Sdisplay_buffer); |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
7250 defsubr (&Sforce_window_update); |
265 | 7251 defsubr (&Ssplit_window); |
7252 defsubr (&Senlarge_window); | |
7253 defsubr (&Sshrink_window); | |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
7254 defsubr (&Sadjust_window_trailing_edge); |
265 | 7255 defsubr (&Sscroll_up); |
7256 defsubr (&Sscroll_down); | |
7257 defsubr (&Sscroll_left); | |
7258 defsubr (&Sscroll_right); | |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
7259 defsubr (&Sother_window_for_scrolling); |
265 | 7260 defsubr (&Sscroll_other_window); |
43624
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
7261 defsubr (&Sminibuffer_selected_window); |
265 | 7262 defsubr (&Srecenter); |
34416
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
7263 defsubr (&Swindow_text_height); |
265 | 7264 defsubr (&Smove_to_window_line); |
7265 defsubr (&Swindow_configuration_p); | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
7266 defsubr (&Swindow_configuration_frame); |
265 | 7267 defsubr (&Sset_window_configuration); |
7268 defsubr (&Scurrent_window_configuration); | |
7269 defsubr (&Ssave_window_excursion); | |
65908
454a4a463081
(window_tree, Fwindow_tree): Rename fns added 2005-10-04.
Kim F. Storm <storm@cua.dk>
parents:
65826
diff
changeset
|
7270 defsubr (&Swindow_tree); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
7271 defsubr (&Sset_window_margins); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
7272 defsubr (&Swindow_margins); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7273 defsubr (&Sset_window_fringes); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7274 defsubr (&Swindow_fringes); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7275 defsubr (&Sset_window_scroll_bars); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7276 defsubr (&Swindow_scroll_bars); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
7277 defsubr (&Swindow_vscroll); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
7278 defsubr (&Sset_window_vscroll); |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7279 defsubr (&Scompare_window_configurations); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
7280 defsubr (&Swindow_list); |
265 | 7281 } |
7282 | |
21514 | 7283 void |
265 | 7284 keys_of_window () |
7285 { | |
7286 initial_define_key (control_x_map, '1', "delete-other-windows"); | |
7287 initial_define_key (control_x_map, '2', "split-window"); | |
7288 initial_define_key (control_x_map, '0', "delete-window"); | |
7289 initial_define_key (control_x_map, 'o', "other-window"); | |
7290 initial_define_key (control_x_map, '^', "enlarge-window"); | |
7291 initial_define_key (control_x_map, '<', "scroll-left"); | |
7292 initial_define_key (control_x_map, '>', "scroll-right"); | |
7293 | |
7294 initial_define_key (global_map, Ctl ('V'), "scroll-up"); | |
7295 initial_define_key (meta_map, Ctl ('V'), "scroll-other-window"); | |
7296 initial_define_key (meta_map, 'v', "scroll-down"); | |
7297 | |
7298 initial_define_key (global_map, Ctl('L'), "recenter"); | |
7299 initial_define_key (meta_map, 'r', "move-to-window-line"); | |
7300 } | |
52401 | 7301 |
7302 /* arch-tag: 90a9c576-0590-48f1-a5f1-6c96a0452d9f | |
7303 (do not change this comment) */ |