Mercurial > emacs
annotate src/window.c @ 96174:58ac3c5e4746
(fancy-about-text, fancy-startup-tail): Increase text size for
legibility.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sat, 21 Jun 2008 19:52:27 +0000 |
parents | edc51d72cb17 |
children | a99299e4d2de |
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, |
79759 | 4 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 |
5 Free Software Foundation, Inc. | |
265 | 6 |
7 This file is part of GNU Emacs. | |
8 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94515
diff
changeset
|
9 GNU Emacs is free software: you can redistribute it and/or modify |
265 | 10 it under the terms of the GNU General Public License as published by |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94515
diff
changeset
|
11 the Free Software Foundation, either version 3 of the License, or |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94515
diff
changeset
|
12 (at your option) any later version. |
265 | 13 |
14 GNU Emacs is distributed in the hope that it will be useful, | |
15 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
17 GNU General Public License for more details. | |
18 | |
19 You should have received a copy of the GNU General Public License | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94515
diff
changeset
|
20 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
265 | 21 |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4570
diff
changeset
|
22 #include <config.h> |
82995
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
23 #include <stdio.h> |
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
24 |
265 | 25 #include "lisp.h" |
26 #include "buffer.h" | |
31117
f390b90e3495
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30777
diff
changeset
|
27 #include "keyboard.h" |
39748
42b7a798ff79
Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
28 #include "keymap.h" |
769 | 29 #include "frame.h" |
265 | 30 #include "window.h" |
31 #include "commands.h" | |
32 #include "indent.h" | |
33 #include "termchar.h" | |
34 #include "disptab.h" | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
35 #include "dispextern.h" |
18657 | 36 #include "blockinput.h" |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
37 #include "intervals.h" |
85010
a3defcbdb064
(candidate_window_p): Only consider as visible frames that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84758
diff
changeset
|
38 #include "termhooks.h" /* For FRAME_TERMINAL. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
39 |
21825
697991d2a2c4
Conditionally include xterm.h using HAVE_X_WINDOWS.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21533
diff
changeset
|
40 #ifdef HAVE_X_WINDOWS |
21514 | 41 #include "xterm.h" |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
42 #endif /* HAVE_X_WINDOWS */ |
27633
ab6c81c6edf8
[WINDOWSNT]: Include w32term.h.
Andrew Innes <andrewi@gnu.org>
parents:
27553
diff
changeset
|
43 #ifdef WINDOWSNT |
ab6c81c6edf8
[WINDOWSNT]: Include w32term.h.
Andrew Innes <andrewi@gnu.org>
parents:
27553
diff
changeset
|
44 #include "w32term.h" |
ab6c81c6edf8
[WINDOWSNT]: Include w32term.h.
Andrew Innes <andrewi@gnu.org>
parents:
27553
diff
changeset
|
45 #endif |
27956
8d38dbe58989
[MSDOS]: Include msdos.h (for the definition of FRAME_INTERNAL_BORDER_WIDTH).
Eli Zaretskii <eliz@gnu.org>
parents:
27869
diff
changeset
|
46 #ifdef MSDOS |
8d38dbe58989
[MSDOS]: Include msdos.h (for the definition of FRAME_INTERNAL_BORDER_WIDTH).
Eli Zaretskii <eliz@gnu.org>
parents:
27869
diff
changeset
|
47 #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
|
48 #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
|
49 #ifdef MAC_OS |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32710
diff
changeset
|
50 #include "macterm.h" |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32710
diff
changeset
|
51 #endif |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
52 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
53 |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
54 Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_configuration_p; |
95590
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95566
diff
changeset
|
55 Lisp_Object Qdisplay_buffer; |
69209
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
56 Lisp_Object Qscroll_up, Qscroll_down; |
41736
d583dac59ea4
(Qleft_fringe, Qright_fringe): Remove. Now in frame.c.
Jason Rumney <jasonr@gnu.org>
parents:
41719
diff
changeset
|
57 Lisp_Object Qwindow_size_fixed; |
95590
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95566
diff
changeset
|
58 |
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
59 extern Lisp_Object Qleft_margin, Qright_margin; |
265 | 60 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
61 static int displayed_window_lines P_ ((struct window *)); |
20351 | 62 static struct window *decode_window P_ ((Lisp_Object)); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
63 static int count_windows P_ ((struct window *)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
64 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
|
65 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
|
66 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
|
67 static void window_scroll_line_based P_ ((Lisp_Object, int, int, int)); |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
68 static int window_min_size_1 P_ ((struct window *, int, int)); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
69 static int window_min_size_2 P_ ((struct window *, int, int)); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
70 static int window_min_size P_ ((struct window *, int, int, int, int *)); |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
71 static void size_window P_ ((Lisp_Object, int, int, int, int, int)); |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
72 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
|
73 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
|
74 static void enlarge_window P_ ((Lisp_Object, int, int)); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
75 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
|
76 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
|
77 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
|
78 Lisp_Object)); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
79 static Lisp_Object next_window P_ ((Lisp_Object, Lisp_Object, |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
80 Lisp_Object, int)); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
81 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
|
82 Lisp_Object *)); |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
83 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
|
84 int (* fn) (struct window *, void *), |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
85 void *)); |
33619
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
86 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
|
87 |
265 | 88 /* This is the window in which the terminal's cursor should |
89 be left when nothing is being done with it. This must | |
90 always be a leaf window, and its buffer is selected by | |
91 the top level editing loop at the end of each command. | |
92 | |
93 This value is always the same as | |
769 | 94 FRAME_SELECTED_WINDOW (selected_frame). */ |
265 | 95 |
96 Lisp_Object selected_window; | |
97 | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
98 /* 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
|
99 Functions creating or deleting windows should invalidate this cache |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
100 by setting it to nil. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
101 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
102 Lisp_Object Vwindow_list; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
103 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
104 /* The mini-buffer window of the selected frame. |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
105 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
|
106 by comparing against this; but you can test for mini-bufferness of |
265 | 107 the selected window. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
108 |
265 | 109 Lisp_Object minibuf_window; |
110 | |
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
111 /* 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
|
112 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
|
113 |
43594
23cddac4d0b7
(minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents:
43571
diff
changeset
|
114 Lisp_Object minibuf_selected_window; |
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
115 |
265 | 116 /* 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
|
117 when the mini-buffer is selected. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
118 |
265 | 119 Lisp_Object Vminibuf_scroll_window; |
120 | |
121 /* 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
|
122 |
265 | 123 Lisp_Object Vother_window_scroll_buffer; |
124 | |
125 /* 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
|
126 |
265 | 127 Lisp_Object Vtemp_buffer_show_function; |
128 | |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
129 /* 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
|
130 does partial scrolling by modifying window-vscroll. */ |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
131 |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
132 int auto_window_vscroll_p; |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
133 |
43281
a4ea76de57c9
(Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents:
43241
diff
changeset
|
134 /* 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
|
135 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
|
136 minibuffer is active. */ |
a4ea76de57c9
(Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents:
43241
diff
changeset
|
137 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
|
138 |
265 | 139 /* 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
|
140 |
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
|
141 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
|
142 EMACS_INT window_min_width; |
265 | 143 |
10461
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
144 /* 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
|
145 |
10461
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
146 Lisp_Object Qtemp_buffer_show_hook; |
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
147 |
265 | 148 /* 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
|
149 |
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
|
150 EMACS_INT next_screen_context_lines; |
265 | 151 |
152 /* Incremented for each window created. */ | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
153 |
265 | 154 static int sequence_number; |
155 | |
14445
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
156 /* Nonzero after init_window_once has finished. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
157 |
14445
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
158 static int window_initialized; |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
159 |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
160 /* Hook to run when window config changes. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
161 |
92192
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
162 static Lisp_Object Qwindow_configuration_change_hook; |
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
163 static Lisp_Object Vwindow_configuration_change_hook; |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
164 |
58083 | 165 /* 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
|
166 at the same screen height as previously. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
167 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
168 Lisp_Object Vscroll_preserve_screen_position; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
169 |
95777
edc51d72cb17
* window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
170 /* Non-nil means that text is inserted before window's markers. */ |
edc51d72cb17
* window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
171 |
edc51d72cb17
* window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
172 Lisp_Object Vwindow_point_insertion_type; |
edc51d72cb17
* window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
173 |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
174 /* 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
|
175 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
176 int window_deletion_count; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
177 |
69342
12e65aa88734
Declare preserve_y as a static global variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69209
diff
changeset
|
178 /* Used by the function window_scroll_pixel_based */ |
12e65aa88734
Declare preserve_y as a static global variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69209
diff
changeset
|
179 |
95566
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
180 static int window_scroll_pixel_based_preserve_x; |
69408
aa89c5390b12
Rename preserve_y to window_scroll_pixel_based_preserve_y.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69342
diff
changeset
|
181 static int window_scroll_pixel_based_preserve_y; |
69342
12e65aa88734
Declare preserve_y as a static global variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69209
diff
changeset
|
182 |
95566
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
183 /* Same for window_scroll_line_based. */ |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
184 |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
185 static int window_scroll_preserve_hpos; |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
186 static int window_scroll_preserve_vpos; |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
187 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
188 #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
|
189 /* 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
|
190 static int inhibit_frame_unsplittable; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
191 #endif /* 0 */ |
17540
eb82c4de9dea
(frame_allow_splitting): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17365
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 extern EMACS_INT scroll_margin; |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
194 |
14149
0d67df27dc2a
(Fset_window_buffer): Call the window-scroll-functions.
Richard M. Stallman <rms@gnu.org>
parents:
14089
diff
changeset
|
195 extern Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions; |
265 | 196 |
197 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
|
198 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
|
199 (object) |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
200 Lisp_Object object; |
265 | 201 { |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
202 return WINDOWP (object) ? Qt : Qnil; |
265 | 203 } |
204 | |
2210
22d78dbb3cc7
Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents:
2190
diff
changeset
|
205 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
|
206 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
|
207 (object) |
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
208 Lisp_Object object; |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
209 { |
35398
ef34ddc12a7d
* window.c (Fwindow_live_p): Use WINDOW_LIVE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
35396
diff
changeset
|
210 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
|
211 } |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
212 |
265 | 213 Lisp_Object |
214 make_window () | |
215 { | |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
216 Lisp_Object val; |
265 | 217 register struct window *p; |
36432
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
218 |
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
219 p = allocate_window (); |
58265
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
220 ++sequence_number; |
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
221 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
|
222 XSETFASTINT (p->left_col, 0); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
223 XSETFASTINT (p->top_line, 0); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
224 XSETFASTINT (p->total_lines, 0); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
225 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
|
226 XSETFASTINT (p->hscroll, 0); |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
227 XSETFASTINT (p->min_hscroll, 0); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
228 p->orig_top_line = p->orig_total_lines = Qnil; |
265 | 229 p->start = Fmake_marker (); |
230 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
|
231 XSETFASTINT (p->use_time, 0); |
769 | 232 p->frame = Qnil; |
265 | 233 p->display_table = Qnil; |
234 p->dedicated = Qnil; | |
95547
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
235 p->window_parameters = Qnil; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
236 p->pseudo_window_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
237 bzero (&p->cursor, sizeof (p->cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
238 bzero (&p->last_cursor, sizeof (p->last_cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
239 bzero (&p->phys_cursor, sizeof (p->phys_cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
240 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
|
241 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
|
242 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
|
243 p->phys_cursor_width = -1; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
244 p->must_be_updated_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
245 XSETFASTINT (p->window_end_vpos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
246 XSETFASTINT (p->window_end_pos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
247 p->window_end_valid = Qnil; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
248 p->vscroll = 0; |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
249 XSETWINDOW (val, p); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
250 XSETFASTINT (p->last_point, 0); |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
251 p->frozen_window_start_p = 0; |
44744
8c52c2bf3b3f
(make_window): Initialize height_fixed_p,
Richard M. Stallman <rms@gnu.org>
parents:
44649
diff
changeset
|
252 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
|
253 p->left_margin_cols = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
254 p->right_margin_cols = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
255 p->left_fringe_width = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
256 p->right_fringe_width = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
257 p->fringes_outside_margins = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
258 p->scroll_bar_width = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
259 p->vertical_scroll_bar_type = Qt; |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
260 p->resize_proportionally = Qnil; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
261 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
262 Vwindow_list = Qnil; |
265 | 263 return val; |
264 } | |
265 | |
266 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
|
267 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
|
268 () |
265 | 269 { |
270 return selected_window; | |
271 } | |
272 | |
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
273 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
|
274 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
|
275 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
|
276 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
|
277 (frame) |
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
278 Lisp_Object frame; |
265 | 279 { |
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
280 if (NILP (frame)) |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
281 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
282 CHECK_LIVE_FRAME (frame); |
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
283 return FRAME_MINIBUF_WINDOW (XFRAME (frame)); |
265 | 284 } |
285 | |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
286 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
|
287 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
|
288 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
|
289 (window) |
265 | 290 Lisp_Object window; |
291 { | |
292 struct window *w = decode_window (window); | |
32871
361743be1fa8
(pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
32824
diff
changeset
|
293 return MINI_WINDOW_P (w) ? Qt : Qnil; |
32710
cd7dca826a03
(pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents:
32426
diff
changeset
|
294 } |
cd7dca826a03
(pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents:
32426
diff
changeset
|
295 |
cd7dca826a03
(pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents:
32426
diff
changeset
|
296 |
265 | 297 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
|
298 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
|
299 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
|
300 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
|
301 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
|
302 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
|
303 If POS is only out of view because of horizontal scrolling, return non-nil. |
73013
6ebbc42247b3
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72998
diff
changeset
|
304 If POS is t, it specifies the position of the last visible glyph in WINDOW. |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
305 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
|
306 |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
307 If POS is visible, return t if PARTIALLY is nil; if PARTIALLY is non-nil, |
72663
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
308 return value is a list of 2 or 6 elements (X Y [RTOP RBOT ROWH VPOS]), |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
309 where X and Y are the pixel coordinates relative to the top left corner |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
310 of the window. The remaining elements are omitted if the character after |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
311 POS is fully visible; otherwise, RTOP and RBOT are the number of pixels |
73013
6ebbc42247b3
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72998
diff
changeset
|
312 off-window at the top and bottom of the row, ROWH is the height of the |
72990
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
313 display row, and VPOS is the row number (0-based) containing POS. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
314 (pos, window, partially) |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
315 Lisp_Object pos, window, partially; |
265 | 316 { |
317 register struct window *w; | |
318 register int posint; | |
319 register struct buffer *buf; | |
25300
096b78b6cc2e
(Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
25268
diff
changeset
|
320 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
|
321 Lisp_Object in_window = Qnil; |
72663
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
322 int rtop, rbot, rowh, vpos, fully_p = 1; |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
323 int x, y; |
265 | 324 |
32937 | 325 w = decode_window (window); |
326 buf = XBUFFER (w->buffer); | |
327 SET_TEXT_POS_FROM_MARKER (top, w->start); | |
328 | |
73013
6ebbc42247b3
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72998
diff
changeset
|
329 if (EQ (pos, Qt)) |
6ebbc42247b3
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72998
diff
changeset
|
330 posint = -1; |
6ebbc42247b3
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72998
diff
changeset
|
331 else if (!NILP (pos)) |
265 | 332 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
333 CHECK_NUMBER_COERCE_MARKER (pos); |
265 | 334 posint = XINT (pos); |
335 } | |
32937 | 336 else if (w == XWINDOW (selected_window)) |
337 posint = PT; | |
338 else | |
339 posint = XMARKER (w->pointm)->charpos; | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
340 |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
341 /* 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
|
342 or if window start is out of range, position is not visible. */ |
73013
6ebbc42247b3
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72998
diff
changeset
|
343 if ((EQ (pos, Qt) |
6ebbc42247b3
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72998
diff
changeset
|
344 || (posint >= CHARPOS (top) && posint <= BUF_ZV (buf))) |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
345 && 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
|
346 && CHARPOS (top) <= BUF_ZV (buf) |
72663
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
347 && pos_visible_p (w, posint, &x, &y, &rtop, &rbot, &rowh, &vpos) |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
348 && (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
|
349 in_window = Qt; |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
350 |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
351 if (!NILP (in_window) && !NILP (partially)) |
72663
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
352 { |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
353 Lisp_Object part = Qnil; |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
354 if (!fully_p) |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
355 part = list4 (make_number (rtop), make_number (rbot), |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
356 make_number (rowh), make_number (vpos)); |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
357 in_window = Fcons (make_number (x), |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
358 Fcons (make_number (y), part)); |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
359 } |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
360 |
25300
096b78b6cc2e
(Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
25268
diff
changeset
|
361 return in_window; |
265 | 362 } |
32871
361743be1fa8
(pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
32824
diff
changeset
|
363 |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
364 DEFUN ("window-line-height", Fwindow_line_height, |
72990
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
365 Swindow_line_height, 0, 2, 0, |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
366 doc: /* Return height in pixels of text line LINE in window WINDOW. |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
367 If WINDOW is nil or omitted, use selected window. |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
368 |
72990
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
369 Return height of current line if LINE is omitted or nil. Return height of |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
370 header or mode line if LINE is `header-line' and `mode-line'. |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
371 Otherwise, LINE is a text line number starting from 0. A negative number |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
372 counts from the end of the window. |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
373 |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
374 Value is a list (HEIGHT VPOS YPOS OFFBOT), where HEIGHT is the height |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
375 in pixels of the visible part of the line, VPOS and YPOS are the |
73018
aab836d32a11
(Fpos_visible_in_window_p): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
73013
diff
changeset
|
376 vertical position in lines and pixels of the line, relative to the top |
73013
6ebbc42247b3
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72998
diff
changeset
|
377 of the first text line, and OFFBOT is the number of off-window pixels at |
73018
aab836d32a11
(Fpos_visible_in_window_p): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
73013
diff
changeset
|
378 the bottom of the text line. If there are off-window pixels at the top |
aab836d32a11
(Fpos_visible_in_window_p): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
73013
diff
changeset
|
379 of the (first) text line, YPOS is negative. |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
380 |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
381 Return nil if window display is not up-to-date. In that case, use |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
382 `pos-visible-in-window-p' to obtain the information. */) |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
383 (line, window) |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
384 Lisp_Object line, window; |
72907
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
385 { |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
386 register struct window *w; |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
387 register struct buffer *b; |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
388 struct glyph_row *row, *end_row; |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
389 int max_y, crop, i, n; |
72907
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
390 |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
391 w = decode_window (window); |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
392 |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
393 if (noninteractive |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
394 || w->pseudo_window_p) |
72990
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
395 return Qnil; |
72907
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
396 |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
397 CHECK_BUFFER (w->buffer); |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
398 b = XBUFFER (w->buffer); |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
399 |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
400 /* Fail if current matrix is not up-to-date. */ |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
401 if (NILP (w->window_end_valid) |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
402 || current_buffer->clip_changed |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
403 || current_buffer->prevent_redisplay_optimizations_p |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
404 || XFASTINT (w->last_modified) < BUF_MODIFF (b) |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
405 || XFASTINT (w->last_overlay_modified) < BUF_OVERLAY_MODIFF (b)) |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
406 return Qnil; |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
407 |
72990
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
408 if (NILP (line)) |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
409 { |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
410 i = w->cursor.vpos; |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
411 if (i < 0 || i >= w->current_matrix->nrows |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
412 || (row = MATRIX_ROW (w->current_matrix, i), !row->enabled_p)) |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
413 return Qnil; |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
414 max_y = window_text_bottom_y (w); |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
415 goto found_row; |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
416 } |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
417 |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
418 if (EQ (line, Qheader_line)) |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
419 { |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
420 if (!WINDOW_WANTS_HEADER_LINE_P (w)) |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
421 return Qnil; |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
422 row = MATRIX_HEADER_LINE_ROW (w->current_matrix); |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
423 if (!row->enabled_p) |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
424 return Qnil; |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
425 return list4 (make_number (row->height), |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
426 make_number (0), make_number (0), |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
427 make_number (0)); |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
428 } |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
429 |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
430 if (EQ (line, Qmode_line)) |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
431 { |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
432 row = MATRIX_MODE_LINE_ROW (w->current_matrix); |
72907
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
433 if (!row->enabled_p) |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
434 return Qnil; |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
435 return list4 (make_number (row->height), |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
436 make_number (0), /* not accurate */ |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
437 make_number (WINDOW_HEADER_LINE_HEIGHT (w) |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
438 + window_text_bottom_y (w)), |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
439 make_number (0)); |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
440 } |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
441 |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
442 CHECK_NUMBER (line); |
72990
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
443 n = XINT (line); |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
444 |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
445 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
446 end_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w); |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
447 max_y = window_text_bottom_y (w); |
72990
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
448 i = 0; |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
449 |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
450 while ((n < 0 || i < n) |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
451 && row <= end_row && row->enabled_p |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
452 && row->y + row->height < max_y) |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
453 row++, i++; |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
454 |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
455 if (row > end_row || !row->enabled_p) |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
456 return Qnil; |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
457 |
72990
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
458 if (++n < 0) |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
459 { |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
460 if (-n > i) |
72907
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
461 return Qnil; |
72990
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
462 row += n; |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
463 i += n; |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
464 } |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
465 |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
466 found_row: |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
467 crop = max (0, (row->y + row->height) - max_y); |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
468 return list4 (make_number (row->height + min (0, row->y) - crop), |
72990
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
469 make_number (i), |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
470 make_number (row->y), |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
471 make_number (crop)); |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
472 } |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
473 |
72907
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
474 |
265 | 475 |
476 static struct window * | |
477 decode_window (window) | |
478 register Lisp_Object window; | |
479 { | |
485 | 480 if (NILP (window)) |
265 | 481 return XWINDOW (selected_window); |
482 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
483 CHECK_LIVE_WINDOW (window); |
265 | 484 return XWINDOW (window); |
485 } | |
486 | |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
487 static struct window * |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
488 decode_any_window (window) |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
489 register Lisp_Object window; |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
490 { |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
491 if (NILP (window)) |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
492 return XWINDOW (selected_window); |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
493 |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
494 CHECK_WINDOW (window); |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
495 return XWINDOW (window); |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
496 } |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
497 |
265 | 498 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
|
499 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
|
500 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
|
501 (window) |
265 | 502 Lisp_Object window; |
503 { | |
504 return decode_window (window)->buffer; | |
505 } | |
506 | |
507 DEFUN ("window-height", Fwindow_height, Swindow_height, 0, 1, 0, | |
75753
5e34b32b9b4c
(Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents:
75348
diff
changeset
|
508 doc: /* Return the number of lines in WINDOW (including its mode line). |
5e34b32b9b4c
(Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents:
75348
diff
changeset
|
509 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
|
510 (window) |
265 | 511 Lisp_Object window; |
512 { | |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
513 return decode_any_window (window)->total_lines; |
265 | 514 } |
515 | |
516 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
|
517 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
|
518 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
|
519 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
|
520 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
|
521 (window) |
265 | 522 Lisp_Object window; |
523 { | |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
524 return make_number (window_box_text_cols (decode_any_window (window))); |
265 | 525 } |
526 | |
78415
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
527 DEFUN ("window-full-width-p", Fwindow_full_width_p, Swindow_full_width_p, 0, 1, 0, |
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
528 doc: /* Return t if WINDOW is as wide as its frame. |
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
529 WINDOW defaults to the selected window. */) |
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
530 (window) |
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
531 Lisp_Object window; |
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
532 { |
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
533 return WINDOW_FULL_WIDTH_P (decode_any_window (window)) ? Qt : Qnil; |
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
534 } |
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
535 |
265 | 536 DEFUN ("window-hscroll", Fwindow_hscroll, Swindow_hscroll, 0, 1, 0, |
75753
5e34b32b9b4c
(Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents:
75348
diff
changeset
|
537 doc: /* Return the number of columns by which WINDOW is scrolled from left margin. |
5e34b32b9b4c
(Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents:
75348
diff
changeset
|
538 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
|
539 (window) |
265 | 540 Lisp_Object window; |
541 { | |
542 return decode_window (window)->hscroll; | |
543 } | |
544 | |
545 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
|
546 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
|
547 Return NCOL. NCOL should be zero or positive. |
45645
6e2471fb2c1c
(Fset_window_hscroll): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
45584
diff
changeset
|
548 |
6e2471fb2c1c
(Fset_window_hscroll): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
45584
diff
changeset
|
549 Note that if `automatic-hscrolling' is non-nil, you cannot scroll the |
73013
6ebbc42247b3
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72998
diff
changeset
|
550 window so that the location of point moves off-window. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
551 (window, ncol) |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
552 Lisp_Object window, ncol; |
265 | 553 { |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
554 struct window *w = decode_window (window); |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
555 int hscroll; |
265 | 556 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
557 CHECK_NUMBER (ncol); |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
558 hscroll = max (0, XINT (ncol)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
559 |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
560 /* Prevent redisplay shortcuts when changing the hscroll. */ |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
561 if (XINT (w->hscroll) != hscroll) |
25375 | 562 XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
563 |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
564 w->hscroll = make_number (hscroll); |
265 | 565 return ncol; |
566 } | |
567 | |
13457
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
568 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
|
569 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
|
570 doc: /* Return WINDOW's redisplay end trigger value. |
75753
5e34b32b9b4c
(Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents:
75348
diff
changeset
|
571 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
|
572 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
|
573 (window) |
13457
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
574 Lisp_Object window; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
575 { |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
576 return decode_window (window)->redisplay_end_trigger; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
577 } |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
578 |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
579 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
|
580 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
|
581 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
|
582 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
|
583 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
|
584 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
|
585 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
|
586 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
|
587 (window, value) |
13457
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
588 register Lisp_Object window, value; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
589 { |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
590 register struct window *w; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
591 |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
592 w = decode_window (window); |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
593 w->redisplay_end_trigger = value; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
594 return value; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
595 } |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
596 |
265 | 597 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
|
598 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
|
599 \(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
|
600 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
|
601 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
|
602 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
|
603 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
|
604 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
|
605 (window) |
265 | 606 Lisp_Object window; |
607 { | |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
608 register struct window *w = decode_any_window (window); |
265 | 609 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
610 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
|
611 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
|
612 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
|
613 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
|
614 Qnil)))); |
265 | 615 } |
616 | |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
617 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
|
618 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
|
619 \(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
|
620 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
|
621 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
|
622 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
|
623 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
|
624 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
|
625 (window) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
626 Lisp_Object window; |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
627 { |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
628 register struct window *w = decode_any_window (window); |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
629 |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
630 return Fcons (make_number (WINDOW_LEFT_EDGE_X (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
631 Fcons (make_number (WINDOW_TOP_EDGE_Y (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
632 Fcons (make_number (WINDOW_RIGHT_EDGE_X (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
633 Fcons (make_number (WINDOW_BOTTOM_EDGE_Y (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
634 Qnil)))); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
635 } |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
636 |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
637 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
|
638 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
|
639 \(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
|
640 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
|
641 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
|
642 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
|
643 display margins, fringes, header line, and/or mode line. */) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
644 (window) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
645 Lisp_Object window; |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
646 { |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
647 register struct window *w = decode_any_window (window); |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
648 |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
649 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
|
650 + WINDOW_LEFT_MARGIN_COLS (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
651 + WINDOW_LEFT_FRINGE_COLS (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
652 make_number (WINDOW_TOP_EDGE_LINE (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
653 + 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
|
654 make_number (WINDOW_BOX_RIGHT_EDGE_COL (w) |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
655 - WINDOW_RIGHT_MARGIN_COLS (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
656 - WINDOW_RIGHT_FRINGE_COLS (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
657 make_number (WINDOW_BOTTOM_EDGE_LINE (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
658 - WINDOW_MODE_LINE_LINES (w))); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
659 } |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
660 |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
661 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
|
662 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
|
663 \(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
|
664 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
|
665 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
|
666 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
|
667 display margins, fringes, header line, and/or mode line. */) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
668 (window) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
669 Lisp_Object window; |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
670 { |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
671 register struct window *w = decode_any_window (window); |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
672 |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
673 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
|
674 + WINDOW_LEFT_MARGIN_WIDTH (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
675 + WINDOW_LEFT_FRINGE_WIDTH (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
676 make_number (WINDOW_TOP_EDGE_Y (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
677 + 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
|
678 make_number (WINDOW_BOX_RIGHT_EDGE_X (w) |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
679 - WINDOW_RIGHT_MARGIN_WIDTH (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
680 - WINDOW_RIGHT_FRINGE_WIDTH (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
681 make_number (WINDOW_BOTTOM_EDGE_Y (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
682 - WINDOW_MODE_LINE_HEIGHT (w))); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
683 } |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
684 |
25315
79bb4978ab2e
(Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents:
25300
diff
changeset
|
685 /* 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
|
686 If it is not, return ON_NOTHING; |
432 | 687 if it is in the window's text area, |
688 set *x and *y to its location relative to the upper left corner | |
689 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
|
690 return ON_TEXT; |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
691 if it is on the window's modeline, return ON_MODE_LINE; |
432 | 692 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
|
693 return ON_VERTICAL_BORDER. |
56542
6d2d9477f39e
(coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents:
56540
diff
changeset
|
694 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
|
695 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
|
696 if it is on the window's top line, return ON_HEADER_LINE; |
41127 | 697 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
|
698 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
|
699 to window-relative coordinates; |
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
700 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
|
701 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
|
702 to window-relative coordinates. |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
703 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
704 X and Y are frame relative pixel coordinates. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
705 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
706 static enum window_part |
432 | 707 coordinates_in_window (w, x, y) |
708 register struct window *w; | |
709 register int *x, *y; | |
710 { | |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
711 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
712 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
|
713 enum window_part part; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
714 int ux = FRAME_COLUMN_WIDTH (f); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
715 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
|
716 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
|
717 /* 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
|
718 (Between mode lines for instance. */ |
f03dfbb443ce
(coordinates_in_window): Increase width of area
Gerd Moellmann <gerd@gnu.org>
parents:
36068
diff
changeset
|
719 int grabbable_width = ux; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
720 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
|
721 |
28918
e42cd428f056
(coordinates_in_window): Subtract 1 when computing right_x.
Eli Zaretskii <eliz@gnu.org>
parents:
28726
diff
changeset
|
722 /* 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
|
723 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
|
724 if (w->pseudo_window_p) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
725 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
726 left_x = 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
727 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
|
728 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
|
729 bottom_y = WINDOW_BOTTOM_EDGE_Y (w); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
730 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
731 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
732 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
733 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
|
734 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
|
735 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
|
736 bottom_y = WINDOW_BOTTOM_EDGE_Y (w); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
737 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
738 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
739 /* Outside any interesting row? */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
740 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
|
741 return ON_NOTHING; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
742 |
33957
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
743 /* 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
|
744 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
|
745 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
|
746 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
|
747 scroll bars. */ |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
748 |
33957
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
749 if (WINDOW_WANTS_MODELINE_P (w) |
53129
070325c3884d
(coordinates_in_window): Remove redundant tests.
Kim F. Storm <storm@cua.dk>
parents:
52853
diff
changeset
|
750 && *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
|
751 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
752 part = ON_MODE_LINE; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
753 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
754 header_vertical_border_check: |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
755 /* 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
|
756 between mode lines of horizontally adjacent mode lines |
95550
e057f981a6b5
(Fset_window_parameter): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
95547
diff
changeset
|
757 as the vertical border. If scroll bars on the left, |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
758 return the right window. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
759 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
|
760 || WINDOW_RIGHTMOST_P (w)) |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
761 { |
85260 | 762 if (!WINDOW_LEFTMOST_P (w) && eabs (*x - x0) < grabbable_width) |
70042
abc53f51fd3e
(coordinates_in_window): On the vertical border, calculate the row number
Nick Roberts <nickrob@snap.net.nz>
parents:
69606
diff
changeset
|
763 { |
70058
12c8842436ef
(window_loop): Test w->dedicated with !NILP instead of EQ Qt.
Kim F. Storm <storm@cua.dk>
parents:
70042
diff
changeset
|
764 /* Convert X and Y to window relative coordinates. |
12c8842436ef
(window_loop): Test w->dedicated with !NILP instead of EQ Qt.
Kim F. Storm <storm@cua.dk>
parents:
70042
diff
changeset
|
765 Vertical border is at the left edge of window. */ |
70042
abc53f51fd3e
(coordinates_in_window): On the vertical border, calculate the row number
Nick Roberts <nickrob@snap.net.nz>
parents:
69606
diff
changeset
|
766 *x = max (0, *x - x0); |
abc53f51fd3e
(coordinates_in_window): On the vertical border, calculate the row number
Nick Roberts <nickrob@snap.net.nz>
parents:
69606
diff
changeset
|
767 *y -= top_y; |
abc53f51fd3e
(coordinates_in_window): On the vertical border, calculate the row number
Nick Roberts <nickrob@snap.net.nz>
parents:
69606
diff
changeset
|
768 return ON_VERTICAL_BORDER; |
abc53f51fd3e
(coordinates_in_window): On the vertical border, calculate the row number
Nick Roberts <nickrob@snap.net.nz>
parents:
69606
diff
changeset
|
769 } |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
770 } |
51223
c1daf1c22f97
(Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents:
51207
diff
changeset
|
771 else |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
772 { |
85260 | 773 if (eabs (*x - x1) < grabbable_width) |
70042
abc53f51fd3e
(coordinates_in_window): On the vertical border, calculate the row number
Nick Roberts <nickrob@snap.net.nz>
parents:
69606
diff
changeset
|
774 { |
70058
12c8842436ef
(window_loop): Test w->dedicated with !NILP instead of EQ Qt.
Kim F. Storm <storm@cua.dk>
parents:
70042
diff
changeset
|
775 /* Convert X and Y to window relative coordinates. |
12c8842436ef
(window_loop): Test w->dedicated with !NILP instead of EQ Qt.
Kim F. Storm <storm@cua.dk>
parents:
70042
diff
changeset
|
776 Vertical border is at the right edge of window. */ |
70042
abc53f51fd3e
(coordinates_in_window): On the vertical border, calculate the row number
Nick Roberts <nickrob@snap.net.nz>
parents:
69606
diff
changeset
|
777 *x = min (x1, *x) - x0; |
abc53f51fd3e
(coordinates_in_window): On the vertical border, calculate the row number
Nick Roberts <nickrob@snap.net.nz>
parents:
69606
diff
changeset
|
778 *y -= top_y; |
abc53f51fd3e
(coordinates_in_window): On the vertical border, calculate the row number
Nick Roberts <nickrob@snap.net.nz>
parents:
69606
diff
changeset
|
779 return ON_VERTICAL_BORDER; |
abc53f51fd3e
(coordinates_in_window): On the vertical border, calculate the row number
Nick Roberts <nickrob@snap.net.nz>
parents:
69606
diff
changeset
|
780 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
781 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
782 |
57309
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
783 if (*x < x0 || *x >= x1) |
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
784 return ON_NOTHING; |
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
785 |
51477
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
786 /* 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
|
787 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
|
788 *x -= x0; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
789 *y -= top_y; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
790 return part; |
33957
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
791 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
792 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
793 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
|
794 && *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
|
795 { |
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
796 part = ON_HEADER_LINE; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
797 goto header_vertical_border_check; |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
798 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
799 |
57309
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
800 if (*x < x0 || *x >= x1) |
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
801 return ON_NOTHING; |
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
802 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
803 /* Outside any interesting column? */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
804 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
|
805 { |
7810bc0b0259
(coordinates_in_window): Fix returned y position when
Kim F. Storm <storm@cua.dk>
parents:
65975
diff
changeset
|
806 *y -= top_y; |
7810bc0b0259
(coordinates_in_window): Fix returned y position when
Kim F. Storm <storm@cua.dk>
parents:
65975
diff
changeset
|
807 return ON_SCROLL_BAR; |
7810bc0b0259
(coordinates_in_window): Fix returned y position when
Kim F. Storm <storm@cua.dk>
parents:
65975
diff
changeset
|
808 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
809 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
810 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
|
811 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
|
812 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
813 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
|
814 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
|
815 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
816 if (FRAME_WINDOW_P (f)) |
25315
79bb4978ab2e
(Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents:
25300
diff
changeset
|
817 { |
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
818 if (!w->pseudo_window_p |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
819 && !WINDOW_HAS_VERTICAL_SCROLL_BAR (w) |
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
820 && !WINDOW_RIGHTMOST_P (w) |
85260 | 821 && (eabs (*x - right_x) < grabbable_width)) |
70042
abc53f51fd3e
(coordinates_in_window): On the vertical border, calculate the row number
Nick Roberts <nickrob@snap.net.nz>
parents:
69606
diff
changeset
|
822 { |
70058
12c8842436ef
(window_loop): Test w->dedicated with !NILP instead of EQ Qt.
Kim F. Storm <storm@cua.dk>
parents:
70042
diff
changeset
|
823 /* Convert X and Y to window relative coordinates. |
12c8842436ef
(window_loop): Test w->dedicated with !NILP instead of EQ Qt.
Kim F. Storm <storm@cua.dk>
parents:
70042
diff
changeset
|
824 Vertical border is at the right edge of window. */ |
70042
abc53f51fd3e
(coordinates_in_window): On the vertical border, calculate the row number
Nick Roberts <nickrob@snap.net.nz>
parents:
69606
diff
changeset
|
825 *x = min (right_x, *x) - left_x; |
abc53f51fd3e
(coordinates_in_window): On the vertical border, calculate the row number
Nick Roberts <nickrob@snap.net.nz>
parents:
69606
diff
changeset
|
826 *y -= top_y; |
abc53f51fd3e
(coordinates_in_window): On the vertical border, calculate the row number
Nick Roberts <nickrob@snap.net.nz>
parents:
69606
diff
changeset
|
827 return ON_VERTICAL_BORDER; |
abc53f51fd3e
(coordinates_in_window): On the vertical border, calculate the row number
Nick Roberts <nickrob@snap.net.nz>
parents:
69606
diff
changeset
|
828 } |
25315
79bb4978ab2e
(Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents:
25300
diff
changeset
|
829 } |
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
830 else |
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
831 { |
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
832 /* 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
|
833 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
|
834 if (!w->pseudo_window_p |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
835 && !WINDOW_RIGHTMOST_P (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
836 && *x > right_x - ux) |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
837 { |
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
838 /* 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
|
839 this area begins at RIGHT_X minus a canonical char width. */ |
70042
abc53f51fd3e
(coordinates_in_window): On the vertical border, calculate the row number
Nick Roberts <nickrob@snap.net.nz>
parents:
69606
diff
changeset
|
840 *x = min (right_x, *x) - left_x; |
abc53f51fd3e
(coordinates_in_window): On the vertical border, calculate the row number
Nick Roberts <nickrob@snap.net.nz>
parents:
69606
diff
changeset
|
841 *y -= top_y; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
842 return ON_VERTICAL_BORDER; |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
843 } |
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
844 } |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
845 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
846 if (*x < text_left) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
847 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
848 if (lmargin_width > 0 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
849 && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
850 ? (*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
|
851 : (*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
|
852 { |
53129
070325c3884d
(coordinates_in_window): Remove redundant tests.
Kim F. Storm <storm@cua.dk>
parents:
52853
diff
changeset
|
853 *x -= left_x; |
51477
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
854 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
|
855 *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
|
856 *y -= top_y; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
857 return ON_LEFT_MARGIN; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
858 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
859 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
860 /* 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
|
861 *x -= left_x; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
862 *y -= top_y; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
863 return ON_LEFT_FRINGE; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
864 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
865 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
866 if (*x >= text_right) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
867 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
868 if (rmargin_width > 0 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
869 && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
870 ? (*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
|
871 : (*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
|
872 { |
66030
999beda71a39
(coordinates_in_window): Fix x position for ON_RIGHT_MARGIN.
Kim F. Storm <storm@cua.dk>
parents:
66018
diff
changeset
|
873 *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
|
874 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
|
875 *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
|
876 *y -= top_y; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
877 return ON_RIGHT_MARGIN; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
878 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
879 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
880 /* 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
|
881 *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
|
882 *y -= top_y; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
883 return ON_RIGHT_FRINGE; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
884 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
885 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
886 /* 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
|
887 *x -= text_left; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
888 *y -= top_y; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
889 return ON_TEXT; |
432 | 890 } |
891 | |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
892 |
432 | 893 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
|
894 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
|
895 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
|
896 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
|
897 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
|
898 \(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
|
899 frame. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
900 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
|
901 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
|
902 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
|
903 If they are in the top mode line of WINDOW, `header-line' is returned. |
41127 | 904 If they are in the left fringe of WINDOW, `left-fringe' is returned. |
905 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
|
906 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
|
907 `vertical-line' is returned. |
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
908 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
|
909 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
|
910 (coordinates, window) |
432 | 911 register Lisp_Object coordinates, window; |
912 { | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
913 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
914 struct frame *f; |
432 | 915 int x, y; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
916 Lisp_Object lx, ly; |
432 | 917 |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
918 CHECK_WINDOW (window); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
919 w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
920 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
|
921 CHECK_CONS (coordinates); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
922 lx = Fcar (coordinates); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
923 ly = Fcdr (coordinates); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
924 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
|
925 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
|
926 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
|
927 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
|
928 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
929 switch (coordinates_in_window (w, &x, &y)) |
432 | 930 { |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
931 case ON_NOTHING: |
432 | 932 return Qnil; |
933 | |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
934 case ON_TEXT: |
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
935 /* 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
|
936 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
|
937 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
|
938 FRAME_CANON_Y_FROM_PIXEL_Y (f, y)); |
432 | 939 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
940 case ON_MODE_LINE: |
432 | 941 return Qmode_line; |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
942 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
943 case ON_VERTICAL_BORDER: |
732 | 944 return Qvertical_line; |
432 | 945 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
946 case ON_HEADER_LINE: |
25546 | 947 return Qheader_line; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
948 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
949 case ON_LEFT_FRINGE: |
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
950 return Qleft_fringe; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
951 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
952 case ON_RIGHT_FRINGE: |
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
953 return Qright_fringe; |
25315
79bb4978ab2e
(Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents:
25300
diff
changeset
|
954 |
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
955 case ON_LEFT_MARGIN: |
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
956 return Qleft_margin; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
957 |
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
958 case ON_RIGHT_MARGIN: |
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
959 return Qright_margin; |
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
960 |
56542
6d2d9477f39e
(coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents:
56540
diff
changeset
|
961 case ON_SCROLL_BAR: |
6d2d9477f39e
(coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents:
56540
diff
changeset
|
962 /* 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
|
963 return Qnil; |
6d2d9477f39e
(coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents:
56540
diff
changeset
|
964 |
432 | 965 default: |
966 abort (); | |
967 } | |
968 } | |
969 | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
970 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
971 /* 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
|
972 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
|
973 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
|
974 |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
975 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
|
976 does, return W in *CW->window, as Lisp_Object, and return in |
30777 | 977 *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
|
978 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
|
979 |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
980 struct check_window_data |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
981 { |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
982 Lisp_Object *window; |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
983 int *x, *y; |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
984 enum window_part *part; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
985 }; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
986 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
987 static int |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
988 check_window_containing (w, user_data) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
989 struct window *w; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
990 void *user_data; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
991 { |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
992 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
|
993 enum window_part found; |
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
994 int continue_p = 1; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
995 |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
996 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
|
997 if (found != ON_NOTHING) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
998 { |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
999 *cw->part = found; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1000 XSETWINDOW (*cw->window, w); |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
1001 continue_p = 0; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1002 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1003 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
1004 return continue_p; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1005 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1006 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1007 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1008 /* 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
|
1009 return it as a Lisp_Object. |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1010 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1011 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
|
1012 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
|
1013 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
|
1014 |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
1015 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
|
1016 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
|
1017 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1018 This function was previously implemented with a loop cycling over |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1019 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
|
1020 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
|
1021 implementation of next_window using Vwindow_list, because |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1022 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
|
1023 tree of F when this function is called asynchronously from |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1024 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
|
1025 case. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1026 |
265 | 1027 Lisp_Object |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1028 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
|
1029 struct frame *f; |
265 | 1030 int x, y; |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
1031 enum window_part *part; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1032 int *wx, *wy; |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25540
diff
changeset
|
1033 int tool_bar_p; |
265 | 1034 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1035 Lisp_Object window; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1036 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
|
1037 enum window_part dummy; |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
1038 |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
1039 if (part == 0) |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
1040 part = &dummy; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1041 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1042 window = Qnil; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1043 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
|
1044 foreach_window (f, check_window_containing, &cw); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1045 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1046 /* 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
|
1047 bar exists. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1048 if (NILP (window) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1049 && tool_bar_p |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1050 && WINDOWP (f->tool_bar_window) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1051 && 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
|
1052 && (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
|
1053 != ON_NOTHING)) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1054 { |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
1055 *part = ON_TEXT; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1056 window = f->tool_bar_window; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1057 } |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
1058 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1059 if (wx) *wx = x; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1060 if (wy) *wy = y; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1061 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1062 return window; |
265 | 1063 } |
1064 | |
681
026f978690be
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
555
diff
changeset
|
1065 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
|
1066 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
|
1067 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
|
1068 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
|
1069 column 0. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1070 (x, y, frame) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1071 Lisp_Object x, y, frame; |
265 | 1072 { |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1073 struct frame *f; |
265 | 1074 |
769 | 1075 if (NILP (frame)) |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
1076 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1077 CHECK_LIVE_FRAME (frame); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1078 f = XFRAME (frame); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1079 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1080 /* 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
|
1081 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
|
1082 CHECK_NUMBER_OR_FLOAT (y); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1083 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1084 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
|
1085 (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
|
1086 + 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
|
1087 (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
|
1088 + FRAME_INTERNAL_BORDER_WIDTH (f)), |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1089 0, 0, 0, 0); |
265 | 1090 } |
1091 | |
1092 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
|
1093 doc: /* Return current value of point in WINDOW. |
75753
5e34b32b9b4c
(Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents:
75348
diff
changeset
|
1094 WINDOW defaults to the selected window. |
5e34b32b9b4c
(Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents:
75348
diff
changeset
|
1095 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1096 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
|
1097 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
|
1098 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1099 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
|
1100 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
|
1101 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
|
1102 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
|
1103 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
|
1104 (window) |
265 | 1105 Lisp_Object window; |
1106 { | |
1107 register struct window *w = decode_window (window); | |
1108 | |
1109 if (w == XWINDOW (selected_window) | |
1110 && current_buffer == XBUFFER (w->buffer)) | |
1111 return Fpoint (); | |
1112 return Fmarker_position (w->pointm); | |
1113 } | |
1114 | |
1115 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
|
1116 doc: /* Return position at which display currently starts in WINDOW. |
75753
5e34b32b9b4c
(Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents:
75348
diff
changeset
|
1117 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
|
1118 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
|
1119 (window) |
265 | 1120 Lisp_Object window; |
1121 { | |
1122 return Fmarker_position (decode_window (window)->start); | |
1123 } | |
1124 | |
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
1125 /* 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
|
1126 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1127 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
|
1128 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
|
1129 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
|
1130 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
|
1131 (save-excursion |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1132 (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
|
1133 (vertical-motion (1- (window-height window)) window) |
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
1134 (point))") */ |
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
1135 |
21198
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
1136 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
|
1137 doc: /* Return position at which display currently ends in WINDOW. |
75753
5e34b32b9b4c
(Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents:
75348
diff
changeset
|
1138 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
|
1139 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
|
1140 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
|
1141 does not update this value. |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
1142 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
|
1143 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
|
1144 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
|
1145 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
|
1146 (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
|
1147 Lisp_Object window, update; |
265 | 1148 { |
1149 Lisp_Object value; | |
1150 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
|
1151 Lisp_Object buf; |
72998
79ada95d4018
(Fwindow_end): Fix recent change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72990
diff
changeset
|
1152 struct buffer *b; |
4292
990f6ee7f527
(Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents:
4145
diff
changeset
|
1153 |
990f6ee7f527
(Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents:
4145
diff
changeset
|
1154 buf = w->buffer; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1155 CHECK_BUFFER (buf); |
72907
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
1156 b = XBUFFER (buf); |
4292
990f6ee7f527
(Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents:
4145
diff
changeset
|
1157 |
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
1158 #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
|
1159 /* 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
|
1160 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
|
1161 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
|
1162 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
|
1163 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
|
1164 return Qnil; |
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
1165 #endif |
8492
865daa7a9faf
(Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
8486
diff
changeset
|
1166 |
21198
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
1167 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
|
1168 && ! (! NILP (w->window_end_valid) |
75077
c0200a80d5cf
(Fwindow_end): Check BUF_OVERLAY_MODIFF like BUF_MODIFF.
Richard M. Stallman <rms@gnu.org>
parents:
74966
diff
changeset
|
1169 && XFASTINT (w->last_modified) >= BUF_MODIFF (b) |
75080
1026dad5d8c9
(Fwindow_end): Fix use of >= operator.
Juanma Barranquero <lekktu@gmail.com>
parents:
75077
diff
changeset
|
1170 && XFASTINT (w->last_overlay_modified) >= BUF_OVERLAY_MODIFF (b)) |
65950
543b18532c51
(Fwindow_end): Don't try to redisplay if non-interactive.
Romain Francoise <romain@orebokech.com>
parents:
65908
diff
changeset
|
1171 && !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
|
1172 { |
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1173 struct text_pos startp; |
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1174 struct it it; |
72907
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
1175 struct buffer *old_buffer = NULL; |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
1176 |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
1177 /* Cannot use Fvertical_motion because that function doesn't |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
1178 cope with variable-height lines. */ |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
1179 if (b != current_buffer) |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
1180 { |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
1181 old_buffer = current_buffer; |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
1182 set_buffer_internal (b); |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
1183 } |
26635
af8d605cbcf1
(Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
1184 |
af8d605cbcf1
(Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
1185 /* 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
|
1186 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
|
1187 `-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
|
1188 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
|
1189 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
|
1190 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
|
1191 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
|
1192 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
|
1193 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
|
1194 else |
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1195 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
|
1196 |
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1197 start_display (&it, w, startp); |
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1198 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
|
1199 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
|
1200 move_it_past_eol (&it); |
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1201 value = make_number (IT_CHARPOS (it)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1202 |
36231
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1203 if (old_buffer) |
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1204 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
|
1205 } |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
1206 else |
72907
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
1207 XSETINT (value, BUF_Z (b) - XFASTINT (w->window_end_pos)); |
265 | 1208 |
1209 return value; | |
1210 } | |
1211 | |
1212 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
|
1213 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
|
1214 Return POS. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1215 (window, pos) |
265 | 1216 Lisp_Object window, pos; |
1217 { | |
1218 register struct window *w = decode_window (window); | |
1219 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1220 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
|
1221 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
|
1222 && XBUFFER (w->buffer) == current_buffer) |
265 | 1223 Fgoto_char (pos); |
1224 else | |
1225 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
|
1226 |
34615
a8944d7e6773
(Fset_window_point): Remove test for
Gerd Moellmann <gerd@gnu.org>
parents:
34499
diff
changeset
|
1227 /* 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
|
1228 the new value of point. */ |
a8944d7e6773
(Fset_window_point): Remove test for
Gerd Moellmann <gerd@gnu.org>
parents:
34499
diff
changeset
|
1229 if (!EQ (window, selected_window)) |
34491
f9d400d4653a
(Fset_window_point): If displaying cursors in windows
Gerd Moellmann <gerd@gnu.org>
parents:
34417
diff
changeset
|
1230 ++windows_or_buffers_changed; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1231 |
265 | 1232 return pos; |
1233 } | |
1234 | |
1235 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
|
1236 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
|
1237 Return POS. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1238 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
|
1239 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
|
1240 (window, pos, noforce) |
265 | 1241 Lisp_Object window, pos, noforce; |
1242 { | |
1243 register struct window *w = decode_window (window); | |
1244 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1245 CHECK_NUMBER_COERCE_MARKER (pos); |
265 | 1246 set_marker_restricted (w->start, pos, w->buffer); |
1247 /* this is not right, but much easier than doing what is right. */ | |
1248 w->start_at_line_beg = Qnil; | |
485 | 1249 if (NILP (noforce)) |
265 | 1250 w->force_start = Qt; |
1251 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
|
1252 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
|
1253 XSETFASTINT (w->last_overlay_modified, 0); |
338 | 1254 if (!EQ (window, selected_window)) |
1255 windows_or_buffers_changed++; | |
25387
df0083768b79
(Fset_window_point): Reset Vresize_mini_config.
Gerd Moellmann <gerd@gnu.org>
parents:
25375
diff
changeset
|
1256 |
265 | 1257 return pos; |
1258 } | |
1259 | |
1260 DEFUN ("window-dedicated-p", Fwindow_dedicated_p, Swindow_dedicated_p, | |
1261 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
|
1262 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
|
1263 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
|
1264 (window) |
265 | 1265 Lisp_Object window; |
1266 { | |
1267 return decode_window (window)->dedicated; | |
1268 } | |
1269 | |
722
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
1270 DEFUN ("set-window-dedicated-p", Fset_window_dedicated_p, |
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
1271 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
|
1272 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
|
1273 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
|
1274 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
|
1275 The second argument is the new value for the dedication flag; |
95547
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1276 non-nil means yes. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1277 (window, arg) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1278 Lisp_Object window, arg; |
265 | 1279 { |
1280 register struct window *w = decode_window (window); | |
1281 | |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
1282 w->dedicated = arg; |
265 | 1283 |
1284 return w->dedicated; | |
1285 } | |
1286 | |
95547
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1287 DEFUN ("window-parameters", Fwindow_parameters, Swindow_parameters, |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1288 0, 1, 0, |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1289 doc: /* Return the parameters-alist of window WINDOW. |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1290 It is a list of elements of the form (PARAMETER . VALUE). |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1291 If WINDOW is omitted, return information on the currently selected window. */) |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1292 (window) |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1293 Lisp_Object window; |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1294 { |
95564
823072be49ad
(Fwindow_parameter): Return VALUE, not (PARAMETER . VALUE).
Juanma Barranquero <lekktu@gmail.com>
parents:
95550
diff
changeset
|
1295 return Fcopy_alist (decode_window (window)->window_parameters); |
95547
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1296 } |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1297 |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1298 DEFUN ("window-parameter", Fwindow_parameter, Swindow_parameter, |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1299 2, 2, 0, |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1300 doc: /* Return WINDOW's value for parameter PARAMETER. |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1301 If WINDOW is nil, describe the currently selected window. */) |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1302 (window, parameter) |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1303 Lisp_Object window, parameter; |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1304 { |
95564
823072be49ad
(Fwindow_parameter): Return VALUE, not (PARAMETER . VALUE).
Juanma Barranquero <lekktu@gmail.com>
parents:
95550
diff
changeset
|
1305 Lisp_Object result; |
823072be49ad
(Fwindow_parameter): Return VALUE, not (PARAMETER . VALUE).
Juanma Barranquero <lekktu@gmail.com>
parents:
95550
diff
changeset
|
1306 |
823072be49ad
(Fwindow_parameter): Return VALUE, not (PARAMETER . VALUE).
Juanma Barranquero <lekktu@gmail.com>
parents:
95550
diff
changeset
|
1307 result = Fassq (parameter, decode_window (window)->window_parameters); |
823072be49ad
(Fwindow_parameter): Return VALUE, not (PARAMETER . VALUE).
Juanma Barranquero <lekktu@gmail.com>
parents:
95550
diff
changeset
|
1308 return CDR_SAFE (result); |
95547
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1309 } |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1310 |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1311 |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1312 DEFUN ("set-window-parameter", Fset_window_parameter, |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1313 Sset_window_parameter, 3, 3, 0, |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1314 doc: /* Set window parameter PARAMETER to VALUE on WINDOW. |
95550
e057f981a6b5
(Fset_window_parameter): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
95547
diff
changeset
|
1315 If WINDOW is nil, use the currently selected window. |
95564
823072be49ad
(Fwindow_parameter): Return VALUE, not (PARAMETER . VALUE).
Juanma Barranquero <lekktu@gmail.com>
parents:
95550
diff
changeset
|
1316 Return VALUE. */) |
95547
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1317 (window, parameter, value) |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1318 Lisp_Object window, parameter, value; |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1319 { |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1320 register struct window *w = decode_window (window); |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1321 Lisp_Object old_alist_elt; |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1322 |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1323 old_alist_elt = Fassq (parameter, w->window_parameters); |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1324 if (EQ (old_alist_elt, Qnil)) |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1325 w->window_parameters = Fcons (Fcons (parameter, value), w->window_parameters); |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1326 else |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1327 Fsetcdr (old_alist_elt, value); |
95564
823072be49ad
(Fwindow_parameter): Return VALUE, not (PARAMETER . VALUE).
Juanma Barranquero <lekktu@gmail.com>
parents:
95550
diff
changeset
|
1328 return value; |
95547
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1329 } |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1330 |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1331 |
265 | 1332 DEFUN ("window-display-table", Fwindow_display_table, Swindow_display_table, |
1333 0, 1, 0, | |
75753
5e34b32b9b4c
(Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents:
75348
diff
changeset
|
1334 doc: /* Return the display-table that WINDOW is using. |
5e34b32b9b4c
(Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents:
75348
diff
changeset
|
1335 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
|
1336 (window) |
265 | 1337 Lisp_Object window; |
1338 { | |
1339 return decode_window (window)->display_table; | |
1340 } | |
1341 | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1342 /* 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
|
1343 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
|
1344 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
|
1345 return 0. */ |
265 | 1346 |
13187
1a4cee562d33
(window_display_table): Use DISP_TABLE_P. Return type
Richard M. Stallman <rms@gnu.org>
parents:
13126
diff
changeset
|
1347 struct Lisp_Char_Table * |
265 | 1348 window_display_table (w) |
1349 struct window *w; | |
1350 { | |
30446
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1351 struct Lisp_Char_Table *dp = NULL; |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1352 |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1353 if (DISP_TABLE_P (w->display_table)) |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1354 dp = XCHAR_TABLE (w->display_table); |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1355 else if (BUFFERP (w->buffer)) |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1356 { |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1357 struct buffer *b = XBUFFER (w->buffer); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1358 |
30446
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1359 if (DISP_TABLE_P (b->display_table)) |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1360 dp = XCHAR_TABLE (b->display_table); |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1361 else if (DISP_TABLE_P (Vstandard_display_table)) |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1362 dp = XCHAR_TABLE (Vstandard_display_table); |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1363 } |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1364 |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1365 return dp; |
265 | 1366 } |
1367 | |
555 | 1368 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
|
1369 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
|
1370 (window, table) |
265 | 1371 register Lisp_Object window, table; |
1372 { | |
1373 register struct window *w; | |
1374 | |
1375 w = decode_window (window); | |
1376 w->display_table = table; | |
1377 return table; | |
1378 } | |
1379 | |
1380 /* Record info on buffer window w is displaying | |
1381 when it is about to cease to display that buffer. */ | |
21514 | 1382 static void |
265 | 1383 unshow_buffer (w) |
1384 register struct window *w; | |
1385 { | |
6517
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1386 Lisp_Object buf; |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1387 struct buffer *b; |
6517
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1388 |
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1389 buf = w->buffer; |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1390 b = XBUFFER (buf); |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1391 if (b != XMARKER (w->pointm)->buffer) |
265 | 1392 abort (); |
1393 | |
5990
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
1394 #if 0 |
265 | 1395 if (w == XWINDOW (selected_window) |
1396 || ! EQ (buf, XWINDOW (selected_window)->buffer)) | |
1397 /* Do this except when the selected window's buffer | |
1398 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
|
1399 #endif |
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
1400 /* 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
|
1401 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
|
1402 Now that this statement is unconditional, |
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
1403 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
|
1404 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
|
1405 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
|
1406 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
|
1407 b->last_window_start = marker_position (w->start); |
265 | 1408 |
1409 /* Point in the selected window's buffer | |
1410 is actually stored in that buffer, and the window's pointm isn't used. | |
1411 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
|
1412 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
|
1413 /* 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
|
1414 && !(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
|
1415 && 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
|
1416 && 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
|
1417 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
|
1418 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
|
1419 XMARKER (w->pointm)->charpos, |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1420 BUF_ZV (b)), |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1421 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
|
1422 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
|
1423 BUF_ZV_BYTE (b))); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1424 |
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28104
diff
changeset
|
1425 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
|
1426 && 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
|
1427 b->last_selected_window = Qnil; |
265 | 1428 } |
1429 | |
1430 /* Put replacement into the window structure in place of old. */ | |
21514 | 1431 static void |
265 | 1432 replace_window (old, replacement) |
1433 Lisp_Object old, replacement; | |
1434 { | |
1435 register Lisp_Object tem; | |
1436 register struct window *o = XWINDOW (old), *p = XWINDOW (replacement); | |
1437 | |
769 | 1438 /* If OLD is its frame's root_window, then replacement is the new |
1439 root_window for that frame. */ | |
265 | 1440 |
1525
f79a22ad87d0
* window.c (Fwindow_width, Fset_window_hscroll): Use accessors on
Jim Blandy <jimb@redhat.com>
parents:
1444
diff
changeset
|
1441 if (EQ (old, FRAME_ROOT_WINDOW (XFRAME (o->frame)))) |
769 | 1442 FRAME_ROOT_WINDOW (XFRAME (o->frame)) = replacement; |
265 | 1443 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1444 p->left_col = o->left_col; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1445 p->top_line = o->top_line; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1446 p->total_cols = o->total_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1447 p->total_lines = o->total_lines; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1448 p->desired_matrix = p->current_matrix = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1449 p->vscroll = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1450 bzero (&p->cursor, sizeof (p->cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1451 bzero (&p->last_cursor, sizeof (p->last_cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1452 bzero (&p->phys_cursor, sizeof (p->phys_cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1453 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
|
1454 p->phys_cursor_width = -1; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1455 p->must_be_updated_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1456 p->pseudo_window_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1457 XSETFASTINT (p->window_end_vpos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1458 XSETFASTINT (p->window_end_pos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1459 p->window_end_valid = Qnil; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
1460 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
|
1461 p->orig_top_line = p->orig_total_lines = Qnil; |
265 | 1462 |
1463 p->next = tem = o->next; | |
485 | 1464 if (!NILP (tem)) |
265 | 1465 XWINDOW (tem)->prev = replacement; |
1466 | |
1467 p->prev = tem = o->prev; | |
485 | 1468 if (!NILP (tem)) |
265 | 1469 XWINDOW (tem)->next = replacement; |
1470 | |
1471 p->parent = tem = o->parent; | |
485 | 1472 if (!NILP (tem)) |
265 | 1473 { |
1474 if (EQ (XWINDOW (tem)->vchild, old)) | |
1475 XWINDOW (tem)->vchild = replacement; | |
1476 if (EQ (XWINDOW (tem)->hchild, old)) | |
1477 XWINDOW (tem)->hchild = replacement; | |
1478 } | |
1479 | |
1480 /*** Here, if replacement is a vertical combination | |
1481 and so is its new parent, we should make replacement's | |
1482 children be children of that parent instead. ***/ | |
1483 } | |
1484 | |
1485 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
|
1486 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
|
1487 (window) |
265 | 1488 register Lisp_Object window; |
1489 { | |
92192
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
1490 struct frame *f; |
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
1491 if (NILP (window)) |
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
1492 window = selected_window; |
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
1493 f = XFRAME (WINDOW_FRAME (XWINDOW (window))); |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1494 delete_window (window); |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1495 |
92192
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
1496 run_window_configuration_change_hook (f); |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1497 |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1498 return Qnil; |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1499 } |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1500 |
20351 | 1501 void |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1502 delete_window (window) |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1503 register Lisp_Object window; |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1504 { |
265 | 1505 register Lisp_Object tem, parent, sib; |
1506 register struct window *p; | |
1507 register struct window *par; | |
34819
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1508 struct frame *f; |
265 | 1509 |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1510 /* 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
|
1511 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
|
1512 so we can't decode_window here. */ |
92192
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
1513 CHECK_WINDOW (window); |
265 | 1514 p = XWINDOW (window); |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1515 |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
1516 /* 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
|
1517 if (NILP (p->buffer) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1518 && NILP (p->hchild) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1519 && NILP (p->vchild)) |
17365
fc2ec9ced22f
(delete_window): Don't return value from void function.
Karl Heuer <kwzh@gnu.org>
parents:
17281
diff
changeset
|
1520 return; |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1521 |
265 | 1522 parent = p->parent; |
485 | 1523 if (NILP (parent)) |
265 | 1524 error ("Attempt to delete minibuffer or sole ordinary window"); |
1525 par = XWINDOW (parent); | |
1526 | |
1527 windows_or_buffers_changed++; | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1528 Vwindow_list = Qnil; |
34819
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1529 f = XFRAME (WINDOW_FRAME (p)); |
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1530 FRAME_WINDOW_SIZES_CHANGED (f) = 1; |
265 | 1531 |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1532 /* 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
|
1533 { |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1534 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
|
1535 |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
1536 /* 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
|
1537 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
|
1538 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
|
1539 swindow = FRAME_SELECTED_WINDOW (f); |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1540 |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1541 while (1) |
3723
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
1542 { |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1543 pwindow = swindow; |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1544 while (!NILP (pwindow)) |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1545 { |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1546 if (EQ (window, pwindow)) |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1547 break; |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1548 pwindow = XWINDOW (pwindow)->parent; |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1549 } |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1550 |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1551 /* 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
|
1552 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
|
1553 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
|
1554 break; |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1555 /* Otherwise, try another window for SWINDOW. */ |
77905
2fd30dc1a157
(delete_window): Delete stray semicolon.
Chong Yidong <cyd@stupidchicken.com>
parents:
77883
diff
changeset
|
1556 swindow = Fnext_window (swindow, Qlambda, Qnil); |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1557 |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1558 /* 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
|
1559 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
|
1560 so we cannot delete. */ |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1561 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
|
1562 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
|
1563 } |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
1564 |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1565 /* 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
|
1566 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
|
1567 { |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1568 /* 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
|
1569 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
|
1570 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
|
1571 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
|
1572 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
|
1573 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
|
1574 Fselect_window (swindow, Qnil); |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1575 else |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1576 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
|
1577 } |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1578 } |
265 | 1579 |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
1580 /* 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
|
1581 window_deletion_count++; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
1582 |
265 | 1583 tem = p->buffer; |
1584 /* tem is null for dummy parent windows | |
1585 (which have inferiors but not any contents themselves) */ | |
485 | 1586 if (!NILP (tem)) |
265 | 1587 { |
1588 unshow_buffer (p); | |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
1589 unchain_marker (XMARKER (p->pointm)); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
1590 unchain_marker (XMARKER (p->start)); |
265 | 1591 } |
1592 | |
26761
c15c2756ec0f
(delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents:
26635
diff
changeset
|
1593 /* 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
|
1594 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
|
1595 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
|
1596 processed while we are changing them. */ |
c15c2756ec0f
(delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents:
26635
diff
changeset
|
1597 BLOCK_INPUT; |
34819
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1598 free_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f))); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1599 |
265 | 1600 tem = p->next; |
485 | 1601 if (!NILP (tem)) |
265 | 1602 XWINDOW (tem)->prev = p->prev; |
1603 | |
1604 tem = p->prev; | |
485 | 1605 if (!NILP (tem)) |
265 | 1606 XWINDOW (tem)->next = p->next; |
1607 | |
1608 if (EQ (window, par->hchild)) | |
1609 par->hchild = p->next; | |
1610 if (EQ (window, par->vchild)) | |
1611 par->vchild = p->next; | |
1612 | |
1613 /* Find one of our siblings to give our space to. */ | |
1614 sib = p->prev; | |
485 | 1615 if (NILP (sib)) |
265 | 1616 { |
1617 /* If p gives its space to its next sibling, that sibling needs | |
1618 to have its top/left side pulled back to where p's is. | |
1619 set_window_{height,width} will re-position the sibling's | |
1620 children. */ | |
1621 sib = p->next; | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1622 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
|
1623 XWINDOW (sib)->left_col = p->left_col; |
265 | 1624 } |
1625 | |
1626 /* Stretch that sibling. */ | |
485 | 1627 if (!NILP (par->vchild)) |
265 | 1628 set_window_height (sib, |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1629 XFASTINT (XWINDOW (sib)->total_lines) + XFASTINT (p->total_lines), |
265 | 1630 1); |
485 | 1631 if (!NILP (par->hchild)) |
265 | 1632 set_window_width (sib, |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1633 XFASTINT (XWINDOW (sib)->total_cols) + XFASTINT (p->total_cols), |
265 | 1634 1); |
1635 | |
1636 /* If parent now has only one child, | |
1637 put the child into the parent's place. */ | |
1638 tem = par->hchild; | |
485 | 1639 if (NILP (tem)) |
265 | 1640 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
|
1641 if (NILP (XWINDOW (tem)->next)) { |
265 | 1642 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
|
1643 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
|
1644 } |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1645 |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1646 /* 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
|
1647 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
|
1648 if (! NILP (p->hchild)) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1649 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
|
1650 else if (! NILP (p->vchild)) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1651 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
|
1652 |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1653 /* Mark this window as deleted. */ |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1654 p->buffer = p->hchild = p->vchild = Qnil; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1655 |
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
|
1656 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
|
1657 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
|
1658 |
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
|
1659 /* 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
|
1660 one of them. */ |
64133
7e06f331c228
(Frecenter): Fix last change (set iarg before use).
Kim F. Storm <storm@cua.dk>
parents:
64114
diff
changeset
|
1661 |
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
|
1662 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
|
1663 { |
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
|
1664 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
|
1665 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
|
1666 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
|
1667 } |
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
|
1668 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
|
1669 { |
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
|
1670 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
|
1671 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
|
1672 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
|
1673 } |
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
|
1674 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
|
1675 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
|
1676 |
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
|
1677 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
|
1678 { |
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
|
1679 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
|
1680 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
|
1681 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
|
1682 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
|
1683 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
|
1684 } |
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
|
1685 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
|
1686 /* 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
|
1687 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
|
1688 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
|
1689 | |
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
|
1690 -> 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
|
1691 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
|
1692 */ |
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
|
1693 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
|
1694 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
|
1695 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
|
1696 } |
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
|
1697 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
|
1698 } |
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
|
1699 |
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
|
1700 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1701 /* Adjust glyph matrices. */ |
34819
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1702 adjust_glyphs (f); |
26761
c15c2756ec0f
(delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents:
26635
diff
changeset
|
1703 UNBLOCK_INPUT; |
265 | 1704 } |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1705 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1706 |
265 | 1707 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1708 /*********************************************************************** |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1709 Window List |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1710 ***********************************************************************/ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1711 |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1712 /* 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
|
1713 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
|
1714 function window_list. */ |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1715 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1716 static int |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1717 add_window_to_list (w, user_data) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1718 struct window *w; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1719 void *user_data; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1720 { |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1721 Lisp_Object *list = (Lisp_Object *) user_data; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1722 Lisp_Object window; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1723 XSETWINDOW (window, w); |
30039
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1724 *list = Fcons (window, *list); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1725 return 1; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1726 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1727 |
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 /* 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
|
1730 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
|
1731 list, cache it in Vwindow_list, and return that. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1732 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1733 static Lisp_Object |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1734 window_list () |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1735 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1736 if (!CONSP (Vwindow_list)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1737 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1738 Lisp_Object tail; |
30039
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1739 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1740 Vwindow_list = Qnil; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1741 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
|
1742 { |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1743 Lisp_Object args[2]; |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1744 |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1745 /* 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
|
1746 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
|
1747 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
|
1748 args[1] = Qnil; |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1749 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
|
1750 args[0] = Vwindow_list; |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1751 args[1] = Fnreverse (args[1]); |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1752 Vwindow_list = Fnconc (2, args); |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1753 } |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1754 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1755 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1756 return Vwindow_list; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1757 } |
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 |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1760 /* 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
|
1761 OWINDOW, MINIBUF and ALL_FRAMES. |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1762 |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1763 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
|
1764 `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
|
1765 a window means a specific minibuffer window |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1766 |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1767 ALL_FRAMES t means search all frames, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1768 nil means search just current frame, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1769 `visible' means search just visible frames, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1770 0 means search visible and iconified frames, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1771 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
|
1772 a frame means consider windows on that frame, only. */ |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1773 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1774 static int |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1775 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
|
1776 Lisp_Object window, owindow, minibuf, all_frames; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1777 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1778 struct window *w = XWINDOW (window); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1779 struct frame *f = XFRAME (w->frame); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1780 int candidate_p = 1; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1781 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1782 if (!BUFFERP (w->buffer)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1783 candidate_p = 0; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1784 else if (MINI_WINDOW_P (w) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1785 && (EQ (minibuf, Qlambda) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1786 || (WINDOWP (minibuf) && !EQ (minibuf, window)))) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1787 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1788 /* If MINIBUF is `lambda' don't consider any mini-windows. |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1789 If it is a window, consider only that one. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1790 candidate_p = 0; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1791 } |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1792 else if (EQ (all_frames, Qt)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1793 candidate_p = 1; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1794 else if (NILP (all_frames)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1795 { |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1796 xassert (WINDOWP (owindow)); |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1797 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
|
1798 } |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1799 else if (EQ (all_frames, Qvisible)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1800 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1801 FRAME_SAMPLE_VISIBILITY (f); |
85010
a3defcbdb064
(candidate_window_p): Only consider as visible frames that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84758
diff
changeset
|
1802 candidate_p = FRAME_VISIBLE_P (f) |
a3defcbdb064
(candidate_window_p): Only consider as visible frames that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84758
diff
changeset
|
1803 && (FRAME_TERMINAL (XFRAME (w->frame)) |
a3defcbdb064
(candidate_window_p): Only consider as visible frames that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84758
diff
changeset
|
1804 == FRAME_TERMINAL (XFRAME (selected_frame))); |
a3defcbdb064
(candidate_window_p): Only consider as visible frames that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84758
diff
changeset
|
1805 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1806 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1807 else if (INTEGERP (all_frames) && XINT (all_frames) == 0) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1808 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1809 FRAME_SAMPLE_VISIBILITY (f); |
84758
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
1810 candidate_p = (FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f) |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
1811 #ifdef HAVE_X_WINDOWS |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
1812 /* Yuck!! If we've just created the frame and the |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
1813 window-manager requested the user to place it |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
1814 manually, the window may still not be considered |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
1815 `visible'. I'd argue it should be at least |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
1816 something like `iconified', but don't know how to do |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
1817 that yet. --Stef */ |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
1818 || (FRAME_X_P (f) && f->output_data.x->asked_for_visible |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
1819 && !f->output_data.x->has_been_visible) |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
1820 #endif |
85010
a3defcbdb064
(candidate_window_p): Only consider as visible frames that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84758
diff
changeset
|
1821 ) |
a3defcbdb064
(candidate_window_p): Only consider as visible frames that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84758
diff
changeset
|
1822 && (FRAME_TERMINAL (XFRAME (w->frame)) |
a3defcbdb064
(candidate_window_p): Only consider as visible frames that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84758
diff
changeset
|
1823 == FRAME_TERMINAL (XFRAME (selected_frame))); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1824 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1825 else if (WINDOWP (all_frames)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1826 candidate_p = (EQ (FRAME_MINIBUF_WINDOW (f), all_frames) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1827 || EQ (XWINDOW (all_frames)->frame, w->frame) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1828 || 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
|
1829 else if (FRAMEP (all_frames)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1830 candidate_p = EQ (all_frames, w->frame); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1831 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1832 return candidate_p; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1833 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1834 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1835 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1836 /* Decode arguments as allowed by Fnext_window, Fprevious_window, and |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1837 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
|
1838 ALL_FRAMES. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1839 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1840 static void |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1841 decode_next_window_args (window, minibuf, all_frames) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1842 Lisp_Object *window, *minibuf, *all_frames; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1843 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1844 if (NILP (*window)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1845 *window = selected_window; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1846 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1847 CHECK_LIVE_WINDOW (*window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1848 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1849 /* 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
|
1850 does. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1851 if (NILP (*minibuf)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1852 *minibuf = minibuf_level ? minibuf_window : Qlambda; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1853 else if (!EQ (*minibuf, Qt)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1854 *minibuf = Qlambda; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1855 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1856 /* Now *MINIBUF can be t => count all minibuffer windows, `lambda' |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1857 => count none of them, or a specific minibuffer window (the |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1858 active one) to count. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1859 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1860 /* ALL_FRAMES nil doesn't specify which frames to include. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1861 if (NILP (*all_frames)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1862 *all_frames = (!EQ (*minibuf, Qlambda) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1863 ? FRAME_MINIBUF_WINDOW (XFRAME (XWINDOW (*window)->frame)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1864 : Qnil); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1865 else if (EQ (*all_frames, Qvisible)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1866 ; |
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
|
1867 else if (EQ (*all_frames, make_number (0))) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1868 ; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1869 else if (FRAMEP (*all_frames)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1870 ; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1871 else if (!EQ (*all_frames, Qt)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1872 *all_frames = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1873 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1874 /* 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
|
1875 search just current frame, `visible' meaning search just visible |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1876 frames, 0 meaning search visible and iconified frames, or a |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1877 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
|
1878 frame, meaning consider windows on that frame, only. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1879 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1880 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1881 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1882 /* 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
|
1883 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
|
1884 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
|
1885 ALL_FRAMES. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1886 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1887 static Lisp_Object |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1888 next_window (window, minibuf, all_frames, next_p) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1889 Lisp_Object window, minibuf, all_frames; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1890 int next_p; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1891 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1892 decode_next_window_args (&window, &minibuf, &all_frames); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1893 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1894 /* 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
|
1895 return the first window on the frame. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1896 if (FRAMEP (all_frames) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1897 && !EQ (all_frames, XWINDOW (window)->frame)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1898 return Fframe_first_window (all_frames); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1899 |
30039
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1900 if (next_p) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1901 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1902 Lisp_Object list; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1903 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1904 /* Find WINDOW in the list of all windows. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1905 list = Fmemq (window, window_list ()); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1906 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1907 /* 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
|
1908 if (CONSP (list)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1909 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
|
1910 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
|
1911 break; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1912 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1913 /* 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
|
1914 if (!CONSP (list)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1915 for (list = Vwindow_list; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1916 CONSP (list) && !EQ (XCAR (list), window); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1917 list = XCDR (list)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1918 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
|
1919 break; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1920 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1921 if (CONSP (list)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1922 window = XCAR (list); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1923 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1924 else |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1925 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1926 Lisp_Object candidate, list; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1927 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1928 /* 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
|
1929 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
|
1930 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
|
1931 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
|
1932 candidate = Qnil; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1933 for (list = window_list (); CONSP (list); list = XCDR (list)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1934 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1935 if (EQ (XCAR (list), window)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1936 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1937 if (WINDOWP (candidate)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1938 break; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1939 } |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1940 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
|
1941 all_frames)) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1942 candidate = XCAR (list); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1943 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1944 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1945 if (WINDOWP (candidate)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1946 window = candidate; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1947 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1948 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1949 return window; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1950 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1951 |
432 | 1952 |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1953 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
|
1954 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
|
1955 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
|
1956 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1957 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
|
1958 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
|
1959 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
|
1960 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
|
1961 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1962 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
|
1963 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
|
1964 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
|
1965 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
|
1966 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
|
1967 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1968 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
|
1969 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
|
1970 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
|
1971 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
|
1972 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
|
1973 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
|
1974 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1975 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
|
1976 `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
|
1977 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
|
1978 `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
|
1979 (window, minibuf, all_frames) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1980 Lisp_Object window, minibuf, all_frames; |
265 | 1981 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1982 return next_window (window, minibuf, all_frames, 1); |
265 | 1983 } |
1984 | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1985 |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1986 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
|
1987 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
|
1988 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
|
1989 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1990 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
|
1991 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
|
1992 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
|
1993 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
|
1994 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1995 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
|
1996 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
|
1997 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
|
1998 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
|
1999 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
|
2000 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2001 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
|
2002 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
|
2003 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
|
2004 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
|
2005 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
|
2006 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
|
2007 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2008 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
|
2009 `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
|
2010 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
|
2011 `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
|
2012 (window, minibuf, all_frames) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2013 Lisp_Object window, minibuf, all_frames; |
265 | 2014 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2015 return next_window (window, minibuf, all_frames, 0); |
265 | 2016 } |
2017 | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2018 |
338 | 2019 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
|
2020 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
|
2021 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
|
2022 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
|
2023 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
|
2024 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
|
2025 (arg, all_frames) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2026 Lisp_Object arg, all_frames; |
265 | 2027 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2028 Lisp_Object window; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2029 int i; |
265 | 2030 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
2031 CHECK_NUMBER (arg); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2032 window = selected_window; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2033 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2034 for (i = XINT (arg); i > 0; --i) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2035 window = Fnext_window (window, Qnil, all_frames); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2036 for (; i < 0; ++i) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2037 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
|
2038 |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
2039 Fselect_window (window, Qnil); |
265 | 2040 return Qnil; |
2041 } | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2042 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2043 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2044 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
|
2045 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
|
2046 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
|
2047 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
|
2048 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
|
2049 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
|
2050 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
|
2051 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
|
2052 (frame, minibuf, window) |
33619
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2053 Lisp_Object frame, minibuf, window; |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2054 { |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2055 if (NILP (window)) |
69104
527507f1a62e
(Fwindow_list): Check `window' before doing XWINDOW.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68987
diff
changeset
|
2056 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
|
2057 CHECK_WINDOW (window); |
33619
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2058 if (NILP (frame)) |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2059 frame = selected_frame; |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2060 |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2061 if (!EQ (frame, XWINDOW (window)->frame)) |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2062 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
|
2063 |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2064 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
|
2065 } |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2066 |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2067 |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2068 /* 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
|
2069 for `next-window'. */ |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2070 |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2071 static Lisp_Object |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2072 window_list_1 (window, minibuf, all_frames) |
30265
9b1c8eafe4dc
(Fwindow_list): Declare arg `window'.
Dave Love <fx@gnu.org>
parents:
30102
diff
changeset
|
2073 Lisp_Object window, minibuf, all_frames; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2074 { |
56456
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
2075 Lisp_Object tail, list, rest; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2076 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2077 decode_next_window_args (&window, &minibuf, &all_frames); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2078 list = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2079 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2080 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
|
2081 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
|
2082 list = Fcons (XCAR (tail), list); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2083 |
56456
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
2084 /* 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
|
2085 list = Fnreverse (list); |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
2086 rest = Fmemq (window, list); |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
2087 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
|
2088 { |
56616
76bd0e931318
(window_list_1): YAILOM.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56585
diff
changeset
|
2089 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
|
2090 ; |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
2091 XSETCDR (tail, Qnil); |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
2092 list = nconc2 (rest, list); |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
2093 } |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
2094 return list; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2095 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2096 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2097 |
265 | 2098 |
2099 /* Look at all windows, performing an operation specified by TYPE | |
2100 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
|
2101 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
|
2102 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
|
2103 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
|
2104 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
|
2105 If MINI is non-zero, perform the operation on minibuffer windows too. */ |
265 | 2106 |
2107 enum window_loop | |
2108 { | |
2109 WINDOW_LOOP_UNUSED, | |
2110 GET_BUFFER_WINDOW, /* Arg is buffer */ | |
2111 GET_LRU_WINDOW, /* Arg is t for full-width windows only */ | |
2112 DELETE_OTHER_WINDOWS, /* Arg is window not to delete */ | |
2113 DELETE_BUFFER_WINDOWS, /* Arg is buffer */ | |
2114 GET_LARGEST_WINDOW, | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2115 UNSHOW_BUFFER, /* Arg is buffer */ |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2116 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
|
2117 CHECK_ALL_WINDOWS |
265 | 2118 }; |
2119 | |
2120 static Lisp_Object | |
769 | 2121 window_loop (type, obj, mini, frames) |
265 | 2122 enum window_loop type; |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2123 Lisp_Object obj, frames; |
265 | 2124 int mini; |
2125 { | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2126 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
|
2127 struct frame *f; |
30102
9406cb07bac7
(window_loop): Add missing gcpro1 local variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30093
diff
changeset
|
2128 struct gcpro gcpro1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2129 |
769 | 2130 /* If we're only looping through windows on a particular frame, |
2131 frame points to that frame. If we're looping through windows | |
2132 on all frames, frame is 0. */ | |
2133 if (FRAMEP (frames)) | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2134 f = XFRAME (frames); |
769 | 2135 else if (NILP (frames)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2136 f = SELECTED_FRAME (); |
265 | 2137 else |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2138 f = NULL; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2139 |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2140 if (f) |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
2141 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
|
2142 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
|
2143 frame_arg = frames; |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
2144 else if (EQ (frames, Qvisible)) |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
2145 frame_arg = frames; |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2146 else |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2147 frame_arg = Qt; |
265 | 2148 |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
2149 /* 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
|
2150 Qvisible to consider all visible frames, |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
2151 or Qt otherwise. */ |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
2152 |
265 | 2153 /* 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
|
2154 if (WINDOWP (obj)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2155 window = obj; |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2156 else if (f) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2157 window = FRAME_SELECTED_WINDOW (f); |
265 | 2158 else |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2159 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
|
2160 |
33619
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2161 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
|
2162 GCPRO1 (windows); |
265 | 2163 best_window = Qnil; |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2164 |
67234
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
2165 for (; CONSP (windows); windows = XCDR (windows)) |
265 | 2166 { |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2167 struct window *w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2168 |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2169 window = XCAR (windows); |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2170 w = XWINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2171 |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2172 /* 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
|
2173 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
|
2174 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
|
2175 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
|
2176 /* 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
|
2177 || type == UNSHOW_BUFFER |
265 | 2178 || (mini && minibuf_level > 0)) |
2179 switch (type) | |
2180 { | |
2181 case GET_BUFFER_WINDOW: | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2182 if (EQ (w->buffer, obj) |
16522
63ca7c6ceeff
(window_loop, case GET_BUFFER_WINDOW):
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
2183 /* Don't find any minibuffer window |
63ca7c6ceeff
(window_loop, case GET_BUFFER_WINDOW):
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
2184 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
|
2185 && (MINI_WINDOW_P (w) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2186 ? EQ (window, minibuf_window) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2187 : 1)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2188 { |
36068
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
2189 if (NILP (best_window)) |
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
2190 best_window = window; |
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
2191 else if (EQ (window, selected_window)) |
84758
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
2192 /* Prefer to return selected-window. */ |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
2193 RETURN_UNGCPRO (window); |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
2194 else if (EQ (Fwindow_frame (window), selected_frame)) |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
2195 /* Prefer windows on the current frame. */ |
36068
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
2196 best_window = window; |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2197 } |
265 | 2198 break; |
2199 | |
2200 case GET_LRU_WINDOW: | |
66711
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2201 /* `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
|
2202 `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
|
2203 `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
|
2204 if (((XINT (obj) & 1) && !WINDOW_FULL_WIDTH_P (w)) |
70058
12c8842436ef
(window_loop): Test w->dedicated with !NILP instead of EQ Qt.
Kim F. Storm <storm@cua.dk>
parents:
70042
diff
changeset
|
2205 || (!(XINT (obj) & 2) && !NILP (w->dedicated)) |
66711
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2206 /* Minibuffer windows are always ignored. */ |
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2207 || MINI_WINDOW_P (w)) |
265 | 2208 break; |
485 | 2209 if (NILP (best_window) |
265 | 2210 || (XFASTINT (XWINDOW (best_window)->use_time) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2211 > XFASTINT (w->use_time))) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2212 best_window = window; |
265 | 2213 break; |
2214 | |
2215 case DELETE_OTHER_WINDOWS: | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2216 if (!EQ (window, obj)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2217 Fdelete_window (window); |
265 | 2218 break; |
2219 | |
2220 case DELETE_BUFFER_WINDOWS: | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2221 if (EQ (w->buffer, obj)) |
265 | 2222 { |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2223 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
|
2224 |
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
2225 /* 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
|
2226 kill the frame. */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2227 if (EQ (window, FRAME_ROOT_WINDOW (f)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2228 && !NILP (w->dedicated) |
10808
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
2229 && other_visible_frames (f)) |
265 | 2230 { |
10808
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
2231 /* 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
|
2232 There might be one, the minibuffer! */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2233 while (CONSP (XCDR (windows)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2234 && EQ (XWINDOW (XCAR (windows))->frame, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2235 XWINDOW (XCAR (XCDR (windows)))->frame)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2236 windows = XCDR (windows); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2237 |
10808
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
2238 /* 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
|
2239 Fdelete_frame (w->frame, Qnil); |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2240 } |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2241 else if (NILP (w->parent)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2242 { |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2243 /* 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
|
2244 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
|
2245 display there. */ |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2246 Lisp_Object buffer; |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2247 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
|
2248 Fset_window_buffer (window, buffer, Qnil); |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2249 if (EQ (window, selected_window)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2250 Fset_buffer (w->buffer); |
265 | 2251 } |
2252 else | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2253 Fdelete_window (window); |
265 | 2254 } |
2255 break; | |
2256 | |
2257 case GET_LARGEST_WINDOW: | |
66711
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2258 { /* 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
|
2259 /* Ignore dedicated windows and minibuffers. */ |
70058
12c8842436ef
(window_loop): Test w->dedicated with !NILP instead of EQ Qt.
Kim F. Storm <storm@cua.dk>
parents:
70042
diff
changeset
|
2260 if (MINI_WINDOW_P (w) || (NILP (obj) && !NILP (w->dedicated))) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2261 break; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2262 |
31393
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2263 if (NILP (best_window)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2264 best_window = window; |
31393
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2265 else |
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2266 { |
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2267 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
|
2268 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
|
2269 > 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
|
2270 best_window = window; |
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2271 } |
265 | 2272 } |
2273 break; | |
2274 | |
2275 case UNSHOW_BUFFER: | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2276 if (EQ (w->buffer, obj)) |
265 | 2277 { |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2278 Lisp_Object buffer; |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2279 struct frame *f = XFRAME (w->frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2280 |
265 | 2281 /* 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
|
2282 buffer = Fother_buffer (obj, Qnil, w->frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2283 |
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2284 /* 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
|
2285 kill the frame. */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2286 if (EQ (window, FRAME_ROOT_WINDOW (f)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2287 && !NILP (w->dedicated) |
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2288 && other_visible_frames (f)) |
8536
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2289 { |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2290 /* Skip the other windows on this frame. |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2291 There might be one, the minibuffer! */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2292 while (CONSP (XCDR (windows)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2293 && EQ (XWINDOW (XCAR (windows))->frame, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2294 XWINDOW (XCAR (XCDR (windows)))->frame)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2295 windows = XCDR (windows); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2296 |
8536
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2297 /* 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
|
2298 Fdelete_frame (w->frame, Qnil); |
8536
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2299 } |
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2300 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
|
2301 { |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2302 Lisp_Object window; |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2303 XSETWINDOW (window, w); |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2304 /* 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
|
2305 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
|
2306 Fdelete_window (window); |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2307 } |
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2308 else |
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2309 { |
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2310 /* 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
|
2311 w->dedicated = Qnil; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2312 Fset_window_buffer (window, buffer, Qnil); |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2313 if (EQ (window, selected_window)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2314 Fset_buffer (w->buffer); |
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2315 } |
265 | 2316 } |
2317 break; | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2318 |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2319 case REDISPLAY_BUFFER_WINDOWS: |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2320 if (EQ (w->buffer, obj)) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2321 { |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2322 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
|
2323 w->update_mode_line = Qt; |
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
2324 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
|
2325 ++update_mode_lines; |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2326 best_window = window; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2327 } |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2328 break; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2329 |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2330 /* 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
|
2331 case CHECK_ALL_WINDOWS: |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2332 if (! NILP (w->buffer) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2333 && NILP (XBUFFER (w->buffer)->name)) |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2334 abort (); |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2335 break; |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
2336 |
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
2337 case WINDOW_LOOP_UNUSED: |
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
2338 break; |
265 | 2339 } |
2340 } | |
2341 | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2342 UNGCPRO; |
265 | 2343 return best_window; |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
2344 } |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
2345 |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2346 /* 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
|
2347 |
25268 | 2348 void |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2349 check_all_windows () |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2350 { |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2351 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
|
2352 } |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2353 |
66598
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
2354 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
|
2355 doc: /* Return the window least recently selected or used for display. |
76825 | 2356 \(LRU means Least Recently Used.) |
2357 | |
54883
375346b8175c
(Fget_lru_window): Doc fix.
Nick Roberts <nickrob@snap.net.nz>
parents:
54267
diff
changeset
|
2358 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
|
2359 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
|
2360 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
|
2361 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
|
2362 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
|
2363 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
|
2364 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
|
2365 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
|
2366 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
|
2367 (frame, dedicated) |
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
2368 Lisp_Object frame, dedicated; |
265 | 2369 { |
2370 register Lisp_Object w; | |
2371 /* 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
|
2372 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
|
2373 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
|
2374 0, frame); |
485 | 2375 if (!NILP (w) && !EQ (w, selected_window)) |
265 | 2376 return w; |
2377 /* 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
|
2378 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
|
2379 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
|
2380 0, frame); |
265 | 2381 } |
2382 | |
66598
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
2383 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
|
2384 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
|
2385 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
|
2386 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
|
2387 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
|
2388 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
|
2389 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
|
2390 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
|
2391 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
|
2392 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
|
2393 (frame, dedicated) |
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
2394 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
|
2395 { |
66711
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2396 return window_loop (GET_LARGEST_WINDOW, dedicated, 0, |
769 | 2397 frame); |
265 | 2398 } |
2399 | |
2400 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
|
2401 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
|
2402 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
|
2403 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
|
2404 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
|
2405 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
|
2406 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
|
2407 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
|
2408 (buffer, frame) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2409 Lisp_Object buffer, frame; |
265 | 2410 { |
2411 buffer = Fget_buffer (buffer); | |
9105
984a4b1be1d1
(Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents:
9028
diff
changeset
|
2412 if (BUFFERP (buffer)) |
769 | 2413 return window_loop (GET_BUFFER_WINDOW, buffer, 1, frame); |
265 | 2414 else |
2415 return Qnil; | |
2416 } | |
2417 | |
2418 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
|
2419 0, 1, "", |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2420 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
|
2421 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
|
2422 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
|
2423 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
|
2424 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
|
2425 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
|
2426 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
|
2427 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
|
2428 (window) |
265 | 2429 Lisp_Object window; |
2430 { | |
2431 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
|
2432 int startpos; |
35038
ac8eb6b4eee6
(Fdelete_other_windows): Set window's window_end_valid
Gerd Moellmann <gerd@gnu.org>
parents:
35024
diff
changeset
|
2433 int top, new_top; |
265 | 2434 |
485 | 2435 if (NILP (window)) |
265 | 2436 window = selected_window; |
2437 else | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
2438 CHECK_LIVE_WINDOW (window); |
265 | 2439 w = XWINDOW (window); |
9028
74119e5602eb
(Fdelete_other_windows): Nice error if WINDOW is minibuf.
Richard M. Stallman <rms@gnu.org>
parents:
8991
diff
changeset
|
2440 |
7348
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2441 startpos = marker_position (w->start); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2442 top = WINDOW_TOP_EDGE_LINE (w) - FRAME_TOP_MARGIN (XFRAME (WINDOW_FRAME (w))); |
265 | 2443 |
9028
74119e5602eb
(Fdelete_other_windows): Nice error if WINDOW is minibuf.
Richard M. Stallman <rms@gnu.org>
parents:
8991
diff
changeset
|
2444 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
|
2445 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
|
2446 |
2190
482c7827b968
(Fdelete_other_windows): Handle FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
2447 window_loop (DELETE_OTHER_WINDOWS, window, 0, WINDOW_FRAME (w)); |
265 | 2448 |
7348
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2449 /* 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
|
2450 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
|
2451 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
|
2452 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
|
2453 not current, due to typeahead). */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2454 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
|
2455 if (new_top != top |
ac8eb6b4eee6
(Fdelete_other_windows): Set window's window_end_valid
Gerd Moellmann <gerd@gnu.org>
parents:
35024
diff
changeset
|
2456 && 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
|
2457 && 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
|
2458 { |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2459 struct position pos; |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2460 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
|
2461 |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2462 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
|
2463 /* 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
|
2464 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
|
2465 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
|
2466 |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
2467 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
|
2468 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
|
2469 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
|
2470 || 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
|
2471 : Qnil); |
13198
43d90596da34
(Fdelete_other_windows): Set w->force_start.
Richard M. Stallman <rms@gnu.org>
parents:
13187
diff
changeset
|
2472 /* 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
|
2473 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
|
2474 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
|
2475 |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2476 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
|
2477 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2478 |
265 | 2479 return Qnil; |
2480 } | |
2481 | |
2482 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
|
2483 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
|
2484 doc: /* Delete all windows showing BUFFER. |
56393
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
2485 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
|
2486 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
|
2487 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
|
2488 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
|
2489 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
|
2490 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
|
2491 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
|
2492 (buffer, frame) |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
2493 Lisp_Object buffer, frame; |
265 | 2494 { |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
2495 /* 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
|
2496 expects. */ |
22223
5d15aed3a37c
(Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents:
22187
diff
changeset
|
2497 if (NILP (frame)) |
5d15aed3a37c
(Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents:
22187
diff
changeset
|
2498 frame = Qt; |
5d15aed3a37c
(Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents:
22187
diff
changeset
|
2499 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
|
2500 frame = Qnil; |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
2501 |
485 | 2502 if (!NILP (buffer)) |
265 | 2503 { |
2504 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
|
2505 CHECK_BUFFER (buffer); |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
2506 window_loop (DELETE_BUFFER_WINDOWS, buffer, 0, frame); |
265 | 2507 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2508 |
265 | 2509 return Qnil; |
2510 } | |
2511 | |
2512 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
|
2513 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
|
2514 1, 1, "bReplace buffer in windows: ", |
56393
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
2515 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
|
2516 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
|
2517 (buffer) |
265 | 2518 Lisp_Object buffer; |
2519 { | |
485 | 2520 if (!NILP (buffer)) |
265 | 2521 { |
2522 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
|
2523 CHECK_BUFFER (buffer); |
265 | 2524 window_loop (UNSHOW_BUFFER, buffer, 0, Qt); |
2525 } | |
2526 return Qnil; | |
2527 } | |
13918
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2528 |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2529 /* 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
|
2530 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
|
2531 |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2532 void |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2533 replace_buffer_in_all_windows (buffer) |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2534 Lisp_Object buffer; |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2535 { |
14204
c0b44d3a8312
(replace_buffer_in_all_windows): Don't change selected
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
2536 #ifdef MULTI_KBOARD |
13918
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2537 Lisp_Object tail, frame; |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2538 |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2539 /* 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
|
2540 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
|
2541 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
|
2542 FOR_EACH_FRAME (tail, frame) |
20066
affc9c857428
(replace_buffer_in_all_windows):
Karl Heuer <kwzh@gnu.org>
parents:
20046
diff
changeset
|
2543 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
|
2544 #else |
20066
affc9c857428
(replace_buffer_in_all_windows):
Karl Heuer <kwzh@gnu.org>
parents:
20046
diff
changeset
|
2545 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
|
2546 #endif |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2547 } |
265 | 2548 |
2549 /* 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
|
2550 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2551 /* 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
|
2552 might crash Emacs. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2553 |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2554 #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
|
2555 #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
|
2556 |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2557 /* For wp non-zero the total number of columns of window w. Otherwise |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2558 the total number of lines of w. */ |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2559 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2560 #define WINDOW_TOTAL_SIZE(w, wp) \ |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2561 (wp ? WINDOW_TOTAL_COLS (w) : WINDOW_TOTAL_LINES (w)) |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2562 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2563 /* 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
|
2564 minimum allowable size. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2565 |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
2566 void |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2567 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
|
2568 FRAME_PTR frame; |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
2569 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
|
2570 { |
4347
d6b289b1a6dc
* window.c (check_frame_size): Include the menu bar height in the
Jim Blandy <jimb@redhat.com>
parents:
4292
diff
changeset
|
2571 /* 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
|
2572 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
|
2573 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
|
2574 int min_height |
87fe94f01b8e
(check_frame_size): Fix minimum height calculation.
Richard M. Stallman <rms@gnu.org>
parents:
42862
diff
changeset
|
2575 = ((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
|
2576 ? MIN_SAFE_WINDOW_HEIGHT |
87fe94f01b8e
(check_frame_size): Fix minimum height calculation.
Richard M. Stallman <rms@gnu.org>
parents:
42862
diff
changeset
|
2577 : 2 * MIN_SAFE_WINDOW_HEIGHT); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2578 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2579 if (FRAME_TOP_MARGIN (frame) > 0) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2580 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
|
2581 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2582 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
|
2583 *rows = min_height; |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2584 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
|
2585 *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
|
2586 } |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2587 |
25268 | 2588 /* Value is non-zero if window W is fixed-size. WIDTH_P non-zero means |
2589 check if W's width can be changed, otherwise check W's height. | |
2590 CHECK_SIBLINGS_P non-zero means check resizablity of WINDOW's | |
2591 siblings, too. If none of the siblings is resizable, WINDOW isn't | |
2592 either. */ | |
2593 | |
2594 static int | |
2595 window_fixed_size_p (w, width_p, check_siblings_p) | |
2596 struct window *w; | |
2597 int width_p, check_siblings_p; | |
2598 { | |
2599 int fixed_p; | |
2600 struct window *c; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2601 |
25268 | 2602 if (!NILP (w->hchild)) |
2603 { | |
2604 c = XWINDOW (w->hchild); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2605 |
25268 | 2606 if (width_p) |
2607 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2608 /* A horizontal combination is fixed-width if all of if its |
25268 | 2609 children are. */ |
2610 while (c && window_fixed_size_p (c, width_p, 0)) | |
2611 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2612 fixed_p = c == NULL; | |
2613 } | |
2614 else | |
2615 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2616 /* A horizontal combination is fixed-height if one of if its |
25268 | 2617 children is. */ |
2618 while (c && !window_fixed_size_p (c, width_p, 0)) | |
2619 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2620 fixed_p = c != NULL; | |
2621 } | |
2622 } | |
2623 else if (!NILP (w->vchild)) | |
2624 { | |
2625 c = XWINDOW (w->vchild); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2626 |
25268 | 2627 if (width_p) |
2628 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2629 /* A vertical combination is fixed-width if one of if its |
25268 | 2630 children is. */ |
2631 while (c && !window_fixed_size_p (c, width_p, 0)) | |
2632 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2633 fixed_p = c != NULL; | |
2634 } | |
2635 else | |
2636 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2637 /* A vertical combination is fixed-height if all of if its |
25268 | 2638 children are. */ |
2639 while (c && window_fixed_size_p (c, width_p, 0)) | |
2640 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2641 fixed_p = c == NULL; | |
2642 } | |
2643 } | |
2644 else if (BUFFERP (w->buffer)) | |
2645 { | |
65602
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2646 struct buffer *old = current_buffer; |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2647 Lisp_Object val; |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2648 |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2649 current_buffer = XBUFFER (w->buffer); |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2650 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
|
2651 current_buffer = old; |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2652 |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2653 fixed_p = 0; |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2654 if (!EQ (val, Qunbound)) |
25268 | 2655 { |
65602
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2656 fixed_p = !NILP (val); |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2657 |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2658 if (fixed_p |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2659 && ((EQ (val, Qheight) && width_p) |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2660 || (EQ (val, Qwidth) && !width_p))) |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2661 fixed_p = 0; |
25268 | 2662 } |
2663 | |
2664 /* Can't tell if this one is resizable without looking at | |
2665 siblings. If all siblings are fixed-size this one is too. */ | |
2666 if (!fixed_p && check_siblings_p && WINDOWP (w->parent)) | |
2667 { | |
2668 Lisp_Object child; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2669 |
85330
0bc184c59770
* xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85260
diff
changeset
|
2670 for (child = w->prev; WINDOWP (child); child = XWINDOW (child)->prev) |
25268 | 2671 if (!window_fixed_size_p (XWINDOW (child), width_p, 0)) |
2672 break; | |
2673 | |
2674 if (NILP (child)) | |
85330
0bc184c59770
* xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85260
diff
changeset
|
2675 for (child = w->next; WINDOWP (child); child = XWINDOW (child)->next) |
25268 | 2676 if (!window_fixed_size_p (XWINDOW (child), width_p, 0)) |
2677 break; | |
2678 | |
2679 if (NILP (child)) | |
2680 fixed_p = 1; | |
2681 } | |
2682 } | |
2683 else | |
2684 fixed_p = 1; | |
2685 | |
2686 return fixed_p; | |
2687 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2688 |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2689 /* Return minimum size of leaf window W. WIDTH_P non-zero means return |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2690 the minimum width of W, WIDTH_P zero means return the minimum height |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2691 of W. SAFE_P non-zero means ignore window-min-height|width but just |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2692 return values that won't crash Emacs and don't hide components like |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2693 fringes, scrollbars, or modelines. If WIDTH_P is zero and W is the |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2694 minibuffer window, always return 1. */ |
78415
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
2695 |
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
2696 static int |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2697 window_min_size_2 (w, width_p, safe_p) |
78415
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
2698 struct window *w; |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2699 int width_p, safe_p; |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2700 { |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2701 /* We should consider buffer-local values of window_min_height and |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2702 window_min_width here. */ |
78415
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
2703 if (width_p) |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2704 { |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2705 int safe_size = (MIN_SAFE_WINDOW_WIDTH |
78415
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
2706 + WINDOW_FRINGE_COLS (w) |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2707 + WINDOW_SCROLL_BAR_COLS (w)); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2708 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2709 return safe_p ? safe_size : max (window_min_width, safe_size); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2710 } |
78415
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
2711 else if (MINI_WINDOW_P (w)) |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2712 return 1; |
78415
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
2713 else |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2714 { |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2715 int safe_size = (MIN_SAFE_WINDOW_HEIGHT |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2716 + ((BUFFERP (w->buffer) |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2717 && !NILP (XBUFFER (w->buffer)->mode_line_format)) |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2718 ? 1 : 0)); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2719 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2720 return safe_p ? safe_size : max (window_min_height, safe_size); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2721 } |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2722 } |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2723 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2724 /* Return minimum size of window W, not taking fixed-width windows into |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2725 account. WIDTH_P non-zero means return the minimum width, otherwise |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2726 return the minimum height. SAFE_P non-zero means ignore |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2727 window-min-height|width but just return values that won't crash Emacs |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2728 and don't hide components like fringes, scrollbars, or modelines. If |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2729 W is a combination window, compute the minimum size from the minimum |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2730 sizes of W's children. */ |
25268 | 2731 |
2732 static int | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2733 window_min_size_1 (w, width_p, safe_p) |
25254 | 2734 struct window *w; |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2735 int width_p, safe_p; |
25254 | 2736 { |
25268 | 2737 struct window *c; |
25254 | 2738 int size; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2739 |
25268 | 2740 if (!NILP (w->hchild)) |
2741 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2742 /* W is a horizontal combination. */ |
25268 | 2743 c = XWINDOW (w->hchild); |
2744 size = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2745 |
25268 | 2746 if (width_p) |
2747 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2748 /* The minimum width of a horizontal combination is the sum of |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2749 the minimum widths of its children. */ |
25268 | 2750 while (c) |
2751 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2752 size += window_min_size_1 (c, 1, safe_p); |
25268 | 2753 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; |
2754 } | |
2755 } | |
2756 else | |
2757 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2758 /* The minimum height of a horizontal combination is the |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2759 maximum of the minimum heights of its children. */ |
25268 | 2760 while (c) |
2761 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2762 size = max (window_min_size_1 (c, 0, safe_p), size); |
25268 | 2763 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; |
2764 } | |
2765 } | |
2766 } | |
2767 else if (!NILP (w->vchild)) | |
2768 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2769 /* W is a vertical combination. */ |
25268 | 2770 c = XWINDOW (w->vchild); |
2771 size = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2772 |
25268 | 2773 if (width_p) |
2774 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2775 /* The minimum width of a vertical combination is the maximum |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2776 of the minimum widths of its children. */ |
25268 | 2777 while (c) |
2778 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2779 size = max (window_min_size_1 (c, 1, safe_p), size); |
25268 | 2780 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; |
2781 } | |
2782 } | |
2783 else | |
2784 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2785 /* The minimum height of a vertical combination is the sum of |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2786 the minimum height of its children. */ |
25268 | 2787 while (c) |
2788 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2789 size += window_min_size_1 (c, 0, safe_p); |
25268 | 2790 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; |
2791 } | |
2792 } | |
2793 } | |
25254 | 2794 else |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2795 /* W is a leaf window. */ |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2796 size = window_min_size_2 (w, width_p, safe_p); |
25254 | 2797 |
2798 return size; | |
2799 } | |
2800 | |
25268 | 2801 /* Return the minimum size of window W, taking fixed-size windows into |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2802 account. WIDTH_P non-zero means return the minimum width, otherwise |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2803 return the minimum height. SAFE_P non-zero means ignore |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2804 window-min-height|width but just return values that won't crash Emacs |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2805 and don't hide components like fringes, scrollbars, or modelines. |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2806 IGNORE_FIXED_P non-zero means ignore if W is fixed-size. Set *FIXED |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2807 to 1 if W is fixed-size unless FIXED is null. */ |
25268 | 2808 |
2809 static int | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2810 window_min_size (w, width_p, safe_p, ignore_fixed_p, fixed) |
25268 | 2811 struct window *w; |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2812 int width_p, safe_p, ignore_fixed_p, *fixed; |
25268 | 2813 { |
2814 int size, fixed_p; | |
2815 | |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2816 if (ignore_fixed_p) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2817 fixed_p = 0; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2818 else |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2819 fixed_p = window_fixed_size_p (w, width_p, 1); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2820 |
25268 | 2821 if (fixed) |
2822 *fixed = fixed_p; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2823 |
25268 | 2824 if (fixed_p) |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2825 size = WINDOW_TOTAL_SIZE (w, width_p); |
25268 | 2826 else |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2827 size = window_min_size_1 (w, width_p, safe_p); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2828 |
25268 | 2829 return size; |
2830 } | |
2831 | |
2832 | |
51223
c1daf1c22f97
(Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents:
51207
diff
changeset
|
2833 /* 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
|
2834 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
|
2835 is still too narrow. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2836 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2837 static int |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2838 adjust_window_margins (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2839 struct window *w; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2840 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2841 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
|
2842 - WINDOW_FRINGE_COLS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2843 - WINDOW_SCROLL_BAR_COLS (w)); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2844 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
|
2845 + WINDOW_RIGHT_MARGIN_COLS (w)); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2846 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2847 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
|
2848 return 1; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2849 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2850 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
|
2851 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2852 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2853 /* 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
|
2854 margins will fix that. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2855 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
|
2856 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
|
2857 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2858 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
|
2859 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
|
2860 = make_number (margin_cols/2); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2861 else |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2862 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
|
2863 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2864 else |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2865 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
|
2866 return 1; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2867 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2868 |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2869 /* Calculate new sizes for windows in the list FORWARD when their |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2870 compound size goes from TOTAL to SIZE. TOTAL must be greater than |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2871 SIZE. The number of windows in FORWARD is NCHILDREN, and the number |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2872 that can shrink is SHRINKABLE. Fixed-size windows may be shrunk if |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2873 and only if RESIZE_FIXED_P is non-zero. WIDTH_P non-zero means |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2874 shrink columns, otherwise shrink lines. |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2875 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2876 SAFE_P zero means windows may be sized down to window-min-height |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2877 lines (window-min-window columns for WIDTH_P non-zero). SAFE_P |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2878 non-zero means windows may be sized down to their minimum safe sizes |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2879 taking into account the space needed to display modelines, fringes, |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2880 and scrollbars. |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2881 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2882 This function returns an allocated array of new sizes that the caller |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2883 must free. A size -1 means the window is fixed and RESIZE_FIXED_P is |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2884 zero. A size zero means the window shall be deleted. Array index 0 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2885 refers to the first window in FORWARD, 1 to the second, and so on. |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2886 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2887 This function resizes windows proportionally to their size. It also |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2888 tries to preserve smaller windows by resizing larger windows before |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2889 resizing any window to zero. If resize_proportionally is non-nil for |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2890 a specific window, it will attempt to strictly resize that window |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2891 proportionally, even at the expense of deleting smaller windows. */ |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2892 static int * |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2893 shrink_windows (total, size, nchildren, shrinkable, resize_fixed_p, |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2894 forward, width_p, safe_p) |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2895 int total, size, nchildren, shrinkable; |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2896 int resize_fixed_p, width_p, safe_p; |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2897 Lisp_Object forward; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2898 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2899 int available_resize = 0; |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2900 int *new_sizes, *min_sizes; |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2901 struct window *c; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2902 Lisp_Object child; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2903 int smallest = total; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2904 int total_removed = 0; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2905 int total_shrink = total - size; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2906 int i; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2907 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2908 new_sizes = xmalloc (sizeof (*new_sizes) * nchildren); |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2909 min_sizes = xmalloc (sizeof (*min_sizes) * nchildren); |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2910 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2911 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
|
2912 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2913 int child_size; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2914 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2915 c = XWINDOW (child); |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2916 child_size = WINDOW_TOTAL_SIZE (c, width_p); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2917 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2918 if (!resize_fixed_p && window_fixed_size_p (c, width_p, 0)) |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2919 new_sizes[i] = -1; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2920 else |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2921 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2922 new_sizes[i] = child_size; |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2923 min_sizes[i] = window_min_size_1 (c, width_p, safe_p); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2924 if (child_size > min_sizes[i] |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2925 && NILP (c->resize_proportionally)) |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2926 available_resize += child_size - min_sizes[i]; |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2927 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2928 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2929 /* 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
|
2930 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
|
2931 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2932 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
|
2933 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2934 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
|
2935 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
|
2936 smallest = new_sizes[i]; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2937 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2938 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
|
2939 if (new_sizes[i] == smallest) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2940 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2941 /* 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
|
2942 new_sizes[i] = 0; |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2943 if (smallest > min_sizes[i]) |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2944 available_resize -= smallest - min_sizes[i]; |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2945 available_resize += smallest; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2946 --shrinkable; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2947 total_removed += smallest; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2948 |
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
|
2949 /* 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
|
2950 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
|
2951 |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2952 /* 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
|
2953 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
|
2954 break; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2955 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2956 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2957 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2958 /* 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
|
2959 proportional to its size. */ |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2960 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
|
2961 { |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2962 if (new_sizes[i] > min_sizes[i]) |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2963 { |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2964 int to_shrink = total_shrink * new_sizes[i] / total; |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2965 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2966 if (new_sizes[i] - to_shrink < min_sizes[i]) |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2967 to_shrink = new_sizes[i] - min_sizes[i]; |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2968 new_sizes[i] -= to_shrink; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2969 total_removed += to_shrink; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2970 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2971 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2972 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2973 /* 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
|
2974 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
|
2975 while (total_shrink > total_removed) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2976 { |
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
|
2977 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
|
2978 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
|
2979 |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2980 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
|
2981 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
|
2982 { |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2983 ++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
|
2984 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
|
2985 } |
58441
9b7ff064cb26
(set_window_buffer): Clear display_error_modiff.
Kim F. Storm <storm@cua.dk>
parents:
58265
diff
changeset
|
2986 |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2987 for (i = 0; i < nchildren; ++i) |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2988 if (new_sizes[i] > min_sizes[i]) |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2989 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2990 --new_sizes[i]; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2991 ++total_removed; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2992 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2993 /* 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
|
2994 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
|
2995 break; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2996 } |
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
|
2997 |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
2998 /* 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
|
2999 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
|
3000 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
|
3001 } |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
3002 |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
3003 /* 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
|
3004 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
|
3005 { |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
3006 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
|
3007 { |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
3008 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
|
3009 { |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
3010 ++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
|
3011 --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
|
3012 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
|
3013 } |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
3014 } |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3015 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3016 |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3017 xfree (min_sizes); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3018 |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3019 return new_sizes; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3020 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3021 |
25268 | 3022 /* Set WINDOW's height or width to SIZE. WIDTH_P non-zero means set |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3023 WINDOW's width. Resize WINDOW's children, if any, so that they keep |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3024 their proportionate size relative to WINDOW. |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3025 |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3026 If FIRST_ONLY is 1, change only the first of WINDOW's children when |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3027 they are in series. If LAST_ONLY is 1, change only the last of |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3028 WINDOW's children when they are in series. |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3029 |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3030 Propagate WINDOW's top or left edge position to children. Delete |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3031 windows that become too small unless NODELETE_P is 1. When |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3032 NODELETE_P equals 2 do not honor settings for window-min-height and |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3033 window-min-width when resizing windows but use safe defaults instead. |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3034 This should give better behavior when resizing frames. */ |
25268 | 3035 |
3036 static void | |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3037 size_window (window, size, width_p, nodelete_p, first_only, last_only) |
25268 | 3038 Lisp_Object window; |
3039 int size, width_p, nodelete_p; | |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3040 int first_only, last_only; |
25268 | 3041 { |
3042 struct window *w = XWINDOW (window); | |
3043 struct window *c; | |
3044 Lisp_Object child, *forward, *sideward; | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3045 int old_size = WINDOW_TOTAL_SIZE (w, width_p); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3046 |
32824
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
3047 size = max (0, size); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3048 |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3049 /* Delete WINDOW if it's too small. */ |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3050 if (nodelete_p != 1 && !NILP (w->parent) |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3051 && size < window_min_size_1 (w, width_p, nodelete_p == 2)) |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3052 { |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3053 delete_window (window); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3054 return; |
25268 | 3055 } |
3056 | |
3057 /* Set redisplay hints. */ | |
32824
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
3058 w->last_modified = make_number (0); |
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
3059 w->last_overlay_modified = make_number (0); |
25268 | 3060 windows_or_buffers_changed++; |
32824
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
3061 FRAME_WINDOW_SIZES_CHANGED (XFRAME (w->frame)) = 1; |
25268 | 3062 |
3063 if (width_p) | |
3064 { | |
3065 sideward = &w->vchild; | |
3066 forward = &w->hchild; | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3067 w->total_cols = make_number (size); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3068 adjust_window_margins (w); |
25268 | 3069 } |
3070 else | |
3071 { | |
3072 sideward = &w->hchild; | |
3073 forward = &w->vchild; | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3074 w->total_lines = make_number (size); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3075 w->orig_total_lines = Qnil; |
25268 | 3076 } |
3077 | |
3078 if (!NILP (*sideward)) | |
3079 { | |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3080 /* We have a chain of parallel siblings whose size should all change. */ |
25268 | 3081 for (child = *sideward; !NILP (child); child = c->next) |
3082 { | |
3083 c = XWINDOW (child); | |
3084 if (width_p) | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3085 c->left_col = w->left_col; |
25268 | 3086 else |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3087 c->top_line = w->top_line; |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3088 size_window (child, size, width_p, nodelete_p, |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3089 first_only, last_only); |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3090 } |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3091 } |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3092 else if (!NILP (*forward) && last_only) |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3093 { |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3094 /* Change the last in a series of siblings. */ |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3095 Lisp_Object last_child; |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3096 int child_size; |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3097 |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3098 for (child = *forward; !NILP (child); child = c->next) |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3099 { |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3100 c = XWINDOW (child); |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3101 last_child = child; |
25268 | 3102 } |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3103 |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3104 child_size = WINDOW_TOTAL_SIZE (c, width_p); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3105 size_window (last_child, size - old_size + child_size, |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3106 width_p, nodelete_p, first_only, last_only); |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3107 } |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3108 else if (!NILP (*forward) && first_only) |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3109 { |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3110 /* Change the first in a series of siblings. */ |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3111 int child_size; |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3112 |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3113 child = *forward; |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3114 c = XWINDOW (child); |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3115 |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3116 if (width_p) |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3117 c->left_col = w->left_col; |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3118 else |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3119 c->top_line = w->top_line; |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3120 |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3121 child_size = WINDOW_TOTAL_SIZE (c, width_p); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3122 size_window (child, size - old_size + child_size, |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3123 width_p, nodelete_p, first_only, last_only); |
25268 | 3124 } |
3125 else if (!NILP (*forward)) | |
3126 { | |
3127 int fixed_size, each, extra, n; | |
3128 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
|
3129 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
|
3130 int *new_sizes = NULL; |
25268 | 3131 |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3132 /* Determine the fixed-size portion of this window, and the |
25268 | 3133 number of child windows. */ |
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
3134 fixed_size = nchildren = nfixed = total = 0; |
25268 | 3135 for (child = *forward; !NILP (child); child = c->next, ++nchildren) |
3136 { | |
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
3137 int child_size; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3138 |
25268 | 3139 c = XWINDOW (child); |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3140 child_size = WINDOW_TOTAL_SIZE (c, width_p); |
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
3141 total += child_size; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3142 |
25268 | 3143 if (window_fixed_size_p (c, width_p, 0)) |
3144 { | |
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
3145 fixed_size += child_size; |
25268 | 3146 ++nfixed; |
3147 } | |
3148 } | |
3149 | |
3150 /* If the new size is smaller than fixed_size, or if there | |
3151 aren't any resizable windows, allow resizing fixed-size | |
3152 windows. */ | |
3153 resize_fixed_p = nfixed == nchildren || size < fixed_size; | |
3154 | |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3155 /* Compute how many lines/columns to add/remove to each child. The |
25268 | 3156 value of extra takes care of rounding errors. */ |
3157 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
|
3158 if (size < total && n > 1) |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3159 new_sizes = shrink_windows (total, size, nchildren, n, |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3160 resize_fixed_p, *forward, width_p, |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3161 nodelete_p == 2); |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3162 else |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3163 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3164 each = (size - total) / n; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3165 extra = (size - total) - n * each; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3166 } |
25268 | 3167 |
3168 /* 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
|
3169 first_pos = width_p ? XINT (w->left_col) : XINT (w->top_line); |
25268 | 3170 last_pos = first_pos; |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3171 for (n = 0, child = *forward; !NILP (child); child = c->next, ++n) |
25268 | 3172 { |
3173 int new_size, old_size; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3174 |
25268 | 3175 c = XWINDOW (child); |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3176 old_size = WINDOW_TOTAL_SIZE (c, width_p); |
25268 | 3177 new_size = old_size; |
3178 | |
3179 /* The top or left edge position of this child equals the | |
3180 bottom or right edge of its predecessor. */ | |
3181 if (width_p) | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3182 c->left_col = make_number (last_pos); |
25268 | 3183 else |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3184 c->top_line = make_number (last_pos); |
25268 | 3185 |
3186 /* If this child can be resized, do it. */ | |
3187 if (resize_fixed_p || !window_fixed_size_p (c, width_p, 0)) | |
3188 { | |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3189 new_size = new_sizes ? new_sizes[n] : old_size + each + extra; |
25268 | 3190 extra = 0; |
3191 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3192 |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3193 /* Set new size. Note that size_window also propagates |
25268 | 3194 edge positions to children, so it's not a no-op if we |
3195 didn't change the child's size. */ | |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3196 size_window (child, new_size, width_p, 1, first_only, last_only); |
25268 | 3197 |
3198 /* Remember the bottom/right edge position of this child; it | |
3199 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
|
3200 last_pos += new_size; |
25268 | 3201 } |
3202 | |
95481
4390d64d3328
Make "xfree (NULL)" a no-op; remove useless if-before-xfree.
Jim Meyering <jim@meyering.net>
parents:
94963
diff
changeset
|
3203 xfree (new_sizes); |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3204 |
25268 | 3205 /* We should have covered the parent exactly with child windows. */ |
3206 xassert (size == last_pos - first_pos); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3207 |
25268 | 3208 /* Now delete any children that became too small. */ |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3209 if (nodelete_p != 1) |
25268 | 3210 for (child = *forward; !NILP (child); child = c->next) |
3211 { | |
3212 int child_size; | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3213 |
25268 | 3214 c = XWINDOW (child); |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3215 child_size = WINDOW_TOTAL_SIZE (c, width_p); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3216 size_window (child, child_size, width_p, nodelete_p, |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3217 first_only, last_only); |
25268 | 3218 } |
3219 } | |
3220 } | |
3221 | |
3222 /* Set WINDOW's height to HEIGHT, and recursively change the height of | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3223 WINDOW's children. NODELETE zero means windows that have become |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3224 smaller than window-min-height in the process may be deleted. |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3225 NODELETE 1 means never delete windows that become too small in the |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3226 process. (The caller should check later and do so if appropriate.) |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3227 NODELETE 2 means delete only windows that have become too small to be |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3228 displayed correctly. */ |
265 | 3229 |
20351 | 3230 void |
265 | 3231 set_window_height (window, height, nodelete) |
3232 Lisp_Object window; | |
3233 int height; | |
3234 int nodelete; | |
3235 { | |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3236 size_window (window, height, 0, nodelete, 0, 0); |
265 | 3237 } |
3238 | |
25268 | 3239 /* Set WINDOW's width to WIDTH, and recursively change the width of |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3240 WINDOW's children. NODELETE zero means windows that have become |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3241 smaller than window-min-width in the process may be deleted. |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3242 NODELETE 1 means never delete windows that become too small in the |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3243 process. (The caller should check later and do so if appropriate.) |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3244 NODELETE 2 means delete only windows that have become too small to be |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3245 displayed correctly. */ |
265 | 3246 |
20351 | 3247 void |
265 | 3248 set_window_width (window, width, nodelete) |
3249 Lisp_Object window; | |
3250 int width; | |
3251 int nodelete; | |
3252 { | |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3253 size_window (window, width, 1, nodelete, 0, 0); |
265 | 3254 } |
25268 | 3255 |
50367
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3256 /* 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
|
3257 |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3258 void |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3259 change_window_heights (window, n) |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3260 Lisp_Object window; |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3261 int n; |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3262 { |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3263 struct window *w = XWINDOW (window); |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3264 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3265 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
|
3266 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
|
3267 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3268 if (INTEGERP (w->orig_top_line)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3269 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
|
3270 if (INTEGERP (w->orig_total_lines)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3271 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
|
3272 |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3273 /* 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
|
3274 if (!NILP (w->vchild)) |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3275 change_window_heights (w->vchild, n); |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3276 |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3277 /* 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
|
3278 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
|
3279 { |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3280 w = XWINDOW (window); |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3281 change_window_heights (window, n); |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3282 } |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3283 } |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3284 |
265 | 3285 |
362 | 3286 int window_select_count; |
265 | 3287 |
14445
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
3288 Lisp_Object |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
3289 Fset_window_buffer_unwind (obuf) |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
3290 Lisp_Object obuf; |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
3291 { |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
3292 Fset_buffer (obuf); |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
3293 return Qnil; |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
3294 } |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
3295 |
51240
1fe905dd5836
(Fset_window_buffer): Add type of `keep_margins' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51223
diff
changeset
|
3296 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
|
3297 EXFUN (Fset_window_scroll_bars, 4); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3298 |
93068
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3299 static void |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3300 run_funs (Lisp_Object funs) |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3301 { |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3302 for (; CONSP (funs); funs = XCDR (funs)) |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3303 if (!EQ (XCAR (funs), Qt)) |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3304 call0 (XCAR (funs)); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3305 } |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3306 |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3307 static Lisp_Object select_window_norecord (Lisp_Object window); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3308 |
88050
449ffc76e463
* window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87847
diff
changeset
|
3309 void |
449ffc76e463
* window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87847
diff
changeset
|
3310 run_window_configuration_change_hook (struct frame *f) |
449ffc76e463
* window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87847
diff
changeset
|
3311 { |
449ffc76e463
* window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87847
diff
changeset
|
3312 int count = SPECPDL_INDEX (); |
93068
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3313 Lisp_Object frame, global_wcch |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3314 = Fdefault_value (Qwindow_configuration_change_hook); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3315 XSETFRAME (frame, f); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3316 |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3317 if (NILP (Vrun_hooks)) |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3318 return; |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3319 |
88050
449ffc76e463
* window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87847
diff
changeset
|
3320 if (SELECTED_FRAME () != f) |
449ffc76e463
* window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87847
diff
changeset
|
3321 { |
449ffc76e463
* window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87847
diff
changeset
|
3322 record_unwind_protect (Fselect_frame, Fselected_frame ()); |
449ffc76e463
* window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87847
diff
changeset
|
3323 Fselect_frame (frame); |
449ffc76e463
* window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87847
diff
changeset
|
3324 } |
93068
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3325 |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3326 /* Use the right buffer. Matters when running the local hooks. */ |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3327 if (current_buffer != XBUFFER (Fwindow_buffer (Qnil))) |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3328 { |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3329 record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3330 Fset_buffer (Fwindow_buffer (Qnil)); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3331 } |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3332 |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3333 /* Look for buffer-local values. */ |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3334 { |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3335 Lisp_Object windows = Fwindow_list (frame, Qlambda, Qnil); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3336 for (; CONSP (windows); windows = XCDR (windows)) |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3337 { |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3338 Lisp_Object window = XCAR (windows); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3339 Lisp_Object buffer = Fwindow_buffer (window); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3340 if (!NILP (Flocal_variable_p (Qwindow_configuration_change_hook, |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3341 buffer))) |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3342 { |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3343 int count = SPECPDL_INDEX (); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3344 record_unwind_protect (select_window_norecord, Fselected_window ()); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3345 select_window_norecord (window); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3346 run_funs (Fbuffer_local_value (Qwindow_configuration_change_hook, |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3347 buffer)); |
88050
449ffc76e463
* window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87847
diff
changeset
|
3348 unbind_to (count, Qnil); |
449ffc76e463
* window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87847
diff
changeset
|
3349 } |
93068
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3350 } |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3351 } |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3352 |
93068
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3353 run_funs (global_wcch); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3354 unbind_to (count, Qnil); |
88050
449ffc76e463
* window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87847
diff
changeset
|
3355 } |
449ffc76e463
* window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87847
diff
changeset
|
3356 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3357 /* 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
|
3358 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
|
3359 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
|
3360 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
|
3361 reset from the buffer's local settings. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3362 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3363 void |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3364 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
|
3365 Lisp_Object window, buffer; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3366 int run_hooks_p, keep_margins_p; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3367 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3368 struct window *w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3369 struct buffer *b = XBUFFER (buffer); |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
3370 int count = SPECPDL_INDEX (); |
87847
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3371 int samebuf = EQ (buffer, w->buffer); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3372 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3373 w->buffer = buffer; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3374 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3375 if (EQ (window, selected_window)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3376 b->last_selected_window = window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3377 |
58441
9b7ff064cb26
(set_window_buffer): Clear display_error_modiff.
Kim F. Storm <storm@cua.dk>
parents:
58265
diff
changeset
|
3378 /* Let redisplay errors through. */ |
9b7ff064cb26
(set_window_buffer): Clear display_error_modiff.
Kim F. Storm <storm@cua.dk>
parents:
58265
diff
changeset
|
3379 b->display_error_modiff = 0; |
9b7ff064cb26
(set_window_buffer): Clear display_error_modiff.
Kim F. Storm <storm@cua.dk>
parents:
58265
diff
changeset
|
3380 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3381 /* Update time stamps of buffer display. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3382 if (INTEGERP (b->display_count)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3383 XSETINT (b->display_count, XINT (b->display_count) + 1); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3384 b->display_time = Fcurrent_time (); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3385 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3386 XSETFASTINT (w->window_end_pos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3387 XSETFASTINT (w->window_end_vpos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3388 bzero (&w->last_cursor, sizeof w->last_cursor); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3389 w->window_end_valid = Qnil; |
87847
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3390 if (!(keep_margins_p && samebuf)) |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3391 { /* If we're not actually changing the buffer, Don't reset hscroll and |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3392 vscroll. This case happens for example when called from |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3393 change_frame_size_1, where we use a dummy call to |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3394 Fset_window_buffer on the frame's selected window (and no other) |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3395 just in order to run window-configuration-change-hook. |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3396 Resetting hscroll and vscroll here is problematic for things like |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3397 image-mode and doc-view-mode since it resets the image's position |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3398 whenever we resize the frame. */ |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3399 w->hscroll = w->min_hscroll = make_number (0); |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3400 w->vscroll = 0; |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3401 set_marker_both (w->pointm, buffer, BUF_PT (b), BUF_PT_BYTE (b)); |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3402 set_marker_restricted (w->start, |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3403 make_number (b->last_window_start), |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3404 buffer); |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3405 w->start_at_line_beg = Qnil; |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3406 w->force_start = Qnil; |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3407 XSETFASTINT (w->last_modified, 0); |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3408 XSETFASTINT (w->last_overlay_modified, 0); |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3409 } |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3410 /* Maybe we could move this into the `if' but it's not obviously safe and |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3411 I doubt it's worth the trouble. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3412 windows_or_buffers_changed++; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3413 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3414 /* 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
|
3415 If WINDOW is selected, switch permanently. |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3416 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
|
3417 if (EQ (window, selected_window)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3418 Fset_buffer (buffer); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3419 /* We can't check ! NILP (Vwindow_scroll_functions) here |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3420 because that might itself be a local variable. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3421 else if (window_initialized) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3422 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3423 record_unwind_protect (Fset_window_buffer_unwind, Fcurrent_buffer ()); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3424 Fset_buffer (buffer); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3425 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3426 |
95777
edc51d72cb17
* window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
3427 XMARKER (w->pointm)->insertion_type = !NILP (Vwindow_point_insertion_type); |
edc51d72cb17
* window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
3428 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3429 if (!keep_margins_p) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3430 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3431 /* 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
|
3432 |
51223
c1daf1c22f97
(Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents:
51207
diff
changeset
|
3433 /* 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
|
3434 temporarily disable window margins. */ |
52617
f8adaf14f570
(set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents:
52565
diff
changeset
|
3435 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
|
3436 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
|
3437 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3438 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
|
3439 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3440 Fset_window_fringes (window, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3441 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
|
3442 b->fringes_outside_margins); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3443 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3444 Fset_window_scroll_bars (window, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3445 b->scroll_bar_width, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3446 b->vertical_scroll_bar_type, Qnil); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3447 |
52617
f8adaf14f570
(set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents:
52565
diff
changeset
|
3448 w->left_margin_cols = save_left; |
f8adaf14f570
(set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents:
52565
diff
changeset
|
3449 w->right_margin_cols = save_right; |
f8adaf14f570
(set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents:
52565
diff
changeset
|
3450 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3451 Fset_window_margins (window, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3452 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
|
3453 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3454 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3455 if (run_hooks_p) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3456 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3457 if (! NILP (Vwindow_scroll_functions)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3458 run_hook_with_args_2 (Qwindow_scroll_functions, window, |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3459 Fmarker_position (w->start)); |
88050
449ffc76e463
* window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87847
diff
changeset
|
3460 run_window_configuration_change_hook (XFRAME (WINDOW_FRAME (w))); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3461 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3462 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3463 unbind_to (count, Qnil); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3464 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3465 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3466 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3467 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
|
3468 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
|
3469 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
|
3470 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
|
3471 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
|
3472 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
|
3473 defaults. |
0730ef55b4d8
(Fset_window_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56616
diff
changeset
|
3474 |
0730ef55b4d8
(Fset_window_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56616
diff
changeset
|
3475 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
|
3476 (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
|
3477 register Lisp_Object window, buffer, keep_margins; |
265 | 3478 { |
3479 register Lisp_Object tem; | |
3480 register struct window *w = decode_window (window); | |
3481 | |
27848
27b993d2ea05
(Fset_window_buffer): Set WINDOW to the window
Gerd Moellmann <gerd@gnu.org>
parents:
27699
diff
changeset
|
3482 XSETWINDOW (window, w); |
265 | 3483 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
|
3484 CHECK_BUFFER (buffer); |
265 | 3485 |
485 | 3486 if (NILP (XBUFFER (buffer)->name)) |
265 | 3487 error ("Attempt to display deleted buffer"); |
3488 | |
3489 tem = w->buffer; | |
485 | 3490 if (NILP (tem)) |
265 | 3491 error ("Window is deleted"); |
3492 else if (! EQ (tem, Qt)) /* w->buffer is t when the window | |
3493 is first being set up. */ | |
3494 { | |
95777
edc51d72cb17
* window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
3495 if (!EQ (tem, buffer)) |
edc51d72cb17
* window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
3496 if (EQ (w->dedicated, Qt)) |
edc51d72cb17
* window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
3497 error ("Window is dedicated to `%s'", SDATA (XBUFFER (tem)->name)); |
edc51d72cb17
* window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
3498 else |
edc51d72cb17
* window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
3499 w->dedicated = Qnil; |
265 | 3500 |
3501 unshow_buffer (w); | |
3502 } | |
3503 | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3504 set_window_buffer (window, buffer, 1, !NILP (keep_margins)); |
265 | 3505 return Qnil; |
3506 } | |
3507 | |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3508 /* Note that selected_window can be nil |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3509 when this is called from Fset_window_configuration. */ |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3510 |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3511 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
|
3512 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
|
3513 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
|
3514 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
|
3515 Optional second arg NORECORD non-nil means |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3516 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
|
3517 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
3518 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
|
3519 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
|
3520 (window, norecord) |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3521 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
|
3522 { |
265 | 3523 register struct window *w; |
27869
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3524 register struct window *ow; |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3525 struct frame *sf; |
265 | 3526 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3527 CHECK_LIVE_WINDOW (window); |
265 | 3528 |
3529 w = XWINDOW (window); | |
39953
3a1666ed16b8
(select_window_1): Unfreeze window start. Remove a
Gerd Moellmann <gerd@gnu.org>
parents:
39952
diff
changeset
|
3530 w->frozen_window_start_p = 0; |
265 | 3531 |
58265
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
3532 ++window_select_count; |
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
3533 XSETFASTINT (w->use_time, window_select_count); |
265 | 3534 if (EQ (window, selected_window)) |
3535 return window; | |
3536 | |
84758
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
3537 sf = SELECTED_FRAME (); |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
3538 if (XFRAME (WINDOW_FRAME (w)) != sf) |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
3539 { |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
3540 XFRAME (WINDOW_FRAME (w))->selected_window = window; |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
3541 /* Use this rather than Fhandle_switch_frame |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
3542 so that FRAME_FOCUS_FRAME is moved appropriately as we |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
3543 move around in the state where a minibuffer in a separate |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
3544 frame is active. */ |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
3545 Fselect_frame (WINDOW_FRAME (w)); |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
3546 /* Fselect_frame called us back so we've done all the work already. */ |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
3547 eassert (EQ (window, selected_window)); |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
3548 return window; |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
3549 } |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
3550 else |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
3551 sf->selected_window = window; |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
3552 |
61444 | 3553 /* Store the current buffer's actual point into the |
3554 old selected window. It belongs to that window, | |
3555 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
|
3556 if (!NILP (selected_window)) |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3557 { |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3558 ow = XWINDOW (selected_window); |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3559 if (! NILP (ow->buffer)) |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3560 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
|
3561 BUF_PT (XBUFFER (ow->buffer)), |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3562 BUF_PT_BYTE (XBUFFER (ow->buffer))); |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3563 } |
265 | 3564 |
3565 selected_window = window; | |
3566 | |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3567 if (NILP (norecord)) |
22187
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
3568 record_buffer (w->buffer); |
265 | 3569 Fset_buffer (w->buffer); |
3570 | |
16068
b19129a8c644
(unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
3571 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
|
3572 |
265 | 3573 /* Go to the point recorded in the window. |
3574 This is important when the buffer is in more | |
3575 than one window. It also matters when | |
3576 redisplay_window has altered point after scrolling, | |
3577 because it makes the change only in the window. */ | |
3578 { | |
3579 register int new_point = marker_position (w->pointm); | |
3580 if (new_point < BEGV) | |
3581 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
|
3582 else if (new_point > ZV) |
265 | 3583 SET_PT (ZV); |
3584 else | |
3585 SET_PT (new_point); | |
3586 } | |
3587 | |
3588 windows_or_buffers_changed++; | |
3589 return window; | |
3590 } | |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3591 |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3592 static Lisp_Object |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3593 select_window_norecord (window) |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3594 Lisp_Object window; |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3595 { |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3596 return Fselect_window (window, Qt); |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3597 } |
22187
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
3598 |
95590
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95566
diff
changeset
|
3599 Lisp_Object |
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95566
diff
changeset
|
3600 display_buffer (buffer, not_this_window_p, override_frame) |
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95566
diff
changeset
|
3601 Lisp_Object buffer, not_this_window_p, override_frame; |
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95566
diff
changeset
|
3602 { |
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95566
diff
changeset
|
3603 return call3 (Qdisplay_buffer, buffer, not_this_window_p, override_frame); |
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95566
diff
changeset
|
3604 } |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3605 |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3606 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
|
3607 0, 1, 0, |
71717
dfc0eccac6a1
(Fforce_window_update): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
71396
diff
changeset
|
3608 doc: /* Force all windows to be updated on next redisplay. |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3609 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
|
3610 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
|
3611 displaying that buffer. */) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3612 (object) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3613 Lisp_Object object; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3614 { |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3615 if (NILP (object)) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3616 { |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3617 windows_or_buffers_changed++; |
54178
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
3618 update_mode_lines++; |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3619 return Qt; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3620 } |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3621 |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3622 if (WINDOWP (object)) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3623 { |
54178
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
3624 struct window *w = XWINDOW (object); |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3625 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
|
3626 w->update_mode_line = Qt; |
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
3627 if (BUFFERP (w->buffer)) |
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
3628 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
|
3629 ++update_mode_lines; |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3630 return Qt; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3631 } |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
3632 |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3633 if (STRINGP (object)) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3634 object = Fget_buffer (object); |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3635 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
|
3636 { |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3637 /* 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
|
3638 of each of those windows. */ |
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 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
|
3641 return NILP (object) ? Qnil : Qt; |
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 |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3644 /* 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
|
3645 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
|
3646 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
|
3647 return Qnil; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3648 } |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3649 |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3650 |
265 | 3651 void |
3652 temp_output_buffer_show (buf) | |
3653 register Lisp_Object buf; | |
3654 { | |
3655 register struct buffer *old = current_buffer; | |
3656 register Lisp_Object window; | |
3657 register struct window *w; | |
3658 | |
18493
d65021d5c39e
(temp_output_buffer_show): Copy default-directory from current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18065
diff
changeset
|
3659 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
|
3660 |
265 | 3661 Fset_buffer (buf); |
10302
34556316a48a
(temp_output_buffer_show): Use BUF_SAVE_MODIFF.
Richard M. Stallman <rms@gnu.org>
parents:
10043
diff
changeset
|
3662 BUF_SAVE_MODIFF (XBUFFER (buf)) = MODIFF; |
265 | 3663 BEGV = BEG; |
3664 ZV = Z; | |
3665 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
|
3666 #if 0 /* rms: there should be no reason for this. */ |
25375 | 3667 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
|
3668 #endif |
265 | 3669 set_buffer_internal (old); |
3670 | |
67234
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
3671 if (!NILP (Vtemp_buffer_show_function)) |
265 | 3672 call1 (Vtemp_buffer_show_function, buf); |
3673 else | |
3674 { | |
95590
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95566
diff
changeset
|
3675 window = display_buffer (buf, Qnil, Qnil); |
265 | 3676 |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3677 if (!EQ (XWINDOW (window)->frame, selected_frame)) |
769 | 3678 Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window))); |
265 | 3679 Vminibuf_scroll_window = window; |
3680 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
|
3681 XSETFASTINT (w->hscroll, 0); |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
3682 XSETFASTINT (w->min_hscroll, 0); |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3683 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
|
3684 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
|
3685 |
22149
ad3ee5ec90d1
(Fselect_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
21844
diff
changeset
|
3686 /* 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
|
3687 and its buffer current. */ |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3688 |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3689 if (!NILP (Vrun_hooks) |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3690 && !NILP (Fboundp (Qtemp_buffer_show_hook)) |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3691 && !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
|
3692 { |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3693 int count = SPECPDL_INDEX (); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3694 Lisp_Object prev_window, prev_buffer; |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3695 prev_window = selected_window; |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3696 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
|
3697 |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3698 /* 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
|
3699 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
|
3700 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
|
3701 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
|
3702 record_unwind_protect (Fset_buffer, prev_buffer); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3703 record_unwind_protect (select_window_norecord, prev_window); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3704 Fselect_window (window, Qt); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3705 Fset_buffer (w->buffer); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3706 call1 (Vrun_hooks, Qtemp_buffer_show_hook); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3707 unbind_to (count, Qnil); |
11405
645e3883da72
(temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents:
11307
diff
changeset
|
3708 } |
645e3883da72
(temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents:
11307
diff
changeset
|
3709 } |
265 | 3710 } |
3711 | |
21514 | 3712 static void |
265 | 3713 make_dummy_parent (window) |
3714 Lisp_Object window; | |
3715 { | |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3716 Lisp_Object new; |
265 | 3717 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
|
3718 int i; |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3719 |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3720 o = XWINDOW (window); |
36432
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
3721 p = allocate_window (); |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3722 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
|
3723 ((struct Lisp_Vector *) p)->contents[i] |
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
3724 = ((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
|
3725 XSETWINDOW (new, p); |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3726 |
58265
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
3727 ++sequence_number; |
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
3728 XSETFASTINT (p->sequence_number, sequence_number); |
265 | 3729 |
3730 /* Put new into window structure in place of window */ | |
3731 replace_window (window, new); | |
3732 | |
3733 o->next = Qnil; | |
3734 o->prev = Qnil; | |
3735 o->vchild = Qnil; | |
3736 o->hchild = Qnil; | |
3737 o->parent = new; | |
3738 | |
3739 p->start = Qnil; | |
3740 p->pointm = Qnil; | |
3741 p->buffer = Qnil; | |
3742 } | |
3743 | |
3744 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
|
3745 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
|
3746 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
|
3747 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
|
3748 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
|
3749 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
|
3750 Interactively, all arguments are nil. |
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
3751 |
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
3752 Returns the newly created window (which is the lower or rightmost one). |
71146
c53dfaf68575
(Fsplit_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
71041
diff
changeset
|
3753 The upper or leftmost window is the original one, and remains selected |
c53dfaf68575
(Fsplit_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
71041
diff
changeset
|
3754 if it was selected before. |
c53dfaf68575
(Fsplit_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
71041
diff
changeset
|
3755 |
56393
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
3756 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
|
3757 (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
|
3758 Lisp_Object window, size, horflag; |
265 | 3759 { |
3760 register Lisp_Object new; | |
3761 register struct window *o, *p; | |
13723
4e170419e83c
(Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents:
13619
diff
changeset
|
3762 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
|
3763 register int size_int; |
265 | 3764 |
485 | 3765 if (NILP (window)) |
265 | 3766 window = selected_window; |
3767 else | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3768 CHECK_LIVE_WINDOW (window); |
265 | 3769 |
3770 o = XWINDOW (window); | |
13723
4e170419e83c
(Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents:
13619
diff
changeset
|
3771 fo = XFRAME (WINDOW_FRAME (o)); |
265 | 3772 |
13780
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3773 if (NILP (size)) |
265 | 3774 { |
485 | 3775 if (!NILP (horflag)) |
13723
4e170419e83c
(Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents:
13619
diff
changeset
|
3776 /* 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
|
3777 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
|
3778 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
|
3779 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
|
3780 size_int = (XFASTINT (o->total_cols) + 1) >> 1; |
265 | 3781 else |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3782 size_int = XFASTINT (o->total_lines) >> 1; |
265 | 3783 } |
3784 else | |
3785 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3786 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
|
3787 size_int = XINT (size); |
265 | 3788 } |
3789 | |
3790 if (MINI_WINDOW_P (o)) | |
3791 error ("Attempt to split minibuffer window"); | |
25268 | 3792 else if (window_fixed_size_p (o, !NILP (horflag), 0)) |
3793 error ("Attempt to split fixed-size window"); | |
265 | 3794 |
485 | 3795 if (NILP (horflag)) |
265 | 3796 { |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3797 int window_safe_height = window_min_size_2 (o, 0, 0); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3798 |
78415
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
3799 if (size_int < window_safe_height) |
13780
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3800 error ("Window height %d too small (after splitting)", size_int); |
78415
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
3801 if (size_int + window_safe_height > XFASTINT (o->total_lines)) |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
3802 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
|
3803 XFASTINT (o->total_lines) - size_int); |
485 | 3804 if (NILP (o->parent) |
3805 || NILP (XWINDOW (o->parent)->vchild)) | |
265 | 3806 { |
3807 make_dummy_parent (window); | |
3808 new = o->parent; | |
3809 XWINDOW (new)->vchild = window; | |
3810 } | |
3811 } | |
3812 else | |
3813 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3814 int window_safe_width = window_min_size_2 (o, 1, 0); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3815 |
78415
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
3816 if (size_int < window_safe_width) |
13780
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3817 error ("Window width %d too small (after splitting)", size_int); |
78415
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
3818 if (size_int + window_safe_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 |
92192
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
3901 run_window_configuration_change_hook (SELECTED_FRAME ()); |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3902 |
265 | 3903 return Qnil; |
3904 } | |
3905 | |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
3906 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
|
3907 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
|
3908 From program, optional second arg non-nil means shrink sideways arg columns. |
77883
838cb617af0f
(Fshrink_window): Reflow docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
76825
diff
changeset
|
3909 Interactively, if an argument is not given, make the window one line smaller. |
838cb617af0f
(Fshrink_window): Reflow docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
76825
diff
changeset
|
3910 Only 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
|
3911 (arg, side) |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
3912 Lisp_Object arg, side; |
265 | 3913 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3914 CHECK_NUMBER (arg); |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
3915 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
|
3916 |
92192
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
3917 run_window_configuration_change_hook (SELECTED_FRAME ()); |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3918 |
265 | 3919 return Qnil; |
3920 } | |
3921 | |
3922 int | |
3923 window_height (window) | |
3924 Lisp_Object window; | |
3925 { | |
3926 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
|
3927 return WINDOW_TOTAL_LINES (p); |
265 | 3928 } |
3929 | |
3930 int | |
3931 window_width (window) | |
3932 Lisp_Object window; | |
3933 { | |
3934 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
|
3935 return WINDOW_TOTAL_COLS (p); |
265 | 3936 } |
3937 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3938 |
265 | 3939 #define CURBEG(w) \ |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
3940 *(horiz_flag ? &(XWINDOW (w)->left_col) : &(XWINDOW (w)->top_line)) |
265 | 3941 |
3942 #define CURSIZE(w) \ | |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
3943 *(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
|
3944 |
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
3945 |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3946 /* Enlarge WINDOW by DELTA. HORIZ_FLAG nonzero means enlarge it |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3947 horizontally; zero means do it vertically. |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
3948 |
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
3949 Siblings of the selected window are resized to fulfill the size |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3950 request. If they become too small in the process, they may be |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
3951 deleted. */ |
265 | 3952 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
3953 static void |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
3954 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
|
3955 Lisp_Object window; |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
3956 int delta, horiz_flag; |
265 | 3957 { |
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
3958 Lisp_Object parent, next, prev; |
25268 | 3959 struct window *p; |
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
3960 Lisp_Object *sizep; |
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
3961 int maximum; |
20351 | 3962 int (*sizefun) P_ ((Lisp_Object)) |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
3963 = horiz_flag ? window_width : window_height; |
25268 | 3964 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
|
3965 = (horiz_flag ? set_window_width : set_window_height); |
25268 | 3966 |
3967 /* 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
|
3968 if (window_fixed_size_p (XWINDOW (window), horiz_flag, 1)) |
25268 | 3969 error ("Window is not resizable"); |
3970 | |
3971 /* Find the parent of the selected window. */ | |
265 | 3972 while (1) |
3973 { | |
3974 p = XWINDOW (window); | |
3975 parent = p->parent; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3976 |
485 | 3977 if (NILP (parent)) |
265 | 3978 { |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
3979 if (horiz_flag) |
265 | 3980 error ("No other window to side of this one"); |
3981 break; | |
3982 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3983 |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
3984 if (horiz_flag |
25268 | 3985 ? !NILP (XWINDOW (parent)->hchild) |
485 | 3986 : !NILP (XWINDOW (parent)->vchild)) |
265 | 3987 break; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3988 |
265 | 3989 window = parent; |
3990 } | |
3991 | |
1049
25046e48ce9a
* window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents:
1016
diff
changeset
|
3992 sizep = &CURSIZE (window); |
25046e48ce9a
* window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents:
1016
diff
changeset
|
3993 |
265 | 3994 { |
3995 register int maxdelta; | |
3996 | |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
3997 /* 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
|
3998 |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
3999 maxdelta = (!NILP (parent) ? (*sizefun) (parent) - XINT (*sizep) |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4000 /* 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
|
4001 : !NILP (p->next) ? ((*sizefun) (p->next) |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4002 - window_min_size (XWINDOW (p->next), |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4003 horiz_flag, 0, 0, 0)) |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4004 /* 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
|
4005 : !NILP (p->prev) ? ((*sizefun) (p->prev) |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4006 - window_min_size (XWINDOW (p->prev), |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4007 horiz_flag, 0, 0, 0)) |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4008 /* 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
|
4009 or a minibufferless frame. */ |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4010 : (delta = 0)); |
265 | 4011 |
4012 if (delta > maxdelta) | |
4013 /* This case traps trying to make the minibuffer | |
769 | 4014 the full frame, or make the only window aside from the |
4015 minibuffer the full frame. */ | |
265 | 4016 delta = maxdelta; |
7618
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
4017 } |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
4018 |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4019 if (XINT (*sizep) + delta < window_min_size (XWINDOW (window), |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4020 horiz_flag, 0, 0, 0)) |
7618
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
4021 { |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
4022 delete_window (window); |
432 | 4023 return; |
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 |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
4026 if (delta == 0) |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
4027 return; |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
4028 |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
4029 /* 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
|
4030 maximum = 0; |
85330
0bc184c59770
* xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85260
diff
changeset
|
4031 for (next = p->next; WINDOWP (next); next = XWINDOW (next)->next) |
25254 | 4032 maximum += (*sizefun) (next) - window_min_size (XWINDOW (next), |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4033 horiz_flag, 0, 0, 0); |
85330
0bc184c59770
* xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85260
diff
changeset
|
4034 for (prev = p->prev; WINDOWP (prev); prev = XWINDOW (prev)->prev) |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4035 maximum += (*sizefun) (prev) - window_min_size (XWINDOW (prev), |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4036 horiz_flag, 0, 0, 0); |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
4037 |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
4038 /* 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
|
4039 if (delta <= maximum) |
265 | 4040 { |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4041 Lisp_Object first_unaffected; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4042 Lisp_Object first_affected; |
25268 | 4043 int fixed_p; |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4044 |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4045 next = p->next; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4046 prev = p->prev; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4047 first_affected = window; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4048 /* 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
|
4049 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
|
4050 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
|
4051 while (delta != 0 |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4052 && (!NILP (next) || !NILP (prev))) |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4053 { |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4054 if (! NILP (next)) |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4055 { |
25254 | 4056 int this_one = ((*sizefun) (next) |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4057 - window_min_size (XWINDOW (next), horiz_flag, |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4058 0, 0, &fixed_p)); |
25268 | 4059 if (!fixed_p) |
4060 { | |
4061 if (this_one > delta) | |
4062 this_one = delta; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4063 |
25268 | 4064 (*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
|
4065 (*setsizefun) (window, XINT (*sizep) + this_one, 0); |
25268 | 4066 |
4067 delta -= this_one; | |
4068 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4069 |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4070 next = XWINDOW (next)->next; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4071 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4072 |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4073 if (delta == 0) |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4074 break; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4075 |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4076 if (! NILP (prev)) |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4077 { |
25254 | 4078 int this_one = ((*sizefun) (prev) |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4079 - window_min_size (XWINDOW (prev), horiz_flag, |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4080 0, 0, &fixed_p)); |
25268 | 4081 if (!fixed_p) |
4082 { | |
4083 if (this_one > delta) | |
4084 this_one = delta; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4085 |
25268 | 4086 first_affected = prev; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4087 |
25268 | 4088 (*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
|
4089 (*setsizefun) (window, XINT (*sizep) + this_one, 0); |
25268 | 4090 |
4091 delta -= this_one; | |
4092 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4093 |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4094 prev = XWINDOW (prev)->prev; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4095 } |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4096 } |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4097 |
25268 | 4098 xassert (delta == 0); |
4099 | |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4100 /* 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
|
4101 based on the new sizes. */ |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4102 first_unaffected = next; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4103 prev = first_affected; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4104 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
|
4105 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
|
4106 { |
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
4107 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
|
4108 /* 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
|
4109 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
|
4110 (*setsizefun) (next, (*sizefun) (next), 0); |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4111 } |
265 | 4112 } |
4113 else | |
4114 { | |
4115 register int delta1; | |
4116 register int opht = (*sizefun) (parent); | |
4117 | |
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
4118 if (opht <= XINT (*sizep) + delta) |
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4119 { |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4120 /* 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
|
4121 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
|
4122 Lisp_Object start, tem, next; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4123 |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4124 start = XWINDOW (parent)->vchild; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4125 if (NILP (start)) |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4126 start = XWINDOW (parent)->hchild; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4127 |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4128 /* 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
|
4129 tem = XWINDOW (window)->next; |
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4130 while (! NILP (tem)) |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4131 { |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4132 next = XWINDOW (tem)->next; |
42862
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4133 delete_window (tem); |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4134 tem = next; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4135 } |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4136 |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4137 /* 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
|
4138 Note that if START is not WINDOW, then WINDOW still |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4139 has siblings, so WINDOW has not yet replaced its parent. */ |
42862
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4140 tem = start; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4141 while (! EQ (tem, window)) |
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 next = XWINDOW (tem)->next; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4144 delete_window (tem); |
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4145 tem = next; |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4146 } |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4147 } |
265 | 4148 else |
25268 | 4149 { |
4150 /* Otherwise, make delta1 just right so that if we add | |
4151 delta1 lines to this window and to the parent, and then | |
4152 shrink the parent back to its original size, the new | |
4153 proportional size of this window will increase by delta. | |
4154 | |
4155 The function size_window will compute the new height h' | |
4156 of the window from delta1 as: | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4157 |
25268 | 4158 e = delta1/n |
4159 x = delta1 - delta1/n * n for the 1st resizable child | |
4160 h' = h + e + x | |
4161 | |
4162 where n is the number of children that can be resized. | |
4163 We can ignore x by choosing a delta1 that is a multiple of | |
4164 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
|
4165 |
25268 | 4166 h' = h + delta |
4167 | |
4168 So, delta1 must be | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4169 |
25268 | 4170 h + e = h + delta |
4171 delta1/n = delta | |
4172 delta1 = n * delta. | |
4173 | |
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
4174 The number of children n equals the number of resizable |
25268 | 4175 children of this window + 1 because we know window itself |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4176 is resizable (otherwise we would have signalled an error). |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4177 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4178 This reasoning is not correct when other windows become too |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4179 small and shrink_windows refuses to delete them. Below we |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4180 use resize_proportionally to work around this problem. */ |
25268 | 4181 |
4182 struct window *w = XWINDOW (window); | |
4183 Lisp_Object s; | |
4184 int n = 1; | |
4185 | |
85330
0bc184c59770
* xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85260
diff
changeset
|
4186 for (s = w->next; WINDOWP (s); s = XWINDOW (s)->next) |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
4187 if (!window_fixed_size_p (XWINDOW (s), horiz_flag, 0)) |
25268 | 4188 ++n; |
85330
0bc184c59770
* xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85260
diff
changeset
|
4189 for (s = w->prev; WINDOWP (s); s = XWINDOW (s)->prev) |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
4190 if (!window_fixed_size_p (XWINDOW (s), horiz_flag, 0)) |
25268 | 4191 ++n; |
4192 | |
4193 delta1 = n * delta; | |
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4194 |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4195 /* 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
|
4196 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
|
4197 XSETINT (CURSIZE (parent), opht + delta1); |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4198 (*setsizefun) (window, XINT (*sizep) + delta1, 0); |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4199 |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4200 /* Squeeze out delta1 lines or columns from our parent, |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4201 shrinking this window and siblings proportionately. This |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4202 brings parent back to correct size. Delta1 was calculated |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4203 so this makes this window the desired size, taking it all |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4204 out of the siblings. |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4205 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4206 Temporarily set resize_proportionally to Qt to assure that, |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4207 if necessary, shrink_windows deletes smaller windows rather |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4208 than shrink this window. */ |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4209 w->resize_proportionally = Qt; |
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4210 (*setsizefun) (parent, opht, 0); |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4211 w->resize_proportionally = Qnil; |
25268 | 4212 } |
265 | 4213 } |
4214 | |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
4215 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
|
4216 XSETFASTINT (p->last_overlay_modified, 0); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4217 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4218 /* Adjust glyph matrices. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4219 adjust_glyphs (XFRAME (WINDOW_FRAME (XWINDOW (window)))); |
265 | 4220 } |
25254 | 4221 |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4222 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4223 /* 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
|
4224 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
|
4225 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
|
4226 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4227 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
|
4228 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
|
4229 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
|
4230 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4231 static void |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4232 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
|
4233 Lisp_Object window; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4234 int delta, horiz_flag; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4235 { |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4236 Lisp_Object parent, child; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4237 struct window *p; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4238 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
|
4239 int delcount = window_deletion_count; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4240 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4241 CHECK_WINDOW (window); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4242 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4243 /* 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
|
4244 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
|
4245 error ("Window is not resizable"); |
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 while (1) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4248 { |
70081
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4249 Lisp_Object first_parallel = Qnil; |
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4250 |
71339
0c8a94363573
(adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents:
71286
diff
changeset
|
4251 if (NILP (window)) |
0c8a94363573
(adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents:
71286
diff
changeset
|
4252 { |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
4253 /* This happens if WINDOW on the previous iteration was |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
4254 at top level of the window tree. */ |
71339
0c8a94363573
(adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents:
71286
diff
changeset
|
4255 Fset_window_configuration (old_config); |
0c8a94363573
(adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents:
71286
diff
changeset
|
4256 error ("Specified window edge is fixed"); |
0c8a94363573
(adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents:
71286
diff
changeset
|
4257 } |
0c8a94363573
(adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents:
71286
diff
changeset
|
4258 |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4259 p = XWINDOW (window); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4260 parent = p->parent; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4261 |
70081
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4262 /* See if this level has windows in parallel in the specified |
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4263 direction. If so, set FIRST_PARALLEL to the first one. */ |
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4264 if (horiz_flag) |
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4265 { |
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4266 if (! NILP (parent) && !NILP (XWINDOW (parent)->vchild)) |
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4267 first_parallel = XWINDOW (parent)->vchild; |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
4268 else if (NILP (parent) && !NILP (p->next)) |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
4269 { |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
4270 /* Handle the vertical chain of main window and minibuffer |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
4271 which has no parent. */ |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
4272 first_parallel = window; |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
4273 while (! NILP (XWINDOW (first_parallel)->prev)) |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
4274 first_parallel = XWINDOW (first_parallel)->prev; |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
4275 } |
70081
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4276 } |
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4277 else |
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4278 { |
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4279 if (! NILP (parent) && !NILP (XWINDOW (parent)->hchild)) |
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4280 first_parallel = XWINDOW (parent)->hchild; |
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4281 } |
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4282 |
71339
0c8a94363573
(adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents:
71286
diff
changeset
|
4283 /* If this level's succession is in the desired dimension, |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
4284 and this window is the last one, and there is no higher level, |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
4285 its trailing edge is fixed. */ |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
4286 if (NILP (XWINDOW (window)->next) && NILP (first_parallel) |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
4287 && NILP (parent)) |
71339
0c8a94363573
(adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents:
71286
diff
changeset
|
4288 { |
0c8a94363573
(adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents:
71286
diff
changeset
|
4289 Fset_window_configuration (old_config); |
0c8a94363573
(adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents:
71286
diff
changeset
|
4290 error ("Specified window edge is fixed"); |
0c8a94363573
(adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents:
71286
diff
changeset
|
4291 } |
0c8a94363573
(adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents:
71286
diff
changeset
|
4292 |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4293 /* Don't make this window too small. */ |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4294 if (XINT (CURSIZE (window)) + delta |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4295 < window_min_size_2 (XWINDOW (window), horiz_flag, 0)) |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4296 { |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4297 Fset_window_configuration (old_config); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4298 error ("Cannot adjust window size as specified"); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4299 } |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4300 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4301 /* Clear out some redisplay caches. */ |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4302 XSETFASTINT (p->last_modified, 0); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4303 XSETFASTINT (p->last_overlay_modified, 0); |
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 /* Adjust this window's edge. */ |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4306 XSETINT (CURSIZE (window), |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4307 XINT (CURSIZE (window)) + delta); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4308 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4309 /* If this window has following siblings in the desired dimension, |
70081
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4310 make them smaller, and exit the loop. |
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4311 |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4312 (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
|
4313 we will fail and report an error, above.) */ |
70081
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4314 if (NILP (first_parallel)) |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4315 { |
71339
0c8a94363573
(adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents:
71286
diff
changeset
|
4316 if (!NILP (p->next)) |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4317 { |
68724
fb5a31085a6f
* window.c (adjust_window_trailing_edge): Check that shrinking
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
4318 /* 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
|
4319 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
|
4320 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
|
4321 { |
fb5a31085a6f
* window.c (adjust_window_trailing_edge): Check that shrinking
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
4322 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
|
4323 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
|
4324 } |
fb5a31085a6f
* window.c (adjust_window_trailing_edge): Check that shrinking
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
4325 |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4326 XSETINT (CURBEG (p->next), |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4327 XINT (CURBEG (p->next)) + delta); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4328 size_window (p->next, XINT (CURSIZE (p->next)) - delta, |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
4329 horiz_flag, 0, 1, 0); |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4330 break; |
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 } |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4333 else |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4334 /* 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
|
4335 Change the size of the other siblings. */ |
70081
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4336 for (child = first_parallel; |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4337 ! NILP (child); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4338 child = XWINDOW (child)->next) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4339 if (! EQ (child, window)) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4340 size_window (child, XINT (CURSIZE (child)) + delta, |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
4341 horiz_flag, 0, 0, 1); |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4342 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4343 window = parent; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4344 } |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4345 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4346 /* 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
|
4347 we failed. Report failure. */ |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4348 if (delcount != window_deletion_count) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4349 { |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4350 Fset_window_configuration (old_config); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4351 error ("Cannot adjust window size as specified"); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4352 } |
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 /* Adjust glyph matrices. */ |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4355 adjust_glyphs (XFRAME (WINDOW_FRAME (XWINDOW (window)))); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4356 } |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4357 |
265 | 4358 #undef CURBEG |
4359 #undef CURSIZE | |
4360 | |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4361 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
|
4362 Sadjust_window_trailing_edge, 3, 3, 0, |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4363 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
|
4364 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
|
4365 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
|
4366 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4367 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
|
4368 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
|
4369 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
|
4370 (window, delta, horizontal) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4371 Lisp_Object window, delta, horizontal; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4372 { |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4373 CHECK_NUMBER (delta); |
92192
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
4374 if (NILP (window)) |
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
4375 window = selected_window; |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4376 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
|
4377 |
92192
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
4378 run_window_configuration_change_hook |
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
4379 (XFRAME (WINDOW_FRAME (XWINDOW (window)))); |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4380 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4381 return Qnil; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4382 } |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4383 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4384 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4385 |
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 Resizing Mini-Windows |
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 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4390 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
|
4391 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4392 enum save_restore_action |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4393 { |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4394 CHECK_ORIG_SIZES, |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4395 SAVE_ORIG_SIZES, |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4396 RESTORE_ORIG_SIZES |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4397 }; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4398 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4399 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
|
4400 enum save_restore_action)); |
25792
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 /* 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
|
4403 from lowest windows first. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4404 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4405 static void |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4406 shrink_window_lowest_first (w, height) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4407 struct window *w; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4408 int height; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4409 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4410 struct window *c; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4411 Lisp_Object child; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4412 int old_height; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4413 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4414 xassert (!MINI_WINDOW_P (w)); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4415 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4416 /* Set redisplay hints. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4417 XSETFASTINT (w->last_modified, 0); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4418 XSETFASTINT (w->last_overlay_modified, 0); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4419 windows_or_buffers_changed++; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4420 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
|
4421 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4422 old_height = XFASTINT (w->total_lines); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4423 XSETFASTINT (w->total_lines, height); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4424 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4425 if (!NILP (w->hchild)) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4426 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4427 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
|
4428 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4429 c = XWINDOW (child); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4430 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
|
4431 shrink_window_lowest_first (c, height); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4432 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4433 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4434 else if (!NILP (w->vchild)) |
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 Lisp_Object last_child; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4437 int delta = old_height - height; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4438 int last_top; |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
4439 |
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
4440 last_child = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4441 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4442 /* 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
|
4443 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
|
4444 backwards. */ |
85330
0bc184c59770
* xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85260
diff
changeset
|
4445 for (child = w->vchild; WINDOWP (child); child = XWINDOW (child)->next) |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4446 last_child = child; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4447 |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4448 /* Size children down to their safe heights. */ |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4449 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
|
4450 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4451 int this_one; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4452 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4453 c = XWINDOW (child); |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4454 this_one = XFASTINT (c->total_lines) - window_min_size_1 (c, 0, 1); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4455 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4456 if (this_one > delta) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4457 this_one = delta; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4458 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4459 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
|
4460 delta -= this_one; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4461 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4462 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4463 /* Compute new positions. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4464 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
|
4465 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
|
4466 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4467 c = XWINDOW (child); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4468 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
|
4469 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
|
4470 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
|
4471 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4472 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4473 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4474 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4475 |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4476 /* 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
|
4477 rooted at W. ACTION says what to do. |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4478 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4479 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
|
4480 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
|
4481 tree. Value is non-zero if they are valid. |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4482 |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4483 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
|
4484 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
|
4485 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4486 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
|
4487 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
|
4488 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4489 static int |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4490 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
|
4491 struct window *w; |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4492 enum save_restore_action action; |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4493 { |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4494 int success_p = 1; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4495 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4496 while (w) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4497 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4498 if (!NILP (w->hchild)) |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4499 { |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4500 if (!save_restore_orig_size (XWINDOW (w->hchild), action)) |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4501 success_p = 0; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4502 } |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4503 else if (!NILP (w->vchild)) |
26046
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 if (!save_restore_orig_size (XWINDOW (w->vchild), action)) |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4506 success_p = 0; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4507 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4508 |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4509 switch (action) |
25792
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 case CHECK_ORIG_SIZES: |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4512 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
|
4513 return 0; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4514 break; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4515 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4516 case SAVE_ORIG_SIZES: |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4517 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
|
4518 w->orig_total_lines = w->total_lines; |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4519 XSETFASTINT (w->last_modified, 0); |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4520 XSETFASTINT (w->last_overlay_modified, 0); |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4521 break; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4522 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4523 case RESTORE_ORIG_SIZES: |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4524 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
|
4525 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
|
4526 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
|
4527 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
|
4528 XSETFASTINT (w->last_modified, 0); |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4529 XSETFASTINT (w->last_overlay_modified, 0); |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4530 break; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4531 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4532 default: |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4533 abort (); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4534 } |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4535 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4536 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
|
4537 } |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4538 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4539 return success_p; |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4540 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4541 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4542 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4543 /* 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
|
4544 without deleting other windows. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4545 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4546 void |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4547 grow_mini_window (w, delta) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4548 struct window *w; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4549 int delta; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4550 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4551 struct frame *f = XFRAME (w->frame); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4552 struct window *root; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4553 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4554 xassert (MINI_WINDOW_P (w)); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4555 xassert (delta >= 0); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4556 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4557 /* 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
|
4558 other windows. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4559 root = XWINDOW (FRAME_ROOT_WINDOW (f)); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4560 if (delta) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4561 { |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4562 int min_height = window_min_size (root, 0, 0, 0, 0); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4563 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
|
4564 /* 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
|
4565 min_height. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4566 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
|
4567 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4568 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4569 if (delta) |
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 /* 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
|
4572 if (!save_restore_orig_size (root, CHECK_ORIG_SIZES)) |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4573 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
|
4574 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4575 /* Shrink other windows. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4576 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
|
4577 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4578 /* Grow the mini-window. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4579 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
|
4580 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
|
4581 XSETFASTINT (w->last_modified, 0); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4582 XSETFASTINT (w->last_overlay_modified, 0); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4583 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4584 adjust_glyphs (f); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4585 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4586 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4587 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4588 |
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
4589 /* 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
|
4590 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
|
4591 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
|
4592 line. */ |
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 void |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4595 shrink_mini_window (w) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4596 struct window *w; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4597 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4598 struct frame *f = XFRAME (w->frame); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4599 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
|
4600 |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4601 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
|
4602 { |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4603 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
|
4604 adjust_glyphs (f); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4605 FRAME_WINDOW_SIZES_CHANGED (f) = 1; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4606 windows_or_buffers_changed = 1; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4607 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4608 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
|
4609 { |
35621
5f154b8fc2bd
(size_window): Set the window's orig_top to nil when
Gerd Moellmann <gerd@gnu.org>
parents:
35483
diff
changeset
|
4610 /* 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
|
4611 among the other windows. */ |
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
4612 Lisp_Object window; |
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
4613 XSETWINDOW (window, w); |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4614 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
|
4615 } |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4616 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4617 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4618 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4619 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4620 /* 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
|
4621 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
|
4622 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
|
4623 the frame are cleared. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4624 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4625 void |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4626 mark_window_cursors_off (w) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4627 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4628 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4629 while (w) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4630 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4631 if (!NILP (w->hchild)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4632 mark_window_cursors_off (XWINDOW (w->hchild)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4633 else if (!NILP (w->vchild)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4634 mark_window_cursors_off (XWINDOW (w->vchild)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4635 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4636 w->phys_cursor_on_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4637 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4638 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4639 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4640 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4641 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4642 |
37270
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4643 /* Return number of lines of text (not counting mode lines) in W. */ |
265 | 4644 |
4645 int | |
4646 window_internal_height (w) | |
4647 struct window *w; | |
4648 { | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4649 int ht = XFASTINT (w->total_lines); |
265 | 4650 |
37270
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4651 if (!MINI_WINDOW_P (w)) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4652 { |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4653 if (!NILP (w->parent) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4654 || !NILP (w->vchild) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4655 || !NILP (w->hchild) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4656 || !NILP (w->next) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4657 || !NILP (w->prev) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4658 || WINDOW_WANTS_MODELINE_P (w)) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4659 --ht; |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4660 |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4661 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
|
4662 --ht; |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4663 } |
265 | 4664 |
4665 return ht; | |
4666 } | |
4667 | |
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4668 |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4669 /* 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
|
4670 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
|
4671 separating W from the sibling to its right. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4672 |
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4673 int |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4674 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
|
4675 struct window *w; |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4676 { |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4677 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
|
4678 int width = XINT (w->total_cols); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4679 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4680 if (WINDOW_HAS_VERTICAL_SCROLL_BAR (w)) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4681 /* 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
|
4682 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
|
4683 else if (!FRAME_WINDOW_P (f) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4684 && !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
|
4685 /* The column of `|' characters separating side-by-side windows |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4686 occupies one column only. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4687 width -= 1; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4688 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4689 if (FRAME_WINDOW_P (f)) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4690 /* 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
|
4691 used for normal text. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4692 width -= (WINDOW_FRINGE_COLS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4693 + WINDOW_LEFT_MARGIN_COLS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4694 + 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
|
4695 |
701db778b7a4
(Fwindow_edges): Use new WINDOW_RIGHT_EDGE macro.
Richard M. Stallman <rms@gnu.org>
parents:
16208
diff
changeset
|
4696 return width; |
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4697 } |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4698 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4699 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4700 /************************************************************************ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4701 Window Scrolling |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4702 ***********************************************************************/ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4703 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4704 /* 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
|
4705 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
|
4706 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
|
4707 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
|
4708 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
|
4709 respectively. */ |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4710 |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4711 static void |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4712 window_scroll (window, n, whole, noerror) |
265 | 4713 Lisp_Object window; |
4714 int n; | |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4715 int whole; |
522 | 4716 int noerror; |
265 | 4717 { |
47865
22b1643144e9
(window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents:
47567
diff
changeset
|
4718 immediate_quit = 1; |
22b1643144e9
(window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents:
47567
diff
changeset
|
4719 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4720 /* 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
|
4721 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
|
4722 if (FRAME_WINDOW_P (XFRAME (XWINDOW (window)->frame))) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4723 window_scroll_pixel_based (window, n, whole, noerror); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4724 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4725 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
|
4726 |
22b1643144e9
(window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents:
47567
diff
changeset
|
4727 immediate_quit = 0; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4728 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4729 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4730 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4731 /* 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
|
4732 heights. See the comment of window_scroll for parameter |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4733 descriptions. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4734 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4735 static void |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4736 window_scroll_pixel_based (window, n, whole, noerror) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4737 Lisp_Object window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4738 int n; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4739 int whole; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4740 int noerror; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4741 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4742 struct it it; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4743 struct window *w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4744 struct text_pos start; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4745 int this_scroll_margin; |
95550
e057f981a6b5
(Fset_window_parameter): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
95547
diff
changeset
|
4746 /* True if we fiddled the window vscroll field without really scrolling. */ |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4747 int vscrolled = 0; |
72663
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4748 int x, y, rtop, rbot, rowh, vpos; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4749 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4750 SET_TEXT_POS_FROM_MARKER (start, w->start); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4751 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4752 /* 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
|
4753 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
|
4754 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
|
4755 the partially visible one would recenter. */ |
72663
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4756 |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4757 if (!pos_visible_p (w, PT, &x, &y, &rtop, &rbot, &rowh, &vpos)) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4758 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4759 /* 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
|
4760 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
|
4761 results for variable height lines. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4762 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
|
4763 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
|
4764 move_it_vertically_backward (&it, window_box_height (w) / 2); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4765 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4766 /* 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
|
4767 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
|
4768 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
|
4769 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
|
4770 start of the line containing PT in this case. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4771 if (it.current_y <= 0) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4772 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4773 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
|
4774 move_it_vertically_backward (&it, 0); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4775 it.current_y = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4776 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4777 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4778 start = it.current.pos; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4779 } |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4780 else if (auto_window_vscroll_p) |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4781 { |
72663
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4782 if (rtop || rbot) /* partially visible */ |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4783 { |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4784 int px; |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4785 int dy = WINDOW_FRAME_LINE_HEIGHT (w); |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4786 if (whole) |
59717
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4787 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
|
4788 - 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
|
4789 dy); |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4790 dy *= n; |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4791 |
72663
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4792 if (n < 0) |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4793 { |
72663
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4794 /* Only vscroll backwards if already vscrolled forwards. */ |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4795 if (w->vscroll < 0 && rtop > 0) |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4796 { |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4797 px = max (0, -w->vscroll - min (rtop, -dy)); |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4798 Fset_window_vscroll (window, make_number (px), Qt); |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4799 return; |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4800 } |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4801 } |
72663
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4802 if (n > 0) |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4803 { |
72663
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4804 /* Do vscroll if already vscrolled or only display line. */ |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4805 if (rbot > 0 && (w->vscroll < 0 || vpos == 0)) |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4806 { |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4807 px = max (0, -w->vscroll + min (rbot, dy)); |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4808 Fset_window_vscroll (window, make_number (px), Qt); |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4809 return; |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4810 } |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4811 |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4812 /* Maybe modify window start instead of scrolling. */ |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4813 if (rbot > 0 || w->vscroll < 0) |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4814 { |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4815 int spos; |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4816 |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4817 Fset_window_vscroll (window, make_number (0), Qt); |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4818 /* If there are other text lines above the current row, |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4819 move window start to current row. Else to next row. */ |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4820 if (rbot > 0) |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4821 spos = XINT (Fline_beginning_position (Qnil)); |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4822 else |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4823 spos = min (XINT (Fline_end_position (Qnil)) + 1, ZV); |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4824 set_marker_restricted (w->start, make_number (spos), |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4825 w->buffer); |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4826 w->start_at_line_beg = Qt; |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4827 w->update_mode_line = Qt; |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4828 XSETFASTINT (w->last_modified, 0); |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4829 XSETFASTINT (w->last_overlay_modified, 0); |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4830 /* Set force_start so that redisplay_window will run the |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4831 window-scroll-functions. */ |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4832 w->force_start = Qt; |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4833 return; |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4834 } |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4835 } |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4836 } |
72663
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4837 /* Cancel previous vscroll. */ |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4838 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
|
4839 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4840 |
58083 | 4841 /* 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
|
4842 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
|
4843 if (!NILP (Vscroll_preserve_screen_position)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4844 { |
69209
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
4845 /* We preserve the goal pixel coordinate across consecutive |
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
4846 calls to scroll-up or scroll-down. This avoids the |
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
4847 possibility of point becoming "stuck" on a tall line when |
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
4848 scrolling by one line. */ |
69408
aa89c5390b12
Rename preserve_y to window_scroll_pixel_based_preserve_y.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69342
diff
changeset
|
4849 if (window_scroll_pixel_based_preserve_y < 0 |
69606
40a0e06dc5aa
(window_scroll_pixel_based): Yet another int/Lisp_Object mixup (YAILOM).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69408
diff
changeset
|
4850 || (!EQ (current_kboard->Vlast_command, Qscroll_up) |
40a0e06dc5aa
(window_scroll_pixel_based): Yet another int/Lisp_Object mixup (YAILOM).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69408
diff
changeset
|
4851 && !EQ (current_kboard->Vlast_command, Qscroll_down))) |
69209
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
4852 { |
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
4853 start_display (&it, w, start); |
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
4854 move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS); |
69408
aa89c5390b12
Rename preserve_y to window_scroll_pixel_based_preserve_y.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69342
diff
changeset
|
4855 window_scroll_pixel_based_preserve_y = it.current_y; |
95566
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
4856 window_scroll_pixel_based_preserve_x = it.current_x; |
69209
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
4857 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4858 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4859 else |
95566
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
4860 window_scroll_pixel_based_preserve_y |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
4861 = window_scroll_pixel_based_preserve_x = -1; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4862 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4863 /* 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
|
4864 backward. The result is the new window start. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4865 start_display (&it, w, start); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4866 if (whole) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4867 { |
59717
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4868 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
|
4869 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
|
4870 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
|
4871 - 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
|
4872 dy) * n; |
34717
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4873 |
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4874 /* 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
|
4875 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
|
4876 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
|
4877 if (dy <= 0) |
59717
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4878 { |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4879 move_it_vertically_backward (&it, -dy); |
72663
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4880 /* Ensure we actually do move, e.g. in case we are currently |
59717
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4881 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
|
4882 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
|
4883 && start_pos > BEGV) |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4884 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
|
4885 } |
34717
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4886 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
|
4887 { |
75b50deae4e9
(window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents:
59677
diff
changeset
|
4888 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
|
4889 MOVE_TO_POS | MOVE_TO_Y); |
72663
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4890 /* Ensure we actually do move, e.g. in case we are currently |
59695
75b50deae4e9
(window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents:
59677
diff
changeset
|
4891 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
|
4892 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
|
4893 && start_pos < ZV) |
75b50deae4e9
(window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents:
59677
diff
changeset
|
4894 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
|
4895 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4896 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4897 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4898 move_it_by_lines (&it, n, 1); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4899 |
49011
594a08370cb3
(window_scroll_pixel_based): Partially undo last change.
Richard M. Stallman <rms@gnu.org>
parents:
48945
diff
changeset
|
4900 /* 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
|
4901 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
|
4902 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
|
4903 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
|
4904 || (n < 0 && IT_CHARPOS (it) == CHARPOS (start))) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4905 { |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4906 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
|
4907 { |
48945
a96801f68a82
(window_scroll_pixel_based): Fix check for reaching BEGV.
Richard M. Stallman <rms@gnu.org>
parents:
48927
diff
changeset
|
4908 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
|
4909 && (it.current_y + it.max_ascent + it.max_descent |
70058
12c8842436ef
(window_loop): Test w->dedicated with !NILP instead of EQ Qt.
Kim F. Storm <storm@cua.dk>
parents:
70042
diff
changeset
|
4910 > it.last_visible_y)) |
35126
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4911 { |
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4912 /* 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
|
4913 visible. */ |
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4914 w->vscroll = (it.last_visible_y |
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4915 - 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
|
4916 adjust_glyphs (it.f); |
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4917 } |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4918 else if (noerror) |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4919 return; |
71286
1d2d52a04520
(window_scroll_pixel_based): Signal "Beginning of buffer" when scroll-down
Eli Zaretskii <eliz@gnu.org>
parents:
71146
diff
changeset
|
4920 else if (n < 0) /* could happen with empty buffers */ |
71991
2cbe7a01a491
(window_scroll_pixel_based, window_scroll_line_based):
Kim F. Storm <storm@cua.dk>
parents:
71844
diff
changeset
|
4921 xsignal0 (Qbeginning_of_buffer); |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4922 else |
71991
2cbe7a01a491
(window_scroll_pixel_based, window_scroll_line_based):
Kim F. Storm <storm@cua.dk>
parents:
71844
diff
changeset
|
4923 xsignal0 (Qend_of_buffer); |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4924 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4925 else |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4926 { |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4927 if (w->vscroll != 0) |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4928 /* 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
|
4929 visible. */ |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4930 w->vscroll = 0; |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4931 else if (noerror) |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4932 return; |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4933 else |
71991
2cbe7a01a491
(window_scroll_pixel_based, window_scroll_line_based):
Kim F. Storm <storm@cua.dk>
parents:
71844
diff
changeset
|
4934 xsignal0 (Qbeginning_of_buffer); |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4935 } |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4936 |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4937 /* 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
|
4938 |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4939 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
|
4940 |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4941 /* 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
|
4942 vscrolled = 1; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4943 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4944 |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4945 if (! vscrolled) |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4946 { |
45562
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
4947 int pos = IT_CHARPOS (it); |
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
4948 int bytepos; |
49836
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4949 |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4950 /* 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
|
4951 the next character. */ |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4952 if (in_display_vector_p (&it)) |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4953 { |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4954 ++pos; |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4955 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
|
4956 } |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
4957 |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4958 /* 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
|
4959 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
|
4960 w->buffer); |
45562
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
4961 bytepos = XMARKER (w->start)->bytepos; |
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
4962 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
|
4963 ? Qt : Qnil); |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4964 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
|
4965 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
|
4966 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
|
4967 /* 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
|
4968 window-scroll-functions. */ |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4969 w->force_start = Qt; |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4970 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4971 |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
4972 /* 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
|
4973 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
|
4974 it.current_y = it.vpos = 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4975 |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4976 /* Move PT out of scroll margins. |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4977 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
|
4978 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
|
4979 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
|
4980 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
|
4981 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
|
4982 |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4983 if (n > 0) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4984 { |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
4985 /* 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
|
4986 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
|
4987 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
|
4988 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
|
4989 && (NILP (Vscroll_preserve_screen_position) |
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
4990 || 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
|
4991 /* 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
|
4992 ; |
69408
aa89c5390b12
Rename preserve_y to window_scroll_pixel_based_preserve_y.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69342
diff
changeset
|
4993 else if (window_scroll_pixel_based_preserve_y >= 0) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4994 { |
59342
132e8f3a36a1
(window_scroll_pixel_based): Don't correct preserve_y
Richard M. Stallman <rms@gnu.org>
parents:
59258
diff
changeset
|
4995 /* 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
|
4996 This is necessary because we set it.current_y to 0, above. */ |
95566
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
4997 move_it_to (&it, -1, |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
4998 window_scroll_pixel_based_preserve_x, |
69408
aa89c5390b12
Rename preserve_y to window_scroll_pixel_based_preserve_y.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69342
diff
changeset
|
4999 window_scroll_pixel_based_preserve_y |
aa89c5390b12
Rename preserve_y to window_scroll_pixel_based_preserve_y.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69342
diff
changeset
|
5000 - (WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0 ), |
95566
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5001 -1, MOVE_TO_Y | MOVE_TO_X); |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5002 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
|
5003 } |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5004 else |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5005 { |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5006 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
|
5007 { |
6bcf9f9c10df
(window_scroll_pixel_based): Exit the move_it_by_lines
Richard M. Stallman <rms@gnu.org>
parents:
44155
diff
changeset
|
5008 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
|
5009 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
|
5010 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
|
5011 break; |
6bcf9f9c10df
(window_scroll_pixel_based): Exit the move_it_by_lines
Richard M. Stallman <rms@gnu.org>
parents:
44155
diff
changeset
|
5012 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5013 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5014 } |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5015 } |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5016 else if (n < 0) |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5017 { |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5018 int charpos, bytepos; |
60198
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
5019 int partial_p; |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5020 |
69408
aa89c5390b12
Rename preserve_y to window_scroll_pixel_based_preserve_y.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69342
diff
changeset
|
5021 /* Save our position, for the |
aa89c5390b12
Rename preserve_y to window_scroll_pixel_based_preserve_y.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69342
diff
changeset
|
5022 window_scroll_pixel_based_preserve_y case. */ |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5023 charpos = IT_CHARPOS (it); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5024 bytepos = IT_BYTEPOS (it); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5025 |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5026 /* 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
|
5027 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
|
5028 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
|
5029 (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
|
5030 - 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
|
5031 -1, |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5032 MOVE_TO_POS | MOVE_TO_Y); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5033 |
60198
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
5034 /* 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
|
5035 charpos = IT_CHARPOS (it); |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
5036 bytepos = IT_BYTEPOS (it); |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
5037 |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
5038 /* 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
|
5039 if (it.what == IT_EOB) |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
5040 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
|
5041 else |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
5042 { |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
5043 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
|
5044 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
|
5045 } |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
5046 |
63865
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
5047 if (charpos == PT && !partial_p |
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
5048 && (NILP (Vscroll_preserve_screen_position) |
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
5049 || 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
|
5050 /* 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
|
5051 ; |
69408
aa89c5390b12
Rename preserve_y to window_scroll_pixel_based_preserve_y.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69342
diff
changeset
|
5052 else if (window_scroll_pixel_based_preserve_y >= 0) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5053 { |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5054 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
|
5055 start_display (&it, w, start); |
69209
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
5056 /* It would be wrong to subtract CURRENT_HEADER_LINE_HEIGHT |
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
5057 here because we called start_display again and did not |
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
5058 alter it.current_y this time. */ |
95566
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5059 move_it_to (&it, -1, window_scroll_pixel_based_preserve_x, |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5060 window_scroll_pixel_based_preserve_y, -1, |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5061 MOVE_TO_Y | MOVE_TO_X); |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5062 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
|
5063 } |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5064 else |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5065 { |
60198
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
5066 if (partial_p) |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5067 /* 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
|
5068 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
|
5069 { |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5070 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
|
5071 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
|
5072 } |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5073 else |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5074 /* 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
|
5075 SET_PT_BOTH (charpos, bytepos); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5076 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5077 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5078 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5079 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5080 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5081 /* 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
|
5082 See the comment of window_scroll for parameter descriptions. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5083 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5084 static void |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5085 window_scroll_line_based (window, n, whole, noerror) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5086 Lisp_Object window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5087 int n; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5088 int whole; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5089 int noerror; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5090 { |
265 | 5091 register struct window *w = XWINDOW (window); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5092 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
|
5093 register int pos, pos_byte; |
265 | 5094 register int ht = window_internal_height (w); |
5095 register Lisp_Object tem; | |
5096 int lose; | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5097 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
|
5098 int startpos; |
95566
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5099 Lisp_Object original_pos = Qnil; |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5100 |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5101 /* 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
|
5102 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
|
5103 if (whole) |
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5104 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
|
5105 |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5106 startpos = marker_position (w->start); |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5107 |
95566
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5108 if (!NILP (Vscroll_preserve_screen_position)) |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5109 { |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5110 if (window_scroll_preserve_vpos <= 0 |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5111 || (!EQ (current_kboard->Vlast_command, Qscroll_up) |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5112 && !EQ (current_kboard->Vlast_command, Qscroll_down))) |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5113 { |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5114 struct position posit |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5115 = *compute_motion (startpos, 0, 0, 0, |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5116 PT, ht, 0, |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5117 -1, XINT (w->hscroll), |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5118 0, w); |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5119 window_scroll_preserve_vpos = posit.vpos; |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5120 window_scroll_preserve_hpos = posit.hpos + XINT (w->hscroll); |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5121 } |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5122 |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5123 original_pos = Fcons (make_number (window_scroll_preserve_hpos), |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5124 make_number (window_scroll_preserve_vpos)); |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5125 } |
13102
960db92441d8
(window_scroll): Always set force_start.
Richard M. Stallman <rms@gnu.org>
parents:
12981
diff
changeset
|
5126 |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
5127 XSETFASTINT (tem, PT); |
32773
a7fdbf39d4de
(window_scroll_pixel_based, window_scroll_line_based):
Miles Bader <miles@gnu.org>
parents:
32752
diff
changeset
|
5128 tem = Fpos_visible_in_window_p (tem, window, Qnil); |
265 | 5129 |
485 | 5130 if (NILP (tem)) |
265 | 5131 { |
6341
dfc758dd2b08
(window_scroll, Fmove_to_window_line): Avoid dividing negative numbers,
Karl Heuer <kwzh@gnu.org>
parents:
6326
diff
changeset
|
5132 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
|
5133 startpos = PT; |
265 | 5134 } |
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
|
5135 |
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
|
5136 SET_PT (startpos); |
7347 | 5137 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
|
5138 Fvertical_motion (make_number (n), window); |
7347 | 5139 pos = PT; |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5140 pos_byte = PT_BYTE; |
265 | 5141 bolp = Fbolp (); |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5142 SET_PT_BOTH (opoint, opoint_byte); |
265 | 5143 |
5144 if (lose) | |
522 | 5145 { |
5146 if (noerror) | |
5147 return; | |
5148 else | |
71991
2cbe7a01a491
(window_scroll_pixel_based, window_scroll_line_based):
Kim F. Storm <storm@cua.dk>
parents:
71844
diff
changeset
|
5149 xsignal0 (Qbeginning_of_buffer); |
522 | 5150 } |
265 | 5151 |
5152 if (pos < ZV) | |
5153 { | |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5154 int this_scroll_margin = scroll_margin; |
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5155 |
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5156 /* 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
|
5157 if (this_scroll_margin < 0) |
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5158 this_scroll_margin = 0; |
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5159 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5160 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
|
5161 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
|
5162 |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5163 set_marker_restricted_both (w->start, w->buffer, pos, pos_byte); |
265 | 5164 w->start_at_line_beg = bolp; |
5165 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
|
5166 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
|
5167 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
|
5168 /* 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
|
5169 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
|
5170 w->force_start = Qt; |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5171 |
63865
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
5172 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
|
5173 && (whole || !EQ (Vscroll_preserve_screen_position, Qt))) |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5174 { |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5175 SET_PT_BOTH (pos, pos_byte); |
95566
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5176 Fvertical_motion (original_pos, window); |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5177 } |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5178 /* 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
|
5179 that it is outside the scroll margin. */ |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5180 else if (n > 0) |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5181 { |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5182 int top_margin; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5183 |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5184 if (this_scroll_margin > 0) |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5185 { |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5186 SET_PT_BOTH (pos, pos_byte); |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5187 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
|
5188 top_margin = PT; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5189 } |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5190 else |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5191 top_margin = pos; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5192 |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5193 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
|
5194 SET_PT_BOTH (opoint, opoint_byte); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5195 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
|
5196 { |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5197 SET_PT_BOTH (pos, pos_byte); |
95566
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5198 Fvertical_motion (original_pos, window); |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5199 } |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
5200 else |
20046
8baac8399a29
(window_scroll): When scrolling forward and point is
Karl Heuer <kwzh@gnu.org>
parents:
19667
diff
changeset
|
5201 SET_PT (top_margin); |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5202 } |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5203 else if (n < 0) |
265 | 5204 { |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5205 int bottom_margin; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5206 |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5207 /* 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
|
5208 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
|
5209 SET_PT_BOTH (pos, pos_byte); |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5210 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
|
5211 if (XFASTINT (tem) == ht - this_scroll_margin) |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5212 bottom_margin = PT; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5213 else |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5214 bottom_margin = PT + 1; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5215 |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5216 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
|
5217 SET_PT_BOTH (opoint, opoint_byte); |
265 | 5218 else |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5219 { |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5220 if (!NILP (Vscroll_preserve_screen_position)) |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
5221 { |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5222 SET_PT_BOTH (pos, pos_byte); |
95566
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5223 Fvertical_motion (original_pos, window); |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
5224 } |
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
5225 else |
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
5226 Fvertical_motion (make_number (-1), window); |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5227 } |
265 | 5228 } |
5229 } | |
5230 else | |
522 | 5231 { |
5232 if (noerror) | |
5233 return; | |
5234 else | |
71991
2cbe7a01a491
(window_scroll_pixel_based, window_scroll_line_based):
Kim F. Storm <storm@cua.dk>
parents:
71844
diff
changeset
|
5235 xsignal0 (Qend_of_buffer); |
522 | 5236 } |
265 | 5237 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5238 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5239 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5240 /* 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
|
5241 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
|
5242 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
|
5243 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
|
5244 up. This is the guts of Fscroll_up and Fscroll_down. */ |
265 | 5245 |
5246 static void | |
5247 scroll_command (n, direction) | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5248 Lisp_Object n; |
265 | 5249 int direction; |
5250 { | |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46271
diff
changeset
|
5251 int count = SPECPDL_INDEX (); |
265 | 5252 |
85260 | 5253 xassert (eabs (direction) == 1); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5254 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5255 /* 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
|
5256 the moment. But don't screw up if window_scroll gets an error. */ |
265 | 5257 if (XBUFFER (XWINDOW (selected_window)->buffer) != current_buffer) |
548 | 5258 { |
5259 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
5260 Fset_buffer (XWINDOW (selected_window)->buffer); | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5261 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5262 /* Make redisplay consider other windows than just selected_window. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5263 ++windows_or_buffers_changed; |
548 | 5264 } |
265 | 5265 |
485 | 5266 if (NILP (n)) |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5267 window_scroll (selected_window, direction, 1, 0); |
265 | 5268 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
|
5269 window_scroll (selected_window, -direction, 1, 0); |
265 | 5270 else |
5271 { | |
5272 n = Fprefix_numeric_value (n); | |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5273 window_scroll (selected_window, XINT (n) * direction, 0, 0); |
265 | 5274 } |
548 | 5275 |
5276 unbind_to (count, Qnil); | |
265 | 5277 } |
5278 | |
93547
7a747c3c0def
(Fscroll_up, Fscroll_down, Fscroll_left)
Chong Yidong <cyd@stupidchicken.com>
parents:
93436
diff
changeset
|
5279 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
|
5280 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
|
5281 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
|
5282 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
|
5283 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
|
5284 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
|
5285 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
|
5286 (arg) |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5287 Lisp_Object arg; |
265 | 5288 { |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5289 scroll_command (arg, 1); |
265 | 5290 return Qnil; |
5291 } | |
5292 | |
93547
7a747c3c0def
(Fscroll_up, Fscroll_down, Fscroll_left)
Chong Yidong <cyd@stupidchicken.com>
parents:
93436
diff
changeset
|
5293 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
|
5294 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
|
5295 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
|
5296 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
|
5297 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
|
5298 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
|
5299 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
|
5300 (arg) |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5301 Lisp_Object arg; |
265 | 5302 { |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5303 scroll_command (arg, -1); |
265 | 5304 return Qnil; |
5305 } | |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5306 |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5307 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
|
5308 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
|
5309 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
|
5310 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
|
5311 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
|
5312 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
|
5313 `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
|
5314 () |
265 | 5315 { |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5316 Lisp_Object window; |
265 | 5317 |
5318 if (MINI_WINDOW_P (XWINDOW (selected_window)) | |
485 | 5319 && !NILP (Vminibuf_scroll_window)) |
265 | 5320 window = Vminibuf_scroll_window; |
5321 /* If buffer is specified, scroll that buffer. */ | |
485 | 5322 else if (!NILP (Vother_window_scroll_buffer)) |
265 | 5323 { |
5324 window = Fget_buffer_window (Vother_window_scroll_buffer, Qnil); | |
485 | 5325 if (NILP (window)) |
95590
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95566
diff
changeset
|
5326 window = display_buffer (Vother_window_scroll_buffer, Qt, Qnil); |
265 | 5327 } |
5328 else | |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5329 { |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5330 /* 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
|
5331 frame. */ |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5332 window = Fnext_window (selected_window, Qnil, Qnil); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5333 |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5334 if (EQ (window, selected_window)) |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5335 /* 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
|
5336 visible frame. */ |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5337 do |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5338 window = Fnext_window (window, Qnil, Qt); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5339 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
|
5340 && ! EQ (window, selected_window)); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5341 } |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5342 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
5343 CHECK_LIVE_WINDOW (window); |
265 | 5344 |
5345 if (EQ (window, selected_window)) | |
5346 error ("There is no other window"); | |
5347 | |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5348 return window; |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5349 } |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5350 |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5351 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
|
5352 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
|
5353 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
|
5354 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
|
5355 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
|
5356 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
|
5357 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
|
5358 |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
5359 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
|
5360 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
|
5361 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
|
5362 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
|
5363 `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
|
5364 (arg) |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5365 Lisp_Object arg; |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5366 { |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5367 Lisp_Object window; |
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5368 struct window *w; |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46271
diff
changeset
|
5369 int count = SPECPDL_INDEX (); |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5370 |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5371 window = Fother_window_for_scrolling (); |
265 | 5372 w = XWINDOW (window); |
5373 | |
5374 /* Don't screw up if window_scroll gets an error. */ | |
5375 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
|
5376 ++windows_or_buffers_changed; |
265 | 5377 |
5378 Fset_buffer (w->buffer); | |
5379 SET_PT (marker_position (w->pointm)); | |
5380 | |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5381 if (NILP (arg)) |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5382 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
|
5383 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
|
5384 window_scroll (window, -1, 1, 1); |
265 | 5385 else |
5386 { | |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5387 if (CONSP (arg)) |
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5388 arg = Fcar (arg); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
5389 CHECK_NUMBER (arg); |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5390 window_scroll (window, XINT (arg), 0, 1); |
265 | 5391 } |
5392 | |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5393 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
|
5394 unbind_to (count, Qnil); |
265 | 5395 |
5396 return Qnil; | |
5397 } | |
5398 | |
93547
7a747c3c0def
(Fscroll_up, Fscroll_down, Fscroll_left)
Chong Yidong <cyd@stupidchicken.com>
parents:
93436
diff
changeset
|
5399 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
|
5400 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
|
5401 Default for ARG is window width minus 2. |
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
5402 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
|
5403 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
|
5404 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
|
5405 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
|
5406 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
|
5407 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
|
5408 (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
|
5409 register Lisp_Object arg, set_minimum; |
265 | 5410 { |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5411 Lisp_Object result; |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5412 int hscroll; |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5413 struct window *w = XWINDOW (selected_window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5414 |
485 | 5415 if (NILP (arg)) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5416 XSETFASTINT (arg, window_box_text_cols (w) - 2); |
265 | 5417 else |
5418 arg = Fprefix_numeric_value (arg); | |
5419 | |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5420 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
|
5421 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
|
5422 |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5423 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
|
5424 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
|
5425 |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5426 return result; |
265 | 5427 } |
5428 | |
93547
7a747c3c0def
(Fscroll_up, Fscroll_down, Fscroll_left)
Chong Yidong <cyd@stupidchicken.com>
parents:
93436
diff
changeset
|
5429 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
|
5430 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
|
5431 Default for ARG is window width minus 2. |
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
5432 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
|
5433 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
|
5434 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
|
5435 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
|
5436 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
|
5437 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
|
5438 (arg, set_minimum) |
57898
f85e0cc87926
(Fscroll_right): Fix last change.
Andreas Schwab <schwab@suse.de>
parents:
57874
diff
changeset
|
5439 register Lisp_Object arg, set_minimum; |
265 | 5440 { |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5441 Lisp_Object result; |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5442 int hscroll; |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5443 struct window *w = XWINDOW (selected_window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5444 |
485 | 5445 if (NILP (arg)) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5446 XSETFASTINT (arg, window_box_text_cols (w) - 2); |
265 | 5447 else |
5448 arg = Fprefix_numeric_value (arg); | |
5449 | |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5450 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
|
5451 result = Fset_window_hscroll (selected_window, make_number (hscroll)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5452 |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5453 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
|
5454 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
|
5455 |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5456 return result; |
265 | 5457 } |
5458 | |
43624
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5459 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
|
5460 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
|
5461 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
|
5462 () |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5463 { |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5464 if (minibuf_level > 0 |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5465 && MINI_WINDOW_P (XWINDOW (selected_window)) |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5466 && WINDOW_LIVE_P (minibuf_selected_window)) |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5467 return minibuf_selected_window; |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5468 |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5469 return Qnil; |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5470 } |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5471 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5472 /* 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
|
5473 as opposed to its height. */ |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5474 |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5475 static int |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5476 displayed_window_lines (w) |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5477 struct window *w; |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5478 { |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5479 struct it it; |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5480 struct text_pos start; |
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
5481 int height = window_box_height (w); |
33059
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5482 struct buffer *old_buffer; |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5483 int bottom_y; |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5484 |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5485 if (XBUFFER (w->buffer) != current_buffer) |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5486 { |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5487 old_buffer = current_buffer; |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5488 set_buffer_internal (XBUFFER (w->buffer)); |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5489 } |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5490 else |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5491 old_buffer = NULL; |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5492 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5493 /* 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
|
5494 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
|
5495 calls (recenter -1) while W->start is 1. */ |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5496 if (XMARKER (w->start)->charpos < BEGV) |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5497 SET_TEXT_POS (start, BEGV, BEGV_BYTE); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5498 else if (XMARKER (w->start)->charpos > ZV) |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5499 SET_TEXT_POS (start, ZV, ZV_BYTE); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5500 else |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5501 SET_TEXT_POS_FROM_MARKER (start, w->start); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5502 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5503 start_display (&it, w, start); |
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
5504 move_it_vertically (&it, height); |
36202
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5505 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
|
5506 |
47234
ca48173ebf57
(displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents:
46410
diff
changeset
|
5507 /* 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
|
5508 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
|
5509 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
|
5510 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
|
5511 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
|
5512 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
|
5513 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
|
5514 height++; |
ca48173ebf57
(displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents:
46410
diff
changeset
|
5515 |
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
5516 /* 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
|
5517 if (bottom_y < height) |
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
5518 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5519 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
|
5520 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
|
5521 } |
34384
9669bb49fca2
(Fmove_to_window_line): Skip past any partially visible first line.
Miles Bader <miles@gnu.org>
parents:
34381
diff
changeset
|
5522 |
36202
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5523 if (old_buffer) |
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5524 set_buffer_internal (old_buffer); |
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5525 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5526 return it.vpos; |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5527 } |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5528 |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5529 |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5530 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
|
5531 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
|
5532 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
|
5533 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
|
5534 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
|
5535 |
74966
749691edf645
(Frecenter): Set minimize_tool_bar_window_p flag
Kim F. Storm <storm@cua.dk>
parents:
74255
diff
changeset
|
5536 If ARG is omitted or nil, erase the entire frame and then redraw with point |
749691edf645
(Frecenter): Set minimize_tool_bar_window_p flag
Kim F. Storm <storm@cua.dk>
parents:
74255
diff
changeset
|
5537 in the center of the current window. If `auto-resize-tool-bars' is set to |
749691edf645
(Frecenter): Set minimize_tool_bar_window_p flag
Kim F. Storm <storm@cua.dk>
parents:
74255
diff
changeset
|
5538 `grow-only', this resets the tool-bar's height to the minimum height needed. |
749691edf645
(Frecenter): Set minimize_tool_bar_window_p flag
Kim F. Storm <storm@cua.dk>
parents:
74255
diff
changeset
|
5539 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5540 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
|
5541 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
|
5542 (arg) |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5543 register Lisp_Object arg; |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5544 { |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5545 struct window *w = XWINDOW (selected_window); |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5546 struct buffer *buf = XBUFFER (w->buffer); |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5547 struct buffer *obuf = current_buffer; |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5548 int center_p = 0; |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5549 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
|
5550 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
|
5551 int this_scroll_margin; |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5552 |
42089
ca7101bea5ee
(Frecenter): Clear display_error_modiff field.
Richard M. Stallman <rms@gnu.org>
parents:
41980
diff
changeset
|
5553 /* 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
|
5554 obuf->display_error_modiff = 0; |
ca7101bea5ee
(Frecenter): Clear display_error_modiff field.
Richard M. Stallman <rms@gnu.org>
parents:
41980
diff
changeset
|
5555 |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5556 if (NILP (arg)) |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5557 { |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5558 int i; |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5559 |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5560 /* Invalidate pixel data calculated for all compositions. */ |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5561 for (i = 0; i < n_compositions; i++) |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5562 composition_table[i]->font = NULL; |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5563 |
74966
749691edf645
(Frecenter): Set minimize_tool_bar_window_p flag
Kim F. Storm <storm@cua.dk>
parents:
74255
diff
changeset
|
5564 WINDOW_XFRAME (w)->minimize_tool_bar_window_p = 1; |
749691edf645
(Frecenter): Set minimize_tool_bar_window_p flag
Kim F. Storm <storm@cua.dk>
parents:
74255
diff
changeset
|
5565 |
749691edf645
(Frecenter): Set minimize_tool_bar_window_p flag
Kim F. Storm <storm@cua.dk>
parents:
74255
diff
changeset
|
5566 Fredraw_frame (WINDOW_FRAME (w)); |
749691edf645
(Frecenter): Set minimize_tool_bar_window_p flag
Kim F. Storm <storm@cua.dk>
parents:
74255
diff
changeset
|
5567 SET_FRAME_GARBAGED (WINDOW_XFRAME (w)); |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5568 center_p = 1; |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5569 } |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5570 else if (CONSP (arg)) /* Just C-u. */ |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5571 center_p = 1; |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5572 else |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5573 { |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5574 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
|
5575 CHECK_NUMBER (arg); |
64133
7e06f331c228
(Frecenter): Fix last change (set iarg before use).
Kim F. Storm <storm@cua.dk>
parents:
64114
diff
changeset
|
5576 iarg = XINT (arg); |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5577 } |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5578 |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5579 set_buffer_internal (buf); |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5580 |
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
|
5581 /* 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
|
5582 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
|
5583 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
|
5584 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
|
5585 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
|
5586 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5587 /* 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
|
5588 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
|
5589 line counts would lead to strange effects. */ |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5590 if (FRAME_WINDOW_P (XFRAME (w->frame))) |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5591 { |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5592 if (center_p) |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5593 { |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5594 struct it it; |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5595 struct text_pos pt; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5596 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5597 SET_TEXT_POS (pt, PT, PT_BYTE); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5598 start_display (&it, w, pt); |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5599 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
|
5600 charpos = IT_CHARPOS (it); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5601 bytepos = IT_BYTEPOS (it); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5602 } |
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
|
5603 else if (iarg < 0) |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5604 { |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5605 struct it it; |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5606 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
|
5607 int nlines = -iarg; |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5608 int extra_line_spacing; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5609 int h = window_box_height (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5610 |
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
|
5611 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
|
5612 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5613 SET_TEXT_POS (pt, PT, PT_BYTE); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5614 start_display (&it, w, pt); |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5615 |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5616 /* 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
|
5617 move_it_by_lines (&it, 0, 1); |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5618 |
38722
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
5619 /* 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
|
5620 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
|
5621 and the lines below. */ |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5622 it.current_y = 0; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5623 it.vpos = 0; |
38722
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
5624 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
|
5625 |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5626 if (it.vpos == nlines) |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5627 h -= it.current_y; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5628 else |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5629 { |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5630 /* Last line has no newline */ |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5631 h -= line_bottom_y (&it); |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5632 it.vpos++; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5633 } |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5634 |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5635 /* 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
|
5636 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
|
5637 |
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
5638 /* 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
|
5639 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
|
5640 if (it.vpos < nlines) |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5641 { |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5642 nlines -= it.vpos; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5643 extra_line_spacing = it.extra_line_spacing; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5644 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
|
5645 } |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5646 if (h <= 0) |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5647 return Qnil; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5648 |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5649 /* 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
|
5650 start_display (&it, w, pt); |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5651 it.current_y = 0; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5652 move_it_vertically_backward (&it, h); |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5653 |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5654 /* 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
|
5655 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
|
5656 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
|
5657 in the middle), so move forward. |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5658 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
|
5659 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
|
5660 */ |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5661 h += extra_line_spacing; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5662 while (-it.current_y > h) |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5663 move_it_by_lines (&it, 1, 1); |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5664 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5665 charpos = IT_CHARPOS (it); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5666 bytepos = IT_BYTEPOS (it); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5667 } |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5668 else |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5669 { |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5670 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
|
5671 |
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
|
5672 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
|
5673 |
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
|
5674 pos = *vmotion (PT, -iarg, w); |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5675 charpos = pos.bufpos; |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5676 bytepos = pos.bytepos; |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5677 } |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5678 } |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5679 else |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5680 { |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5681 struct position pos; |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5682 int ht = window_internal_height (w); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5683 |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5684 if (center_p) |
64236
667d6d6c7fd9
(Frecenter): Yet another int/Lisp_Object mixup (YAILOM).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64134
diff
changeset
|
5685 iarg = ht / 2; |
64134
0fcb7f3236c9
(Frecenter): Remove superfluous settings of iarg.
Kim F. Storm <storm@cua.dk>
parents:
64133
diff
changeset
|
5686 else if (iarg < 0) |
0fcb7f3236c9
(Frecenter): Remove superfluous settings of iarg.
Kim F. Storm <storm@cua.dk>
parents:
64133
diff
changeset
|
5687 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
|
5688 |
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 /* 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
|
5690 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
|
5691 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
|
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 pos = *vmotion (PT, - iarg, w); |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5694 charpos = pos.bufpos; |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5695 bytepos = pos.bytepos; |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5696 } |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5697 |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5698 /* Set the new window start. */ |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5699 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
|
5700 w->window_end_valid = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5701 |
46108
7b8b4ec9573c
(Frecenter): With arg, set optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
46021
diff
changeset
|
5702 w->optional_new_start = Qt; |
7b8b4ec9573c
(Frecenter): With arg, set optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
46021
diff
changeset
|
5703 |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5704 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
|
5705 w->start_at_line_beg = Qt; |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5706 else |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5707 w->start_at_line_beg = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5708 |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5709 set_buffer_internal (obuf); |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5710 return Qnil; |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5711 } |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5712 |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5713 |
34416
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5714 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
|
5715 0, 1, 0, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5716 doc: /* Return the height in lines of the text display area of WINDOW. |
75753
5e34b32b9b4c
(Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents:
75348
diff
changeset
|
5717 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
|
5718 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
|
5719 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
|
5720 (window) |
34416
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5721 Lisp_Object window; |
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5722 { |
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5723 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
|
5724 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
|
5725 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
|
5726 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
|
5727 } |
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5728 |
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5729 |
265 | 5730 |
5731 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
|
5732 1, 1, "P", |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5733 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
|
5734 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
|
5735 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
|
5736 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
|
5737 (arg) |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5738 Lisp_Object arg; |
265 | 5739 { |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5740 struct window *w = XWINDOW (selected_window); |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5741 int lines, start; |
6326
5e662ad3f594
(Fdelete_other_windows): Pass new arg to Fvertical_motion.
Richard M. Stallman <rms@gnu.org>
parents:
6269
diff
changeset
|
5742 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
|
5743 #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
|
5744 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
|
5745 #endif |
265 | 5746 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5747 window = selected_window; |
265 | 5748 start = marker_position (w->start); |
5749 if (start < BEGV || start > ZV) | |
5750 { | |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5751 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
|
5752 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
|
5753 set_marker_both (w->start, w->buffer, PT, PT_BYTE); |
265 | 5754 w->start_at_line_beg = Fbolp (); |
5755 w->force_start = Qt; | |
5756 } | |
5757 else | |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5758 Fgoto_char (w->start); |
265 | 5759 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5760 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
|
5761 |
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
|
5762 #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
|
5763 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
|
5764 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
|
5765 #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
|
5766 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5767 if (NILP (arg)) |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5768 XSETFASTINT (arg, lines / 2); |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5769 else |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5770 { |
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
|
5771 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
|
5772 |
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
|
5773 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
|
5774 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
|
5775 |
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
|
5776 #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
|
5777 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
|
5778 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
|
5779 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
|
5780 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
|
5781 |
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
|
5782 /* 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
|
5783 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
|
5784 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
|
5785 #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
|
5786 |
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
|
5787 arg = make_number (iarg); |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5788 } |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5789 |
36202
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5790 /* 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
|
5791 if (w->vscroll) |
9669bb49fca2
(Fmove_to_window_line): Skip past any partially visible first line.
Miles Bader <miles@gnu.org>
parents:
34381
diff
changeset
|
5792 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
|
5793 |
6326
5e662ad3f594
(Fdelete_other_windows): Pass new arg to Fvertical_motion.
Richard M. Stallman <rms@gnu.org>
parents:
6269
diff
changeset
|
5794 return Fvertical_motion (arg, window); |
265 | 5795 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5796 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5797 |
265 | 5798 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5799 /*********************************************************************** |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5800 Window Configuration |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5801 ***********************************************************************/ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5802 |
265 | 5803 struct save_window_data |
5804 { | |
85022
96eb42c9e0e3
* window.h (struct window):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85013
diff
changeset
|
5805 EMACS_UINT size; |
265 | 5806 struct Lisp_Vector *next_from_Lisp_Vector_struct; |
1325
f03e559aac3e
* window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents:
1280
diff
changeset
|
5807 Lisp_Object selected_frame; |
265 | 5808 Lisp_Object current_window; |
5809 Lisp_Object current_buffer; | |
5810 Lisp_Object minibuf_scroll_window; | |
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
5811 Lisp_Object minibuf_selected_window; |
265 | 5812 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
|
5813 Lisp_Object focus_frame; |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5814 /* 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
|
5815 for one window. */ |
265 | 5816 Lisp_Object saved_windows; |
86162
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
5817 |
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
5818 /* All fields above are traced by the GC. |
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
5819 From `fame-cols' down, the fields are ignored by the GC. */ |
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
5820 |
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
5821 int frame_cols, frame_lines, frame_menu_bar_lines; |
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
5822 int frame_tool_bar_lines; |
265 | 5823 }; |
1326
709532b86646
* window.c (SAVE_WINDOW_DATA_SIZE): Define this using sizeof,
Jim Blandy <jimb@redhat.com>
parents:
1325
diff
changeset
|
5824 |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5825 /* This is saved as a Lisp_Vector */ |
265 | 5826 struct saved_window |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5827 { |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5828 /* these first two must agree with struct Lisp_Vector in lisp.h */ |
85022
96eb42c9e0e3
* window.h (struct window):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85013
diff
changeset
|
5829 EMACS_UINT size; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5830 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
|
5831 |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5832 Lisp_Object window; |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5833 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
|
5834 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
|
5835 Lisp_Object hscroll, min_hscroll; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5836 Lisp_Object parent, prev; |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5837 Lisp_Object start_at_line_beg; |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5838 Lisp_Object display_table; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5839 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
|
5840 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
|
5841 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
|
5842 Lisp_Object scroll_bar_width, vertical_scroll_bar_type; |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
5843 Lisp_Object dedicated, resize_proportionally; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5844 }; |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5845 |
265 | 5846 #define SAVED_WINDOW_N(swv,n) \ |
5847 ((struct saved_window *) (XVECTOR ((swv)->contents[(n)]))) | |
5848 | |
5849 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
|
5850 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
|
5851 (object) |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5852 Lisp_Object object; |
265 | 5853 { |
71041
8aeb086972ae
(struct saved_window): Add `dedicated'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70736
diff
changeset
|
5854 return WINDOW_CONFIGURATIONP (object) ? Qt : Qnil; |
265 | 5855 } |
5856 | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5857 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
|
5858 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
|
5859 (config) |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5860 Lisp_Object config; |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5861 { |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5862 register struct save_window_data *data; |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5863 struct Lisp_Vector *saved_windows; |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5864 |
71844
632e73258d36
(Fwindow_configuration_frame, Fset_window_configuration):
Kim F. Storm <storm@cua.dk>
parents:
71717
diff
changeset
|
5865 CHECK_WINDOW_CONFIGURATION (config); |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5866 |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5867 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
|
5868 saved_windows = XVECTOR (data->saved_windows); |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5869 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
|
5870 } |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5871 |
2297
bb88d48c290f
(Fselect_window): Use Fhandle_switch_frame.
Richard M. Stallman <rms@gnu.org>
parents:
2210
diff
changeset
|
5872 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
|
5873 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
|
5874 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
|
5875 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
|
5876 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
|
5877 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
|
5878 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
|
5879 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
|
5880 (configuration) |
1016
817b0ce337d7
* window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents:
983
diff
changeset
|
5881 Lisp_Object configuration; |
265 | 5882 { |
5883 register struct save_window_data *data; | |
5884 struct Lisp_Vector *saved_windows; | |
5885 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
|
5886 Lisp_Object frame; |
769 | 5887 FRAME_PTR f; |
45835
aab759361c24
(Fset_window_configuration): Explicitly preserve
Richard M. Stallman <rms@gnu.org>
parents:
45645
diff
changeset
|
5888 int old_point = -1; |
265 | 5889 |
71844
632e73258d36
(Fwindow_configuration_frame, Fset_window_configuration):
Kim F. Storm <storm@cua.dk>
parents:
71717
diff
changeset
|
5890 CHECK_WINDOW_CONFIGURATION (configuration); |
265 | 5891 |
1016
817b0ce337d7
* window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents:
983
diff
changeset
|
5892 data = (struct save_window_data *) XVECTOR (configuration); |
265 | 5893 saved_windows = XVECTOR (data->saved_windows); |
5894 | |
5895 new_current_buffer = data->current_buffer; | |
485 | 5896 if (NILP (XBUFFER (new_current_buffer)->name)) |
265 | 5897 new_current_buffer = Qnil; |
45835
aab759361c24
(Fset_window_configuration): Explicitly preserve
Richard M. Stallman <rms@gnu.org>
parents:
45645
diff
changeset
|
5898 else |
48898
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
5899 { |
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
5900 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
|
5901 /* 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
|
5902 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
|
5903 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
|
5904 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
|
5905 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
|
5906 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
|
5907 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
|
5908 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
|
5909 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
|
5910 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
|
5911 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
|
5912 && WINDOWP (selected_window) |
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
5913 && 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
|
5914 && !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
|
5915 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
|
5916 else |
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
5917 old_point = PT; |
48898
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
5918 else |
61511
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5919 /* 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
|
5920 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
|
5921 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
|
5922 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
|
5923 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
|
5924 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
|
5925 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
|
5926 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
|
5927 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
|
5928 /* 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
|
5929 && !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
|
5930 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
|
5931 else |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
5932 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
|
5933 } |
265 | 5934 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5935 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
|
5936 f = XFRAME (frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5937 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5938 /* 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
|
5939 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
|
5940 if (FRAME_LIVE_P (f)) |
265 | 5941 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5942 register struct window *w; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5943 register struct saved_window *p; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5944 struct window *root_window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5945 struct window **leaf_windows; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5946 int n_leaf_windows; |
33277
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
5947 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
|
5948 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5949 /* 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
|
5950 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
|
5951 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
|
5952 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
|
5953 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
|
5954 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
|
5955 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
|
5956 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
|
5957 |
18657 | 5958 /* The mouse highlighting code could get screwed up |
5959 if it runs during this. */ | |
5960 BLOCK_INPUT; | |
5961 | |
86162
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
5962 if (data->frame_lines != previous_frame_lines |
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
5963 || data->frame_cols != previous_frame_cols) |
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
5964 change_frame_size (f, data->frame_lines, |
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
5965 data->frame_cols, 0, 0, 0); |
16051
ccf489f8596e
Removed support for !MULTI_FRAME.
Karl Heuer <kwzh@gnu.org>
parents:
16039
diff
changeset
|
5966 #if defined (HAVE_WINDOW_SYSTEM) || defined (MSDOS) |
86162
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
5967 if (data->frame_menu_bar_lines |
6099
19eaf70457d4
(Fset_window_configuration): Allow for menu-bar-lines to have changed since
Karl Heuer <kwzh@gnu.org>
parents:
5990
diff
changeset
|
5968 != previous_frame_menu_bar_lines) |
86162
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
5969 x_set_menu_bar_lines (f, make_number (data->frame_menu_bar_lines), |
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
5970 make_number (0)); |
25115
2105537c5916
(Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25044
diff
changeset
|
5971 #ifdef HAVE_WINDOW_SYSTEM |
86162
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
5972 if (data->frame_tool_bar_lines |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25540
diff
changeset
|
5973 != previous_frame_tool_bar_lines) |
86162
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
5974 x_set_tool_bar_lines (f, make_number (data->frame_tool_bar_lines), |
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
5975 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
|
5976 #endif |
25115
2105537c5916
(Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25044
diff
changeset
|
5977 #endif |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5978 |
61444 | 5979 /* "Swap out" point from the selected window's buffer |
5980 into the window itself. (Normally the pointm of the selected | |
5981 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
|
5982 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
|
5983 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
|
5984 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
|
5985 { |
0753fa7a67f3
(Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents:
20535
diff
changeset
|
5986 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
|
5987 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
|
5988 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
|
5989 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
|
5990 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
|
5991 } |
0753fa7a67f3
(Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents:
20535
diff
changeset
|
5992 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
5993 windows_or_buffers_changed++; |
10666
e1dfb47b664e
(Fdelete_window, set_window_height, set_window_width)
Richard M. Stallman <rms@gnu.org>
parents:
10461
diff
changeset
|
5994 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
|
5995 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5996 /* Problem: Freeing all matrices and later allocating them again |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5997 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
|
5998 really like to do is to free only those matrices not reused |
95550
e057f981a6b5
(Fset_window_parameter): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
95547
diff
changeset
|
5999 below. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6000 root_window = XWINDOW (FRAME_ROOT_WINDOW (f)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6001 leaf_windows |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6002 = (struct window **) alloca (count_windows (root_window) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6003 * sizeof (struct window *)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6004 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
|
6005 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6006 /* Kludge Alert! |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6007 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
|
6008 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
|
6009 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6010 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
|
6011 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
|
6012 dead. */ |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6013 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
|
6014 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6015 for (k = 0; k < saved_windows->size; k++) |
265 | 6016 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6017 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
|
6018 w = XWINDOW (p->window); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6019 w->next = Qnil; |
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 if (!NILP (p->parent)) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6022 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
|
6023 XFASTINT (p->parent))->window; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6024 else |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6025 w->parent = Qnil; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6026 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6027 if (!NILP (p->prev)) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6028 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6029 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
|
6030 XFASTINT (p->prev))->window; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6031 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
|
6032 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6033 else |
265 | 6034 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6035 w->prev = Qnil; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6036 if (!NILP (w->parent)) |
265 | 6037 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6038 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
|
6039 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6040 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
|
6041 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
|
6042 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6043 else |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6044 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6045 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
|
6046 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
|
6047 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6048 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6049 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6050 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6051 /* 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
|
6052 restore it now. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6053 if (BUFFERP (w->total_lines)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6054 w->buffer = w->total_lines; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6055 w->left_col = p->left_col; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6056 w->top_line = p->top_line; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6057 w->total_cols = p->total_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6058 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
|
6059 w->hscroll = p->hscroll; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
6060 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
|
6061 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
|
6062 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
|
6063 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
|
6064 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
|
6065 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
|
6066 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
|
6067 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
|
6068 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
|
6069 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
|
6070 w->vertical_scroll_bar_type = p->vertical_scroll_bar_type; |
71041
8aeb086972ae
(struct saved_window): Add `dedicated'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70736
diff
changeset
|
6071 w->dedicated = p->dedicated; |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
6072 w->resize_proportionally = p->resize_proportionally; |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
6073 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
|
6074 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
|
6075 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6076 /* 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
|
6077 if (NILP (p->buffer)) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6078 w->buffer = p->buffer; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6079 else |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6080 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6081 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
|
6082 /* 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
|
6083 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6084 w->buffer = p->buffer; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6085 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
|
6086 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
|
6087 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
|
6088 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
|
6089 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
|
6090 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6091 /* 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
|
6092 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
|
6093 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
|
6094 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
|
6095 && 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
|
6096 Fgoto_char (w->pointm); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6097 } |
3535
581c09f72dbd
(Fset_window_configuration): If a window is supposed
Richard M. Stallman <rms@gnu.org>
parents:
3354
diff
changeset
|
6098 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
|
6099 /* 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
|
6100 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6101 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
|
6102 /* 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
|
6103 range. */ |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6104 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
|
6105 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
|
6106 w->start_at_line_beg = Qt; |
265 | 6107 } |
6108 else | |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6109 /* 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
|
6110 are real. */ |
265 | 6111 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6112 /* 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
|
6113 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
|
6114 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
|
6115 w->buffer); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6116 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
|
6117 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
|
6118 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
|
6119 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
|
6120 w->start_at_line_beg = Qt; |
265 | 6121 } |
6122 } | |
6123 } | |
1237
3929b2135e58
* window.c (delete_all_subwindows): Save the window's buffer in
Jim Blandy <jimb@redhat.com>
parents:
1123
diff
changeset
|
6124 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6125 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
|
6126 /* 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
|
6127 using the buffer that has been restored into it. |
61444 | 6128 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
|
6129 selected_window = Qnil; |
61444 | 6130 |
6131 /* Arrange *not* to restore point in the buffer that was | |
6132 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
|
6133 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
|
6134 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
|
6135 make_number (old_point), |
45584
5fd12f9027a3
(Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents:
45562
diff
changeset
|
6136 XWINDOW (data->current_window)->buffer); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6137 |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
6138 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
|
6139 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
|
6140 = selected_window; |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6141 |
1716
95db936d47c0
* keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents:
1685
diff
changeset
|
6142 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
|
6143 || (FRAMEP (data->focus_frame) |
1716
95db936d47c0
* keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents:
1685
diff
changeset
|
6144 && FRAME_LIVE_P (XFRAME (data->focus_frame)))) |
95db936d47c0
* keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents:
1685
diff
changeset
|
6145 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
|
6146 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6147 #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
|
6148 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
|
6149 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
|
6150 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
|
6151 0, 0); |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6152 #endif |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6153 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6154 /* 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
|
6155 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
|
6156 || previous_frame_cols != FRAME_COLS (f)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6157 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
|
6158 0, 0, 0); |
16051
ccf489f8596e
Removed support for !MULTI_FRAME.
Karl Heuer <kwzh@gnu.org>
parents:
16039
diff
changeset
|
6159 #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
|
6160 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
|
6161 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
|
6162 make_number (0)); |
25115
2105537c5916
(Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25044
diff
changeset
|
6163 #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
|
6164 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
|
6165 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
|
6166 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
|
6167 #endif |
25115
2105537c5916
(Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25044
diff
changeset
|
6168 #endif |
18657 | 6169 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6170 /* 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
|
6171 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
|
6172 { |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
6173 if (NILP (leaf_windows[i]->buffer)) |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
6174 { |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
6175 /* Assert it's not reused as a combination. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6176 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
|
6177 && NILP (leaf_windows[i]->vchild)); |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
6178 free_window_matrices (leaf_windows[i]); |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
6179 } |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
6180 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
|
6181 ++n; |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
6182 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6183 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6184 adjust_glyphs (f); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6185 |
18657 | 6186 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
|
6187 |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
6188 /* 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
|
6189 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
|
6190 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
|
6191 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
|
6192 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
|
6193 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
|
6194 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
|
6195 |
92192
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
6196 run_window_configuration_change_hook (f); |
265 | 6197 } |
6198 | |
1325
f03e559aac3e
* window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents:
1280
diff
changeset
|
6199 if (!NILP (new_current_buffer)) |
45584
5fd12f9027a3
(Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents:
45562
diff
changeset
|
6200 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
|
6201 |
265 | 6202 Vminibuf_scroll_window = data->minibuf_scroll_window; |
43594
23cddac4d0b7
(minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents:
43571
diff
changeset
|
6203 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
|
6204 |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
6205 return (FRAME_LIVE_P (f) ? Qt : Qnil); |
265 | 6206 } |
6207 | |
769 | 6208 /* Mark all windows now on frame as deleted |
265 | 6209 by setting their buffers to nil. */ |
6210 | |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6211 void |
265 | 6212 delete_all_subwindows (w) |
6213 register struct window *w; | |
6214 { | |
485 | 6215 if (!NILP (w->next)) |
265 | 6216 delete_all_subwindows (XWINDOW (w->next)); |
485 | 6217 if (!NILP (w->vchild)) |
265 | 6218 delete_all_subwindows (XWINDOW (w->vchild)); |
485 | 6219 if (!NILP (w->hchild)) |
265 | 6220 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
|
6221 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6222 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
|
6223 |
16068
b19129a8c644
(unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
6224 if (!NILP (w->buffer)) |
b19129a8c644
(unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
6225 unshow_buffer (w); |
b19129a8c644
(unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
6226 |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
6227 /* 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
|
6228 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
|
6229 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
|
6230 vchild or hchild set. */ |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
6231 w->buffer = Qnil; |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
6232 w->vchild = Qnil; |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
6233 w->hchild = Qnil; |
30045
ff2db81c11c1
(delete_all_subwindows): Reset Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents:
30039
diff
changeset
|
6234 |
ff2db81c11c1
(delete_all_subwindows): Reset Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents:
30039
diff
changeset
|
6235 Vwindow_list = Qnil; |
265 | 6236 } |
6237 | |
6238 static int | |
6239 count_windows (window) | |
6240 register struct window *window; | |
6241 { | |
6242 register int count = 1; | |
485 | 6243 if (!NILP (window->next)) |
265 | 6244 count += count_windows (XWINDOW (window->next)); |
485 | 6245 if (!NILP (window->vchild)) |
265 | 6246 count += count_windows (XWINDOW (window->vchild)); |
485 | 6247 if (!NILP (window->hchild)) |
265 | 6248 count += count_windows (XWINDOW (window->hchild)); |
6249 return count; | |
6250 } | |
6251 | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6252 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6253 /* 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
|
6254 Value is last index + 1. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6255 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6256 static int |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6257 get_leaf_windows (w, flat, i) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6258 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6259 struct window **flat; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6260 int i; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6261 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6262 while (w) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6263 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6264 if (!NILP (w->hchild)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6265 i = get_leaf_windows (XWINDOW (w->hchild), flat, i); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6266 else if (!NILP (w->vchild)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6267 i = get_leaf_windows (XWINDOW (w->vchild), flat, i); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6268 else |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6269 flat[i++] = w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6270 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6271 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6272 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6273 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6274 return i; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6275 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6276 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6277 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6278 /* 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
|
6279 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
|
6280 can be returned. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6281 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6282 struct glyph * |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6283 get_phys_cursor_glyph (w) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6284 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6285 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6286 struct glyph_row *row; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6287 struct glyph *glyph; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6288 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6289 if (w->phys_cursor.vpos >= 0 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6290 && w->phys_cursor.vpos < w->current_matrix->nrows |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6291 && (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
|
6292 row->enabled_p) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6293 && row->used[TEXT_AREA] > w->phys_cursor.hpos) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6294 glyph = row->glyphs[TEXT_AREA] + w->phys_cursor.hpos; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6295 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6296 glyph = NULL; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6297 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6298 return glyph; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6299 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6300 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6301 |
265 | 6302 static int |
6303 save_window_save (window, vector, i) | |
6304 Lisp_Object window; | |
6305 struct Lisp_Vector *vector; | |
6306 int i; | |
6307 { | |
6308 register struct saved_window *p; | |
6309 register struct window *w; | |
6310 register Lisp_Object tem; | |
6311 | |
485 | 6312 for (;!NILP (window); window = w->next) |
265 | 6313 { |
6314 p = SAVED_WINDOW_N (vector, i); | |
6315 w = XWINDOW (window); | |
6316 | |
58265
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
6317 XSETFASTINT (w->temslot, i); i++; |
265 | 6318 p->window = window; |
6319 p->buffer = w->buffer; | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6320 p->left_col = w->left_col; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6321 p->top_line = w->top_line; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6322 p->total_cols = w->total_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6323 p->total_lines = w->total_lines; |
265 | 6324 p->hscroll = w->hscroll; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
6325 p->min_hscroll = w->min_hscroll; |
265 | 6326 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
|
6327 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
|
6328 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
|
6329 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
|
6330 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
|
6331 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
|
6332 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
|
6333 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
|
6334 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
|
6335 p->vertical_scroll_bar_type = w->vertical_scroll_bar_type; |
71041
8aeb086972ae
(struct saved_window): Add `dedicated'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70736
diff
changeset
|
6336 p->dedicated = w->dedicated; |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
6337 p->resize_proportionally = w->resize_proportionally; |
485 | 6338 if (!NILP (w->buffer)) |
265 | 6339 { |
6340 /* Save w's value of point in the window configuration. | |
6341 If w is the selected window, then get the value of point | |
6342 from the buffer; pointm is garbage in the selected window. */ | |
6343 if (EQ (window, selected_window)) | |
6344 { | |
6345 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
|
6346 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
|
6347 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
|
6348 BUF_PT_BYTE (XBUFFER (w->buffer))); |
265 | 6349 } |
6350 else | |
12981
7a540e9cb21a
(save_window_save): Pass the new arg to Fcopy_marker.
Richard M. Stallman <rms@gnu.org>
parents:
12643
diff
changeset
|
6351 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
|
6352 |
7a540e9cb21a
(save_window_save): Pass the new arg to Fcopy_marker.
Richard M. Stallman <rms@gnu.org>
parents:
12643
diff
changeset
|
6353 p->start = Fcopy_marker (w->start, Qnil); |
265 | 6354 p->start_at_line_beg = w->start_at_line_beg; |
6355 | |
6356 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
|
6357 p->mark = Fcopy_marker (tem, Qnil); |
265 | 6358 } |
6359 else | |
6360 { | |
6361 p->pointm = Qnil; | |
6362 p->start = Qnil; | |
6363 p->mark = Qnil; | |
6364 p->start_at_line_beg = Qnil; | |
6365 } | |
6366 | |
485 | 6367 if (NILP (w->parent)) |
265 | 6368 p->parent = Qnil; |
6369 else | |
6370 p->parent = XWINDOW (w->parent)->temslot; | |
6371 | |
485 | 6372 if (NILP (w->prev)) |
265 | 6373 p->prev = Qnil; |
6374 else | |
6375 p->prev = XWINDOW (w->prev)->temslot; | |
6376 | |
485 | 6377 if (!NILP (w->vchild)) |
265 | 6378 i = save_window_save (w->vchild, vector, i); |
485 | 6379 if (!NILP (w->hchild)) |
265 | 6380 i = save_window_save (w->hchild, vector, i); |
6381 } | |
6382 | |
6383 return i; | |
6384 } | |
6385 | |
16485
9b919c5464a4
Reorganize function definitions so etags finds them.
Erik Naggum <erik@naggum.no>
parents:
16392
diff
changeset
|
6386 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
|
6387 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
|
6388 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
|
6389 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
|
6390 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
|
6391 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
|
6392 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
|
6393 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
|
6394 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
|
6395 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
|
6396 (frame) |
769 | 6397 Lisp_Object frame; |
265 | 6398 { |
6399 register Lisp_Object tem; | |
6400 register int n_windows; | |
6401 register struct save_window_data *data; | |
6402 register int i; | |
769 | 6403 FRAME_PTR f; |
265 | 6404 |
769 | 6405 if (NILP (frame)) |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6406 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
6407 CHECK_LIVE_FRAME (frame); |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6408 f = XFRAME (frame); |
358 | 6409 |
769 | 6410 n_windows = count_windows (XWINDOW (FRAME_ROOT_WINDOW (f))); |
86162
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
6411 data = ALLOCATE_PSEUDOVECTOR (struct save_window_data, frame_cols, |
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
6412 PVEC_WINDOW_CONFIGURATION); |
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
6413 |
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
6414 data->frame_cols = FRAME_COLS (f); |
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
6415 data->frame_lines = FRAME_LINES (f); |
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
6416 data->frame_menu_bar_lines = FRAME_MENU_BAR_LINES (f); |
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
6417 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
|
6418 data->selected_frame = selected_frame; |
769 | 6419 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
|
6420 XSETBUFFER (data->current_buffer, current_buffer); |
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
6421 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
|
6422 data->minibuf_selected_window = minibuf_level > 0 ? minibuf_selected_window : Qnil; |
769 | 6423 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
|
6424 data->focus_frame = FRAME_FOCUS_FRAME (f); |
265 | 6425 tem = Fmake_vector (make_number (n_windows), Qnil); |
6426 data->saved_windows = tem; | |
6427 for (i = 0; i < n_windows; i++) | |
6428 XVECTOR (tem)->contents[i] | |
65004
bc5cf5fc0f9e
(SAVED_WINDOW_VECTOR_SIZE): Remove dangerous define.
Kim F. Storm <storm@cua.dk>
parents:
64770
diff
changeset
|
6429 = 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
|
6430 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
|
6431 XSETWINDOW_CONFIGURATION (tem, data); |
265 | 6432 return (tem); |
6433 } | |
6434 | |
6435 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
|
6436 0, UNEVALLED, 0, |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
6437 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
|
6438 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
|
6439 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
|
6440 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
|
6441 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
|
6442 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
|
6443 Does not restore the value of point in current buffer. |
78156
9b4ab34a0df5
(Fsave_window_excursion): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
77905
diff
changeset
|
6444 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
|
6445 (args) |
265 | 6446 Lisp_Object args; |
6447 { | |
6448 register Lisp_Object val; | |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
6449 register int count = SPECPDL_INDEX (); |
265 | 6450 |
6451 record_unwind_protect (Fset_window_configuration, | |
358 | 6452 Fcurrent_window_configuration (Qnil)); |
265 | 6453 val = Fprogn (args); |
6454 return unbind_to (count, val); | |
6455 } | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6456 |
65826
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6457 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6458 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6459 /*********************************************************************** |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6460 Window Split Tree |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6461 ***********************************************************************/ |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6462 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6463 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
|
6464 window_tree (w) |
65826
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6465 struct window *w; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6466 { |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6467 Lisp_Object tail = Qnil; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6468 Lisp_Object result = Qnil; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6469 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6470 while (w) |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6471 { |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6472 Lisp_Object wn; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6473 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6474 XSETWINDOW (wn, w); |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6475 if (!NILP (w->hchild)) |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6476 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
|
6477 window_tree (XWINDOW (w->hchild)))); |
65826
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6478 else if (!NILP (w->vchild)) |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6479 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
|
6480 window_tree (XWINDOW (w->vchild)))); |
65826
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6481 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6482 if (NILP (result)) |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6483 { |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6484 result = tail = Fcons (wn, Qnil); |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6485 } |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6486 else |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6487 { |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6488 XSETCDR (tail, Fcons (wn, Qnil)); |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6489 tail = XCDR (tail); |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6490 } |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6491 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6492 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6493 } |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6494 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6495 return result; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6496 } |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6497 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6498 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6499 |
65908
454a4a463081
(window_tree, Fwindow_tree): Rename fns added 2005-10-04.
Kim F. Storm <storm@cua.dk>
parents:
65826
diff
changeset
|
6500 DEFUN ("window-tree", Fwindow_tree, Swindow_tree, |
65826
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6501 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
|
6502 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
|
6503 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6504 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
|
6505 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
|
6506 is the frame's minibuffer window. |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6507 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6508 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
|
6509 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
|
6510 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
|
6511 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
|
6512 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
|
6513 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
|
6514 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
|
6515 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6516 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
|
6517 selected frame. */) |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6518 (frame) |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6519 Lisp_Object frame; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6520 { |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6521 FRAME_PTR f; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6522 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6523 if (NILP (frame)) |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6524 frame = selected_frame; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6525 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6526 CHECK_FRAME (frame); |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6527 f = XFRAME (frame); |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6528 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6529 if (!FRAME_LIVE_P (f)) |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6530 return Qnil; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6531 |
65908
454a4a463081
(window_tree, Fwindow_tree): Rename fns added 2005-10-04.
Kim F. Storm <storm@cua.dk>
parents:
65826
diff
changeset
|
6532 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
|
6533 } |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6534 |
265 | 6535 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6536 /*********************************************************************** |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6537 Marginal Areas |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6538 ***********************************************************************/ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6539 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6540 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
|
6541 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
|
6542 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
|
6543 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
|
6544 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
|
6545 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
|
6546 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
|
6547 means no margin. */) |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6548 (window, left_width, right_width) |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6549 Lisp_Object window, left_width, right_width; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6550 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6551 struct window *w = decode_window (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6552 |
52852
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6553 /* Translate negative or zero widths to nil. |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6554 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
|
6555 |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6556 if (!NILP (left_width)) |
52852
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6557 { |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6558 CHECK_NUMBER (left_width); |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6559 if (XINT (left_width) <= 0) |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6560 left_width = Qnil; |
52852
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6561 } |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6562 |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6563 if (!NILP (right_width)) |
52852
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6564 { |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6565 CHECK_NUMBER (right_width); |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6566 if (XINT (right_width) <= 0) |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6567 right_width = Qnil; |
52852
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6568 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6569 |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6570 if (!EQ (w->left_margin_cols, left_width) |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6571 || !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
|
6572 { |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6573 w->left_margin_cols = left_width; |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6574 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
|
6575 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6576 adjust_window_margins (w); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6577 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6578 ++windows_or_buffers_changed; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6579 adjust_glyphs (XFRAME (WINDOW_FRAME (w))); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6580 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6581 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6582 return Qnil; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6583 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6584 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6585 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6586 DEFUN ("window-margins", Fwindow_margins, Swindow_margins, |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6587 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
|
6588 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
|
6589 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
|
6590 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
|
6591 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
|
6592 as nil. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6593 (window) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6594 Lisp_Object window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6595 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6596 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
|
6597 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
|
6598 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6599 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6600 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6601 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6602 /*********************************************************************** |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6603 Fringes |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6604 ***********************************************************************/ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6605 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6606 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
|
6607 2, 4, 0, |
52853
91a9da753e30
(Fset_window_fringes): Clarify docstring.
Lute Kamstra <lute@gnu.org>
parents:
52852
diff
changeset
|
6608 doc: /* Set the fringe widths of window WINDOW. |
91a9da753e30
(Fset_window_fringes): Clarify docstring.
Lute Kamstra <lute@gnu.org>
parents:
52852
diff
changeset
|
6609 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
|
6610 window. |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
6611 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
|
6612 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
|
6613 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
|
6614 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
|
6615 the command `set-fringe-style'. |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
6616 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
|
6617 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
|
6618 display marginal areas and the text area. */) |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6619 (window, left_width, right_width, outside_margins) |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6620 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
|
6621 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6622 struct window *w = decode_window (window); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6623 |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6624 if (!NILP (left_width)) |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6625 CHECK_NATNUM (left_width); |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6626 if (!NILP (right_width)) |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6627 CHECK_NATNUM (right_width); |
72663
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
6628 |
72438 | 6629 /* Do nothing on a tty. */ |
72437
bdd61b05f84f
(Fset_window_fringes): Do nothing on a tty.
Nick Roberts <nickrob@snap.net.nz>
parents:
71991
diff
changeset
|
6630 if (FRAME_WINDOW_P (WINDOW_XFRAME (w)) |
bdd61b05f84f
(Fset_window_fringes): Do nothing on a tty.
Nick Roberts <nickrob@snap.net.nz>
parents:
71991
diff
changeset
|
6631 && (!EQ (w->left_fringe_width, left_width) |
bdd61b05f84f
(Fset_window_fringes): Do nothing on a tty.
Nick Roberts <nickrob@snap.net.nz>
parents:
71991
diff
changeset
|
6632 || !EQ (w->right_fringe_width, right_width) |
bdd61b05f84f
(Fset_window_fringes): Do nothing on a tty.
Nick Roberts <nickrob@snap.net.nz>
parents:
71991
diff
changeset
|
6633 || !EQ (w->fringes_outside_margins, outside_margins))) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6634 { |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6635 w->left_fringe_width = left_width; |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6636 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
|
6637 w->fringes_outside_margins = outside_margins; |
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 adjust_window_margins (w); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6640 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6641 clear_glyph_matrix (w->current_matrix); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6642 w->window_end_valid = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6643 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6644 ++windows_or_buffers_changed; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6645 adjust_glyphs (XFRAME (WINDOW_FRAME (w))); |
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 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6648 return Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6649 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6650 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6651 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6652 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
|
6653 0, 1, 0, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6654 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
|
6655 If WINDOW is omitted or nil, use the currently selected window. |
53927 | 6656 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
|
6657 (window) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6658 Lisp_Object window; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6659 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6660 struct window *w = decode_window (window); |
72437
bdd61b05f84f
(Fset_window_fringes): Do nothing on a tty.
Nick Roberts <nickrob@snap.net.nz>
parents:
71991
diff
changeset
|
6661 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6662 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
|
6663 Fcons (make_number (WINDOW_RIGHT_FRINGE_WIDTH (w)), |
72437
bdd61b05f84f
(Fset_window_fringes): Do nothing on a tty.
Nick Roberts <nickrob@snap.net.nz>
parents:
71991
diff
changeset
|
6664 Fcons ((WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) |
bdd61b05f84f
(Fset_window_fringes): Do nothing on a tty.
Nick Roberts <nickrob@snap.net.nz>
parents:
71991
diff
changeset
|
6665 ? Qt : Qnil), Qnil))); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6666 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6667 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6668 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6669 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6670 /*********************************************************************** |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6671 Scroll bars |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6672 ***********************************************************************/ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6673 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6674 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
|
6675 2, 4, 0, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6676 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
|
6677 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
|
6678 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
|
6679 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
|
6680 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
|
6681 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
|
6682 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
|
6683 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
|
6684 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
|
6685 (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
|
6686 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
|
6687 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6688 struct window *w = decode_window (window); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6689 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6690 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
|
6691 { |
f3a76c43ac80
(Fset_window_scroll_bars): Don't use XINT if it isn't int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58441
diff
changeset
|
6692 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
|
6693 |
f3a76c43ac80
(Fset_window_scroll_bars): Don't use XINT if it isn't int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58441
diff
changeset
|
6694 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
|
6695 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
|
6696 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6697 |
78415
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
6698 if (!(NILP (vertical_type) |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6699 || 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
|
6700 || EQ (vertical_type, Qright) |
26d1a4665f6c
(Fset_window_scroll_bars): Validate the value of `vertical_type'.
Masatake YAMATO <jet@gyve.org>
parents:
52560
diff
changeset
|
6701 || EQ (vertical_type, Qt))) |
26d1a4665f6c
(Fset_window_scroll_bars): Validate the value of `vertical_type'.
Masatake YAMATO <jet@gyve.org>
parents:
52560
diff
changeset
|
6702 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
|
6703 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6704 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
|
6705 || !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
|
6706 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6707 w->scroll_bar_width = width; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6708 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
|
6709 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6710 adjust_window_margins (w); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6711 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6712 clear_glyph_matrix (w->current_matrix); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6713 w->window_end_valid = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6714 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6715 ++windows_or_buffers_changed; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6716 adjust_glyphs (XFRAME (WINDOW_FRAME (w))); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6717 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6718 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6719 return Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6720 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6721 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6722 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6723 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
|
6724 0, 1, 0, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6725 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
|
6726 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
|
6727 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
|
6728 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
|
6729 value. */) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6730 (window) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6731 Lisp_Object window; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6732 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6733 struct window *w = decode_window (window); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6734 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
|
6735 ? WINDOW_CONFIG_SCROLL_BAR_WIDTH (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6736 : WINDOW_SCROLL_BAR_AREA_WIDTH (w))), |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6737 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
|
6738 Fcons (w->vertical_scroll_bar_type, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6739 Fcons (Qnil, Qnil)))); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6740 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6741 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6742 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6743 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6744 /*********************************************************************** |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6745 Smooth scrolling |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6746 ***********************************************************************/ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6747 |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6748 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
|
6749 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
|
6750 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
|
6751 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
|
6752 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
|
6753 (window, pixels_p) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6754 Lisp_Object window, pixels_p; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6755 { |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6756 Lisp_Object result; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6757 struct frame *f; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6758 struct window *w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6759 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6760 if (NILP (window)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6761 window = selected_window; |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6762 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
6763 CHECK_WINDOW (window); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6764 w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6765 f = XFRAME (w->frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6766 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6767 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
|
6768 result = (NILP (pixels_p) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6769 ? 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
|
6770 : make_number (-w->vscroll)); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6771 else |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6772 result = make_number (0); |
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6773 return result; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6774 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6775 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6776 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6777 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
|
6778 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
|
6779 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
|
6780 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
|
6781 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
|
6782 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
|
6783 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
|
6784 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
|
6785 result of this rounding. |
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
6786 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
|
6787 (window, vscroll, pixels_p) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6788 Lisp_Object window, vscroll, pixels_p; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6789 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6790 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6791 struct frame *f; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6792 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6793 if (NILP (window)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6794 window = selected_window; |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6795 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
6796 CHECK_WINDOW (window); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
6797 CHECK_NUMBER_OR_FLOAT (vscroll); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6798 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6799 w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6800 f = XFRAME (w->frame); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6801 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6802 if (FRAME_WINDOW_P (f)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6803 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6804 int old_dy = w->vscroll; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6805 |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6806 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
|
6807 ? 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
|
6808 : XFLOATINT (vscroll)); |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6809 w->vscroll = min (w->vscroll, 0); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6810 |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6811 if (w->vscroll != old_dy) |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6812 { |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6813 /* 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
|
6814 area becomes larger than before. */ |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6815 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
|
6816 adjust_glyphs (f); |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6817 |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6818 /* Prevent redisplay shortcuts. */ |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6819 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
|
6820 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6821 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6822 |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6823 return Fwindow_vscroll (window, pixels_p); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6824 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6825 |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6826 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6827 /* 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
|
6828 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
|
6829 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
|
6830 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6831 void |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6832 foreach_window (f, fn, user_data) |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6833 struct frame *f; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6834 int (* fn) P_ ((struct window *, void *)); |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6835 void *user_data; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6836 { |
70736
6e5b403b5586
(foreach_window): Check WINDOWP (FRAME_ROOT_WINDOW (f)).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70155
diff
changeset
|
6837 /* Fdelete_frame may set FRAME_ROOT_WINDOW (f) to Qnil. */ |
6e5b403b5586
(foreach_window): Check WINDOWP (FRAME_ROOT_WINDOW (f)).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70155
diff
changeset
|
6838 if (WINDOWP (FRAME_ROOT_WINDOW (f))) |
6e5b403b5586
(foreach_window): Check WINDOWP (FRAME_ROOT_WINDOW (f)).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70155
diff
changeset
|
6839 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
|
6840 } |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6841 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6842 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6843 /* 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
|
6844 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
|
6845 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
|
6846 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
|
6847 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6848 static int |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6849 foreach_window_1 (w, fn, user_data) |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6850 struct window *w; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6851 int (* fn) P_ ((struct window *, void *)); |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6852 void *user_data; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6853 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6854 int cont; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6855 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6856 for (cont = 1; w && cont;) |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6857 { |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6858 if (!NILP (w->hchild)) |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6859 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
|
6860 else if (!NILP (w->vchild)) |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6861 cont = foreach_window_1 (XWINDOW (w->vchild), fn, user_data); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6862 else |
30366
8dd313fc287d
(foreach_window_1): Fix typo reversing an if-condition.
Gerd Moellmann <gerd@gnu.org>
parents:
30362
diff
changeset
|
6863 cont = fn (w, user_data); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6864 |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6865 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6866 } |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6867 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6868 return cont; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6869 } |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6870 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6871 |
39952 | 6872 /* 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
|
6873 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
|
6874 the window start. */ |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6875 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6876 static int |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6877 freeze_window_start (w, freeze_p) |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6878 struct window *w; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6879 void *freeze_p; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6880 { |
84376
584ae8393da8
(freeze_window_start): Don't presume selected_window holds a window object.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84357
diff
changeset
|
6881 if (MINI_WINDOW_P (w) |
584ae8393da8
(freeze_window_start): Don't presume selected_window holds a window object.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84357
diff
changeset
|
6882 || (WINDOWP (selected_window) /* Can be nil in corner cases. */ |
584ae8393da8
(freeze_window_start): Don't presume selected_window holds a window object.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84357
diff
changeset
|
6883 && (w == XWINDOW (selected_window) |
584ae8393da8
(freeze_window_start): Don't presume selected_window holds a window object.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84357
diff
changeset
|
6884 || (MINI_WINDOW_P (XWINDOW (selected_window)) |
584ae8393da8
(freeze_window_start): Don't presume selected_window holds a window object.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84357
diff
changeset
|
6885 && ! NILP (Vminibuf_scroll_window) |
584ae8393da8
(freeze_window_start): Don't presume selected_window holds a window object.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84357
diff
changeset
|
6886 && w == XWINDOW (Vminibuf_scroll_window))))) |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6887 freeze_p = NULL; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6888 |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6889 w->frozen_window_start_p = freeze_p != NULL; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6890 return 1; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6891 } |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6892 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6893 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6894 /* 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
|
6895 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
|
6896 means freeze the window start. */ |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6897 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6898 void |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6899 freeze_window_starts (f, freeze_p) |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6900 struct frame *f; |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6901 int freeze_p; |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6902 { |
31903
3e0a1f91c149
(freeze_window_starts): Construct last argument for
Gerd Moellmann <gerd@gnu.org>
parents:
31829
diff
changeset
|
6903 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
|
6904 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6905 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6906 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6907 /*********************************************************************** |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6908 Initialization |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6909 ***********************************************************************/ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6910 |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6911 /* Return 1 if window configurations C1 and C2 |
95550
e057f981a6b5
(Fset_window_parameter): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
95547
diff
changeset
|
6912 describe the same state of affairs. This is used by Fequal. */ |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6913 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6914 int |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6915 compare_window_configurations (c1, c2, ignore_positions) |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6916 Lisp_Object c1, c2; |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6917 int ignore_positions; |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6918 { |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6919 register struct save_window_data *d1, *d2; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6920 struct Lisp_Vector *sw1, *sw2; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6921 int i; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6922 |
71844
632e73258d36
(Fwindow_configuration_frame, Fset_window_configuration):
Kim F. Storm <storm@cua.dk>
parents:
71717
diff
changeset
|
6923 CHECK_WINDOW_CONFIGURATION (c1); |
632e73258d36
(Fwindow_configuration_frame, Fset_window_configuration):
Kim F. Storm <storm@cua.dk>
parents:
71717
diff
changeset
|
6924 CHECK_WINDOW_CONFIGURATION (c2); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6925 |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6926 d1 = (struct save_window_data *) XVECTOR (c1); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6927 d2 = (struct save_window_data *) XVECTOR (c2); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6928 sw1 = XVECTOR (d1->saved_windows); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6929 sw2 = XVECTOR (d2->saved_windows); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6930 |
86162
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
6931 if (d1->frame_cols != d2->frame_cols) |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6932 return 0; |
86162
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
6933 if (d1->frame_lines != d2->frame_lines) |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6934 return 0; |
86162
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
6935 if (d1->frame_menu_bar_lines != d2->frame_menu_bar_lines) |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6936 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6937 if (! EQ (d1->selected_frame, d2->selected_frame)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6938 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6939 /* Don't compare the current_window field directly. |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6940 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
|
6941 if (! EQ (d1->current_buffer, d2->current_buffer)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6942 return 0; |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6943 if (! ignore_positions) |
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
6944 { |
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
6945 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
|
6946 return 0; |
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
6947 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
|
6948 return 0; |
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
6949 } |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6950 /* Don't compare the root_window field. |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6951 We don't require the two configurations |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6952 to use the same window object, |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6953 and the two root windows must be equivalent |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6954 if everything else compares equal. */ |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6955 if (! EQ (d1->focus_frame, d2->focus_frame)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6956 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6957 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6958 /* 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
|
6959 if (sw1->size != sw2->size) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6960 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6961 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6962 for (i = 0; i < sw1->size; i++) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6963 { |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6964 struct saved_window *p1, *p2; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6965 int w1_is_current, w2_is_current; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6966 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6967 p1 = SAVED_WINDOW_N (sw1, i); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6968 p2 = SAVED_WINDOW_N (sw2, i); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6969 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6970 /* Verify that the current windows in the two |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6971 configurations correspond to each other. */ |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6972 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
|
6973 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
|
6974 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6975 if (w1_is_current != w2_is_current) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6976 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6977 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6978 /* Verify that the corresponding windows do match. */ |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6979 if (! EQ (p1->buffer, p2->buffer)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6980 return 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6981 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
|
6982 return 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6983 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
|
6984 return 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6985 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
|
6986 return 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6987 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
|
6988 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6989 if (! EQ (p1->display_table, p2->display_table)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6990 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6991 if (! EQ (p1->parent, p2->parent)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6992 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6993 if (! EQ (p1->prev, p2->prev)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6994 return 0; |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6995 if (! ignore_positions) |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6996 { |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6997 if (! EQ (p1->hscroll, p2->hscroll)) |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
6998 return 0; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
6999 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
|
7000 return 0; |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7001 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
|
7002 return 0; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7003 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
|
7004 return 0; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7005 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
|
7006 return 0; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7007 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
|
7008 return 0; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7009 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7010 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
|
7011 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7012 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
|
7013 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7014 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
|
7015 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7016 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
|
7017 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7018 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
|
7019 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7020 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
|
7021 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7022 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
|
7023 return 0; |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7024 } |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7025 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7026 return 1; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7027 } |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7028 |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7029 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
|
7030 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
|
7031 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
|
7032 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
|
7033 and scrolling positions. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
7034 (x, y) |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7035 Lisp_Object x, y; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7036 { |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7037 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
|
7038 return Qt; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7039 return Qnil; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7040 } |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7041 |
21514 | 7042 void |
265 | 7043 init_window_once () |
7044 { | |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83005
diff
changeset
|
7045 struct frame *f = make_initial_frame (); |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
7046 XSETFRAME (selected_frame, f); |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
7047 Vterminal_frame = selected_frame; |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
7048 minibuf_window = f->minibuffer_window; |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
7049 selected_window = f->selected_window; |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
7050 last_nonminibuf_frame = f; |
14445
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
7051 |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
7052 window_initialized = 1; |
265 | 7053 } |
7054 | |
21514 | 7055 void |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
7056 init_window () |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
7057 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
7058 Vwindow_list = Qnil; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
7059 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
7060 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
7061 void |
265 | 7062 syms_of_window () |
7063 { | |
69209
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
7064 Qscroll_up = intern ("scroll-up"); |
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
7065 staticpro (&Qscroll_up); |
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
7066 |
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
7067 Qscroll_down = intern ("scroll-down"); |
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
7068 staticpro (&Qscroll_down); |
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
7069 |
25540
2b4bdd114899
(Qwindow_size_fixed): Replaces Qfixed_window_size.
Gerd Moellmann <gerd@gnu.org>
parents:
25517
diff
changeset
|
7070 Qwindow_size_fixed = intern ("window-size-fixed"); |
2b4bdd114899
(Qwindow_size_fixed): Replaces Qfixed_window_size.
Gerd Moellmann <gerd@gnu.org>
parents:
25517
diff
changeset
|
7071 staticpro (&Qwindow_size_fixed); |
61755
71259596d397
(window_size_fixed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
61635
diff
changeset
|
7072 Fset (Qwindow_size_fixed, Qnil); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
7073 |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
7074 staticpro (&Qwindow_configuration_change_hook); |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
7075 Qwindow_configuration_change_hook |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
7076 = intern ("window-configuration-change-hook"); |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
7077 |
265 | 7078 Qwindowp = intern ("windowp"); |
7079 staticpro (&Qwindowp); | |
7080 | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
7081 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
|
7082 staticpro (&Qwindow_configuration_p); |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
7083 |
2210
22d78dbb3cc7
Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents:
2190
diff
changeset
|
7084 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
|
7085 staticpro (&Qwindow_live_p); |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
7086 |
95590
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95566
diff
changeset
|
7087 Qdisplay_buffer = intern ("display-buffer"); |
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95566
diff
changeset
|
7088 staticpro (&Qdisplay_buffer); |
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95566
diff
changeset
|
7089 |
11405
645e3883da72
(temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents:
11307
diff
changeset
|
7090 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
|
7091 staticpro (&Qtemp_buffer_show_hook); |
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
7092 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
7093 staticpro (&Vwindow_list); |
43597
8097923cfe85
(syms_of_window): Initialize minibuf_selected_window.
Kim F. Storm <storm@cua.dk>
parents:
43594
diff
changeset
|
7094 |
8097923cfe85
(syms_of_window): Initialize minibuf_selected_window.
Kim F. Storm <storm@cua.dk>
parents:
43594
diff
changeset
|
7095 minibuf_selected_window = Qnil; |
43594
23cddac4d0b7
(minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents:
43571
diff
changeset
|
7096 staticpro (&minibuf_selected_window); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
7097 |
95566
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
7098 window_scroll_pixel_based_preserve_x = -1; |
69408
aa89c5390b12
Rename preserve_y to window_scroll_pixel_based_preserve_y.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69342
diff
changeset
|
7099 window_scroll_pixel_based_preserve_y = -1; |
95566
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
7100 window_scroll_preserve_hpos = -1; |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
7101 window_scroll_preserve_vpos = -1; |
69342
12e65aa88734
Declare preserve_y as a static global variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69209
diff
changeset
|
7102 |
265 | 7103 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
|
7104 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
|
7105 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
|
7106 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
|
7107 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
|
7108 the buffer; `temp-buffer-show-hook' is not run unless this function runs it. */); |
265 | 7109 Vtemp_buffer_show_function = Qnil; |
7110 | |
7111 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
|
7112 doc: /* Non-nil means it is the window that C-M-v in minibuffer should scroll. */); |
265 | 7113 Vminibuf_scroll_window = Qnil; |
7114 | |
43281
a4ea76de57c9
(Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents:
43241
diff
changeset
|
7115 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
|
7116 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
|
7117 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
|
7118 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
|
7119 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
|
7120 |
265 | 7121 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
|
7122 doc: /* If non-nil, this is a buffer and \\[scroll-other-window] should scroll its window. */); |
265 | 7123 Vother_window_scroll_buffer = Qnil; |
7124 | |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
7125 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
|
7126 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
|
7127 auto_window_vscroll_p = 1; |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
7128 |
265 | 7129 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
|
7130 doc: /* *Number of lines of continuity when scrolling by screenfuls. */); |
265 | 7131 next_screen_context_lines = 2; |
7132 | |
7133 DEFVAR_INT ("window-min-height", &window_min_height, | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
7134 doc: /* Allow deleting windows less than this tall. |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
7135 The value is measured in line units. If a window wants a modeline it |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
7136 is counted as one line. |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
7137 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
7138 Emacs honors settings of this variable when enlarging or shrinking |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
7139 windows vertically. A value less than 1 is invalid. */); |
265 | 7140 window_min_height = 4; |
7141 | |
7142 DEFVAR_INT ("window-min-width", &window_min_width, | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
7143 doc: /* Allow deleting windows less than this wide. |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
7144 The value is measured in characters and includes any fringes or |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
7145 the scrollbar. |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
7146 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
7147 Emacs honors settings of this variable when enlarging or shrinking |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
7148 windows horizontally. A value less than 2 is invalid. */); |
265 | 7149 window_min_width = 10; |
7150 | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
7151 DEFVAR_LISP ("scroll-preserve-screen-position", |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
7152 &Vscroll_preserve_screen_position, |
95566
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
7153 doc: /* *Controls if scroll commands move point to keep its screen position unchanged. |
63865
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
7154 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
|
7155 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
|
7156 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
|
7157 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
|
7158 by full screens. |
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
7159 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
|
7160 Vscroll_preserve_screen_position = Qnil; |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
7161 |
95777
edc51d72cb17
* window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
7162 DEFVAR_LISP ("window-point-insertion-type", &Vwindow_point_insertion_type, |
edc51d72cb17
* window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
7163 doc: /* Type of marker to use for `window-point'. */); |
edc51d72cb17
* window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
7164 Vwindow_point_insertion_type = Qnil; |
edc51d72cb17
* window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
7165 |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
7166 DEFVAR_LISP ("window-configuration-change-hook", |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
7167 &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
|
7168 doc: /* Functions to call when window configuration changes. |
93068
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
7169 The buffer-local part is run once per window, with the relevant window |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
7170 selected; while the global part is run only once for the modified frame, |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
7171 with the relevant frame selected. */); |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
7172 Vwindow_configuration_change_hook = Qnil; |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
7173 |
265 | 7174 defsubr (&Sselected_window); |
7175 defsubr (&Sminibuffer_window); | |
7176 defsubr (&Swindow_minibuffer_p); | |
7177 defsubr (&Swindowp); | |
2210
22d78dbb3cc7
Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents:
2190
diff
changeset
|
7178 defsubr (&Swindow_live_p); |
265 | 7179 defsubr (&Spos_visible_in_window_p); |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
7180 defsubr (&Swindow_line_height); |
265 | 7181 defsubr (&Swindow_buffer); |
7182 defsubr (&Swindow_height); | |
7183 defsubr (&Swindow_width); | |
78415
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
7184 defsubr (&Swindow_full_width_p); |
265 | 7185 defsubr (&Swindow_hscroll); |
7186 defsubr (&Sset_window_hscroll); | |
13457
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
7187 defsubr (&Swindow_redisplay_end_trigger); |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
7188 defsubr (&Sset_window_redisplay_end_trigger); |
265 | 7189 defsubr (&Swindow_edges); |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
7190 defsubr (&Swindow_pixel_edges); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
7191 defsubr (&Swindow_inside_edges); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
7192 defsubr (&Swindow_inside_pixel_edges); |
432 | 7193 defsubr (&Scoordinates_in_window_p); |
7194 defsubr (&Swindow_at); | |
265 | 7195 defsubr (&Swindow_point); |
7196 defsubr (&Swindow_start); | |
7197 defsubr (&Swindow_end); | |
7198 defsubr (&Sset_window_point); | |
7199 defsubr (&Sset_window_start); | |
7200 defsubr (&Swindow_dedicated_p); | |
722
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
7201 defsubr (&Sset_window_dedicated_p); |
265 | 7202 defsubr (&Swindow_display_table); |
7203 defsubr (&Sset_window_display_table); | |
7204 defsubr (&Snext_window); | |
7205 defsubr (&Sprevious_window); | |
7206 defsubr (&Sother_window); | |
7207 defsubr (&Sget_lru_window); | |
7208 defsubr (&Sget_largest_window); | |
7209 defsubr (&Sget_buffer_window); | |
7210 defsubr (&Sdelete_other_windows); | |
7211 defsubr (&Sdelete_windows_on); | |
7212 defsubr (&Sreplace_buffer_in_windows); | |
7213 defsubr (&Sdelete_window); | |
7214 defsubr (&Sset_window_buffer); | |
7215 defsubr (&Sselect_window); | |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
7216 defsubr (&Sforce_window_update); |
265 | 7217 defsubr (&Ssplit_window); |
7218 defsubr (&Senlarge_window); | |
7219 defsubr (&Sshrink_window); | |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
7220 defsubr (&Sadjust_window_trailing_edge); |
265 | 7221 defsubr (&Sscroll_up); |
7222 defsubr (&Sscroll_down); | |
7223 defsubr (&Sscroll_left); | |
7224 defsubr (&Sscroll_right); | |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
7225 defsubr (&Sother_window_for_scrolling); |
265 | 7226 defsubr (&Sscroll_other_window); |
43624
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
7227 defsubr (&Sminibuffer_selected_window); |
265 | 7228 defsubr (&Srecenter); |
34416
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
7229 defsubr (&Swindow_text_height); |
265 | 7230 defsubr (&Smove_to_window_line); |
7231 defsubr (&Swindow_configuration_p); | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
7232 defsubr (&Swindow_configuration_frame); |
265 | 7233 defsubr (&Sset_window_configuration); |
7234 defsubr (&Scurrent_window_configuration); | |
7235 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
|
7236 defsubr (&Swindow_tree); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
7237 defsubr (&Sset_window_margins); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
7238 defsubr (&Swindow_margins); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7239 defsubr (&Sset_window_fringes); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7240 defsubr (&Swindow_fringes); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7241 defsubr (&Sset_window_scroll_bars); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7242 defsubr (&Swindow_scroll_bars); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
7243 defsubr (&Swindow_vscroll); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
7244 defsubr (&Sset_window_vscroll); |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7245 defsubr (&Scompare_window_configurations); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
7246 defsubr (&Swindow_list); |
95547
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
7247 defsubr (&Swindow_parameters); |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
7248 defsubr (&Swindow_parameter); |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
7249 defsubr (&Sset_window_parameter); |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
7250 |
265 | 7251 } |
7252 | |
21514 | 7253 void |
265 | 7254 keys_of_window () |
7255 { | |
7256 initial_define_key (control_x_map, '1', "delete-other-windows"); | |
7257 initial_define_key (control_x_map, '2', "split-window"); | |
7258 initial_define_key (control_x_map, '0', "delete-window"); | |
7259 initial_define_key (control_x_map, 'o', "other-window"); | |
7260 initial_define_key (control_x_map, '^', "enlarge-window"); | |
7261 initial_define_key (control_x_map, '<', "scroll-left"); | |
7262 initial_define_key (control_x_map, '>', "scroll-right"); | |
7263 | |
7264 initial_define_key (global_map, Ctl ('V'), "scroll-up"); | |
7265 initial_define_key (meta_map, Ctl ('V'), "scroll-other-window"); | |
7266 initial_define_key (meta_map, 'v', "scroll-down"); | |
7267 | |
7268 initial_define_key (global_map, Ctl('L'), "recenter"); | |
7269 initial_define_key (meta_map, 'r', "move-to-window-line"); | |
7270 } | |
52401 | 7271 |
7272 /* arch-tag: 90a9c576-0590-48f1-a5f1-6c96a0452d9f | |
7273 (do not change this comment) */ |