Mercurial > emacs
annotate src/window.c @ 103641:48d529d3a5a4
bug#1849 - Windows 7 Taskbar Support
* w32term.c (w32_initialize): Use GetModuleHandle for library that
is already loaded.
Set user model ID if supported (bug#1849).
* runemacs.c (set_user_model_id): New function.
(WinMain): Use it.
* emacsclient.c (w32_give_focus): Use GetModuleHandle for library
that is already loaded.
(w32_set_user_model_id): New function.
(main): Use it to associate emacsclient with emacs (bug#1849).
author | Jason Rumney <jasonr@gnu.org> |
---|---|
date | Tue, 30 Jun 2009 15:48:23 +0000 |
parents | f52eb7cf1c20 |
children | 60888a525c1b |
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, |
100951 | 4 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
79759 | 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 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96361
diff
changeset
|
49 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96361
diff
changeset
|
50 #include "nsterm.h" |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96361
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; |
103557
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
196 |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
197 /* If non-nil, then the `recenter' command with a nil argument |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
198 the entire frame to be redrawn; the special value `tty' causes the |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
199 frame to be redrawn only if it is a tty frame. */ |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
200 |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
201 static Lisp_Object Vrecenter_redisplay; |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
202 extern Lisp_Object Qtty; |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
203 |
265 | 204 |
205 DEFUN ("windowp", Fwindowp, Swindowp, 1, 1, 0, | |
99189
dc2662d377a4
* window.c (Fwindowp, Fwindow_live_p, Fwindow_minibuffer_p)
Juanma Barranquero <lekktu@gmail.com>
parents:
99160
diff
changeset
|
206 doc: /* Return t if OBJECT is a window. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
207 (object) |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
208 Lisp_Object object; |
265 | 209 { |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
210 return WINDOWP (object) ? Qt : Qnil; |
265 | 211 } |
212 | |
2210
22d78dbb3cc7
Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents:
2190
diff
changeset
|
213 DEFUN ("window-live-p", Fwindow_live_p, Swindow_live_p, 1, 1, 0, |
99189
dc2662d377a4
* window.c (Fwindowp, Fwindow_live_p, Fwindow_minibuffer_p)
Juanma Barranquero <lekktu@gmail.com>
parents:
99160
diff
changeset
|
214 doc: /* Return 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
|
215 (object) |
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
216 Lisp_Object object; |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
217 { |
35398
ef34ddc12a7d
* window.c (Fwindow_live_p): Use WINDOW_LIVE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
35396
diff
changeset
|
218 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
|
219 } |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
220 |
265 | 221 Lisp_Object |
222 make_window () | |
223 { | |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
224 Lisp_Object val; |
265 | 225 register struct window *p; |
36432
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
226 |
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
227 p = allocate_window (); |
58265
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
228 ++sequence_number; |
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
229 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
|
230 XSETFASTINT (p->left_col, 0); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
231 XSETFASTINT (p->top_line, 0); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
232 XSETFASTINT (p->total_lines, 0); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
233 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
|
234 XSETFASTINT (p->hscroll, 0); |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
235 XSETFASTINT (p->min_hscroll, 0); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
236 p->orig_top_line = p->orig_total_lines = Qnil; |
265 | 237 p->start = Fmake_marker (); |
238 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
|
239 XSETFASTINT (p->use_time, 0); |
769 | 240 p->frame = Qnil; |
265 | 241 p->display_table = Qnil; |
242 p->dedicated = Qnil; | |
95547
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
243 p->window_parameters = Qnil; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
244 p->pseudo_window_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
245 bzero (&p->cursor, sizeof (p->cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
246 bzero (&p->last_cursor, sizeof (p->last_cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
247 bzero (&p->phys_cursor, sizeof (p->phys_cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
248 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
|
249 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
|
250 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
|
251 p->phys_cursor_width = -1; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
252 p->must_be_updated_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
253 XSETFASTINT (p->window_end_vpos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
254 XSETFASTINT (p->window_end_pos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
255 p->window_end_valid = Qnil; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
256 p->vscroll = 0; |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
257 XSETWINDOW (val, p); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
258 XSETFASTINT (p->last_point, 0); |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
259 p->frozen_window_start_p = 0; |
44744
8c52c2bf3b3f
(make_window): Initialize height_fixed_p,
Richard M. Stallman <rms@gnu.org>
parents:
44649
diff
changeset
|
260 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
|
261 p->left_margin_cols = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
262 p->right_margin_cols = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
263 p->left_fringe_width = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
264 p->right_fringe_width = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
265 p->fringes_outside_margins = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
266 p->scroll_bar_width = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
267 p->vertical_scroll_bar_type = Qt; |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
268 p->resize_proportionally = Qnil; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
269 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
270 Vwindow_list = Qnil; |
265 | 271 return val; |
272 } | |
273 | |
274 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
|
275 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
|
276 () |
265 | 277 { |
278 return selected_window; | |
279 } | |
280 | |
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
281 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
|
282 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
|
283 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
|
284 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
|
285 (frame) |
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
286 Lisp_Object frame; |
265 | 287 { |
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
288 if (NILP (frame)) |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
289 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
290 CHECK_LIVE_FRAME (frame); |
1123
55e605674fb1
* window.c (minibuffer_window): Accept an optional FRAME argument;
Jim Blandy <jimb@redhat.com>
parents:
1049
diff
changeset
|
291 return FRAME_MINIBUF_WINDOW (XFRAME (frame)); |
265 | 292 } |
293 | |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
294 DEFUN ("window-minibuffer-p", Fwindow_minibuffer_p, Swindow_minibuffer_p, 0, 1, 0, |
99189
dc2662d377a4
* window.c (Fwindowp, Fwindow_live_p, Fwindow_minibuffer_p)
Juanma Barranquero <lekktu@gmail.com>
parents:
99160
diff
changeset
|
295 doc: /* Return non-nil if WINDOW is a minibuffer window. |
53703
7e4022bbad27
(Fwindow_minibuffer_p): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53492
diff
changeset
|
296 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
|
297 (window) |
265 | 298 Lisp_Object window; |
299 { | |
300 struct window *w = decode_window (window); | |
32871
361743be1fa8
(pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
32824
diff
changeset
|
301 return MINI_WINDOW_P (w) ? Qt : Qnil; |
32710
cd7dca826a03
(pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents:
32426
diff
changeset
|
302 } |
cd7dca826a03
(pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents:
32426
diff
changeset
|
303 |
cd7dca826a03
(pos_fully_visible_in_window_p):
Miles Bader <miles@gnu.org>
parents:
32426
diff
changeset
|
304 |
265 | 305 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
|
306 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
|
307 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
|
308 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
|
309 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
|
310 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
|
311 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
|
312 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
|
313 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
|
314 |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
315 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
|
316 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
|
317 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
|
318 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
|
319 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
|
320 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
|
321 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
|
322 (pos, window, partially) |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
323 Lisp_Object pos, window, partially; |
265 | 324 { |
325 register struct window *w; | |
326 register int posint; | |
327 register struct buffer *buf; | |
25300
096b78b6cc2e
(Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
25268
diff
changeset
|
328 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
|
329 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
|
330 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
|
331 int x, y; |
265 | 332 |
32937 | 333 w = decode_window (window); |
334 buf = XBUFFER (w->buffer); | |
335 SET_TEXT_POS_FROM_MARKER (top, w->start); | |
336 | |
73013
6ebbc42247b3
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72998
diff
changeset
|
337 if (EQ (pos, Qt)) |
6ebbc42247b3
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72998
diff
changeset
|
338 posint = -1; |
6ebbc42247b3
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72998
diff
changeset
|
339 else if (!NILP (pos)) |
265 | 340 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
341 CHECK_NUMBER_COERCE_MARKER (pos); |
265 | 342 posint = XINT (pos); |
343 } | |
32937 | 344 else if (w == XWINDOW (selected_window)) |
345 posint = PT; | |
346 else | |
347 posint = XMARKER (w->pointm)->charpos; | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
348 |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
349 /* 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
|
350 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
|
351 if ((EQ (pos, Qt) |
6ebbc42247b3
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72998
diff
changeset
|
352 || (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
|
353 && 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
|
354 && 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
|
355 && 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
|
356 && (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
|
357 in_window = Qt; |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
358 |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
359 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
|
360 { |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
361 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
|
362 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
|
363 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
|
364 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
|
365 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
|
366 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
|
367 } |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
368 |
25300
096b78b6cc2e
(Fpos_visible_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
25268
diff
changeset
|
369 return in_window; |
265 | 370 } |
32871
361743be1fa8
(pos_fully_visible_p): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
32824
diff
changeset
|
371 |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
372 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
|
373 Swindow_line_height, 0, 2, 0, |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
374 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
|
375 If WINDOW is nil or omitted, use selected window. |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
376 |
72990
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
377 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
|
378 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
|
379 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
|
380 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
|
381 |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
382 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
|
383 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
|
384 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
|
385 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
|
386 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
|
387 of the (first) text line, YPOS is negative. |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
388 |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
389 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
|
390 `pos-visible-in-window-p' to obtain the information. */) |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
391 (line, window) |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
392 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
|
393 { |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
394 register struct window *w; |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
395 register struct buffer *b; |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
396 struct glyph_row *row, *end_row; |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
397 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
|
398 |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
399 w = decode_window (window); |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
400 |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
401 if (noninteractive |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
402 || w->pseudo_window_p) |
72990
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
403 return Qnil; |
72907
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
404 |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
405 CHECK_BUFFER (w->buffer); |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
406 b = XBUFFER (w->buffer); |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
407 |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
408 /* 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
|
409 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
|
410 || current_buffer->clip_changed |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
411 || 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
|
412 || 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
|
413 || 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
|
414 return Qnil; |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
415 |
72990
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
416 if (NILP (line)) |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
417 { |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
418 i = w->cursor.vpos; |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
419 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
|
420 || (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
|
421 return Qnil; |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
422 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
|
423 goto found_row; |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
424 } |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
425 |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
426 if (EQ (line, Qheader_line)) |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
427 { |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
428 if (!WINDOW_WANTS_HEADER_LINE_P (w)) |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
429 return Qnil; |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
430 row = MATRIX_HEADER_LINE_ROW (w->current_matrix); |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
431 if (!row->enabled_p) |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
432 return Qnil; |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
433 return list4 (make_number (row->height), |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
434 make_number (0), make_number (0), |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
435 make_number (0)); |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
436 } |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
437 |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
438 if (EQ (line, Qmode_line)) |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
439 { |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
440 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
|
441 if (!row->enabled_p) |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
442 return Qnil; |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
443 return list4 (make_number (row->height), |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
444 make_number (0), /* not accurate */ |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
445 make_number (WINDOW_HEADER_LINE_HEIGHT (w) |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
446 + window_text_bottom_y (w)), |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
447 make_number (0)); |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
448 } |
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 CHECK_NUMBER (line); |
72990
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
451 n = XINT (line); |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
452 |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
453 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
454 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
|
455 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
|
456 i = 0; |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
457 |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
458 while ((n < 0 || i < n) |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
459 && row <= end_row && row->enabled_p |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
460 && row->y + row->height < max_y) |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
461 row++, i++; |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
462 |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
463 if (row > end_row || !row->enabled_p) |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
464 return Qnil; |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
465 |
72990
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
466 if (++n < 0) |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
467 { |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
468 if (-n > i) |
72907
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
469 return Qnil; |
72990
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
470 row += n; |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
471 i += n; |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
472 } |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
473 |
2d3156eeb678
(Fset_window_hscroll, Fpos_visible_in_window_p):
Kim F. Storm <storm@cua.dk>
parents:
72955
diff
changeset
|
474 found_row: |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
475 crop = max (0, (row->y + row->height) - max_y); |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
476 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
|
477 make_number (i), |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
478 make_number (row->y), |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
479 make_number (crop)); |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
480 } |
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
481 |
72907
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
482 |
265 | 483 |
484 static struct window * | |
485 decode_window (window) | |
486 register Lisp_Object window; | |
487 { | |
485 | 488 if (NILP (window)) |
265 | 489 return XWINDOW (selected_window); |
490 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
491 CHECK_LIVE_WINDOW (window); |
265 | 492 return XWINDOW (window); |
493 } | |
494 | |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
495 static struct window * |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
496 decode_any_window (window) |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
497 register Lisp_Object window; |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
498 { |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
499 if (NILP (window)) |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
500 return XWINDOW (selected_window); |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
501 |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
502 CHECK_WINDOW (window); |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
503 return XWINDOW (window); |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
504 } |
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
505 |
265 | 506 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
|
507 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
|
508 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
|
509 (window) |
265 | 510 Lisp_Object window; |
511 { | |
512 return decode_window (window)->buffer; | |
513 } | |
514 | |
515 DEFUN ("window-height", Fwindow_height, Swindow_height, 0, 1, 0, | |
99210
ce3730476c2a
(Fwindow_height, Fdelete_window, set_window_buffer)
Martin Rudalics <rudalics@gmx.at>
parents:
99189
diff
changeset
|
516 doc: /* Return the number of lines in WINDOW. |
ce3730476c2a
(Fwindow_height, Fdelete_window, set_window_buffer)
Martin Rudalics <rudalics@gmx.at>
parents:
99189
diff
changeset
|
517 WINDOW defaults to the selected window. |
ce3730476c2a
(Fwindow_height, Fdelete_window, set_window_buffer)
Martin Rudalics <rudalics@gmx.at>
parents:
99189
diff
changeset
|
518 |
ce3730476c2a
(Fwindow_height, Fdelete_window, set_window_buffer)
Martin Rudalics <rudalics@gmx.at>
parents:
99189
diff
changeset
|
519 The return value includes WINDOW's mode line and header line, if any. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
520 (window) |
265 | 521 Lisp_Object window; |
522 { | |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
523 return decode_any_window (window)->total_lines; |
265 | 524 } |
525 | |
526 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
|
527 doc: /* Return the number of display columns in WINDOW. |
98829
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
528 WINDOW defaults to the selected window. |
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
529 |
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
530 Note: The return value is the number of columns available for text in |
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
531 WINDOW. If you want to find out how many columns WINDOW takes up, use |
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
532 (let ((edges (window-edges))) (- (nth 2 edges) (nth 0 edges))). */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
533 (window) |
265 | 534 Lisp_Object window; |
535 { | |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
536 return make_number (window_box_text_cols (decode_any_window (window))); |
265 | 537 } |
538 | |
78415
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
539 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
|
540 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
|
541 WINDOW defaults to the selected window. */) |
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
542 (window) |
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
543 Lisp_Object window; |
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
544 { |
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
545 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
|
546 } |
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
547 |
265 | 548 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
|
549 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
|
550 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
|
551 (window) |
265 | 552 Lisp_Object window; |
553 { | |
554 return decode_window (window)->hscroll; | |
555 } | |
556 | |
557 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
|
558 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
|
559 Return NCOL. NCOL should be zero or positive. |
45645
6e2471fb2c1c
(Fset_window_hscroll): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
45584
diff
changeset
|
560 |
6e2471fb2c1c
(Fset_window_hscroll): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
45584
diff
changeset
|
561 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
|
562 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
|
563 (window, ncol) |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
564 Lisp_Object window, ncol; |
265 | 565 { |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
566 struct window *w = decode_window (window); |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
567 int hscroll; |
265 | 568 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
569 CHECK_NUMBER (ncol); |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
570 hscroll = max (0, XINT (ncol)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
571 |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
572 /* Prevent redisplay shortcuts when changing the hscroll. */ |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
573 if (XINT (w->hscroll) != hscroll) |
25375 | 574 XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
575 |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
576 w->hscroll = make_number (hscroll); |
265 | 577 return ncol; |
578 } | |
579 | |
13457
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
580 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
|
581 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
|
582 doc: /* Return WINDOW's redisplay end trigger value. |
75753
5e34b32b9b4c
(Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents:
75348
diff
changeset
|
583 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
|
584 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
|
585 (window) |
13457
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
586 Lisp_Object window; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
587 { |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
588 return decode_window (window)->redisplay_end_trigger; |
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 |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
591 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
|
592 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
|
593 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
|
594 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
|
595 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
|
596 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
|
597 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
|
598 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
|
599 (window, value) |
13457
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
600 register Lisp_Object window, value; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
601 { |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
602 register struct window *w; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
603 |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
604 w = decode_window (window); |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
605 w->redisplay_end_trigger = value; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
606 return value; |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
607 } |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
608 |
265 | 609 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
|
610 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
|
611 \(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
|
612 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
|
613 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
|
614 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
|
615 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
|
616 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
|
617 (window) |
265 | 618 Lisp_Object window; |
619 { | |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
620 register struct window *w = decode_any_window (window); |
265 | 621 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
622 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
|
623 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
|
624 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
|
625 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
|
626 Qnil)))); |
265 | 627 } |
628 | |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
629 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
|
630 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
|
631 \(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
|
632 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
|
633 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
|
634 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
|
635 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
|
636 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
|
637 (window) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
638 Lisp_Object window; |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
639 { |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
640 register struct window *w = decode_any_window (window); |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
641 |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
642 return Fcons (make_number (WINDOW_LEFT_EDGE_X (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
643 Fcons (make_number (WINDOW_TOP_EDGE_Y (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
644 Fcons (make_number (WINDOW_RIGHT_EDGE_X (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
645 Fcons (make_number (WINDOW_BOTTOM_EDGE_Y (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
646 Qnil)))); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
647 } |
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 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
|
650 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
|
651 \(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
|
652 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
|
653 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
|
654 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
|
655 display margins, fringes, header line, and/or mode line. */) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
656 (window) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
657 Lisp_Object window; |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
658 { |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
659 register struct window *w = decode_any_window (window); |
51427
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 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
|
662 + WINDOW_LEFT_MARGIN_COLS (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
663 + WINDOW_LEFT_FRINGE_COLS (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
664 make_number (WINDOW_TOP_EDGE_LINE (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
665 + 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
|
666 make_number (WINDOW_BOX_RIGHT_EDGE_COL (w) |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
667 - WINDOW_RIGHT_MARGIN_COLS (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
668 - WINDOW_RIGHT_FRINGE_COLS (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
669 make_number (WINDOW_BOTTOM_EDGE_LINE (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
670 - WINDOW_MODE_LINE_LINES (w))); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
671 } |
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 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
|
674 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
|
675 \(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
|
676 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
|
677 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
|
678 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
|
679 display margins, fringes, header line, and/or mode line. */) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
680 (window) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
681 Lisp_Object window; |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
682 { |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
683 register struct window *w = decode_any_window (window); |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
684 |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
685 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
|
686 + WINDOW_LEFT_MARGIN_WIDTH (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
687 + WINDOW_LEFT_FRINGE_WIDTH (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
688 make_number (WINDOW_TOP_EDGE_Y (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
689 + 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
|
690 make_number (WINDOW_BOX_RIGHT_EDGE_X (w) |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
691 - WINDOW_RIGHT_MARGIN_WIDTH (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
692 - WINDOW_RIGHT_FRINGE_WIDTH (w)), |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
693 make_number (WINDOW_BOTTOM_EDGE_Y (w) |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
694 - WINDOW_MODE_LINE_HEIGHT (w))); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
695 } |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
696 |
25315
79bb4978ab2e
(Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents:
25300
diff
changeset
|
697 /* 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
|
698 If it is not, return ON_NOTHING; |
432 | 699 if it is in the window's text area, |
700 set *x and *y to its location relative to the upper left corner | |
701 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
|
702 return ON_TEXT; |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
703 if it is on the window's modeline, return ON_MODE_LINE; |
432 | 704 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
|
705 return ON_VERTICAL_BORDER. |
56542
6d2d9477f39e
(coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents:
56540
diff
changeset
|
706 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
|
707 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
|
708 if it is on the window's top line, return ON_HEADER_LINE; |
41127 | 709 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
|
710 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
|
711 to window-relative coordinates; |
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
712 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
|
713 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
|
714 to window-relative coordinates. |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
715 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
716 X and Y are frame relative pixel coordinates. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
717 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
718 static enum window_part |
432 | 719 coordinates_in_window (w, x, y) |
720 register struct window *w; | |
721 register int *x, *y; | |
722 { | |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
723 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
724 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
|
725 enum window_part part; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
726 int ux = FRAME_COLUMN_WIDTH (f); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
727 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
|
728 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
|
729 /* 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
|
730 (Between mode lines for instance. */ |
f03dfbb443ce
(coordinates_in_window): Increase width of area
Gerd Moellmann <gerd@gnu.org>
parents:
36068
diff
changeset
|
731 int grabbable_width = ux; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
732 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
|
733 |
28918
e42cd428f056
(coordinates_in_window): Subtract 1 when computing right_x.
Eli Zaretskii <eliz@gnu.org>
parents:
28726
diff
changeset
|
734 /* 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
|
735 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
|
736 if (w->pseudo_window_p) |
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 left_x = 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
739 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
|
740 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
|
741 bottom_y = WINDOW_BOTTOM_EDGE_Y (w); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
742 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
743 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
744 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
745 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
|
746 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
|
747 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
|
748 bottom_y = WINDOW_BOTTOM_EDGE_Y (w); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
749 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
750 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
751 /* Outside any interesting row? */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
752 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
|
753 return ON_NOTHING; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
754 |
33957
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
755 /* 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
|
756 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
|
757 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
|
758 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
|
759 scroll bars. */ |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
760 |
33957
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
761 if (WINDOW_WANTS_MODELINE_P (w) |
53129
070325c3884d
(coordinates_in_window): Remove redundant tests.
Kim F. Storm <storm@cua.dk>
parents:
52853
diff
changeset
|
762 && *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
|
763 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
764 part = ON_MODE_LINE; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
765 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
766 header_vertical_border_check: |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
767 /* 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
|
768 between mode lines of horizontally adjacent mode lines |
95550
e057f981a6b5
(Fset_window_parameter): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
95547
diff
changeset
|
769 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
|
770 return the right window. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
771 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
|
772 || WINDOW_RIGHTMOST_P (w)) |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
773 { |
85260 | 774 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
|
775 { |
70058
12c8842436ef
(window_loop): Test w->dedicated with !NILP instead of EQ Qt.
Kim F. Storm <storm@cua.dk>
parents:
70042
diff
changeset
|
776 /* 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
|
777 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
|
778 *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
|
779 *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
|
780 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
|
781 } |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
782 } |
51223
c1daf1c22f97
(Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents:
51207
diff
changeset
|
783 else |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
784 { |
99745
b06d87fbe42d
(coordinates_in_window): Don't return
Martin Rudalics <rudalics@gmx.at>
parents:
99541
diff
changeset
|
785 /* Make sure we're not at the rightmost position of a |
b06d87fbe42d
(coordinates_in_window): Don't return
Martin Rudalics <rudalics@gmx.at>
parents:
99541
diff
changeset
|
786 mode-/header-line and there's yet another window on |
b06d87fbe42d
(coordinates_in_window): Don't return
Martin Rudalics <rudalics@gmx.at>
parents:
99541
diff
changeset
|
787 the right. (Bug#1372) */ |
b06d87fbe42d
(coordinates_in_window): Don't return
Martin Rudalics <rudalics@gmx.at>
parents:
99541
diff
changeset
|
788 if ((WINDOW_RIGHTMOST_P (w) || *x < x1) |
b06d87fbe42d
(coordinates_in_window): Don't return
Martin Rudalics <rudalics@gmx.at>
parents:
99541
diff
changeset
|
789 && 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
|
790 { |
70058
12c8842436ef
(window_loop): Test w->dedicated with !NILP instead of EQ Qt.
Kim F. Storm <storm@cua.dk>
parents:
70042
diff
changeset
|
791 /* 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
|
792 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
|
793 *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
|
794 *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
|
795 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
|
796 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
797 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
798 |
57309
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
799 if (*x < x0 || *x >= x1) |
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
800 return ON_NOTHING; |
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
801 |
51477
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
802 /* 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
|
803 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
|
804 *x -= x0; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
805 *y -= top_y; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
806 return part; |
33957
1436ae066de4
(coordinates_in_window): If on a mode or header line,
Gerd Moellmann <gerd@gnu.org>
parents:
33619
diff
changeset
|
807 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
808 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
809 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
|
810 && *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
|
811 { |
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
812 part = ON_HEADER_LINE; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
813 goto header_vertical_border_check; |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
814 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
815 |
57309
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
816 if (*x < x0 || *x >= x1) |
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
817 return ON_NOTHING; |
d039bbffafbc
(coordinates_in_window): Relax check for cursor
Kim F. Storm <storm@cua.dk>
parents:
57031
diff
changeset
|
818 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
819 /* Outside any interesting column? */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
820 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
|
821 { |
7810bc0b0259
(coordinates_in_window): Fix returned y position when
Kim F. Storm <storm@cua.dk>
parents:
65975
diff
changeset
|
822 *y -= top_y; |
7810bc0b0259
(coordinates_in_window): Fix returned y position when
Kim F. Storm <storm@cua.dk>
parents:
65975
diff
changeset
|
823 return ON_SCROLL_BAR; |
7810bc0b0259
(coordinates_in_window): Fix returned y position when
Kim F. Storm <storm@cua.dk>
parents:
65975
diff
changeset
|
824 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
825 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
826 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
|
827 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
|
828 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
829 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
|
830 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
|
831 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
832 if (FRAME_WINDOW_P (f)) |
25315
79bb4978ab2e
(Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents:
25300
diff
changeset
|
833 { |
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
834 if (!w->pseudo_window_p |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
835 && !WINDOW_HAS_VERTICAL_SCROLL_BAR (w) |
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
836 && !WINDOW_RIGHTMOST_P (w) |
85260 | 837 && (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
|
838 { |
70058
12c8842436ef
(window_loop): Test w->dedicated with !NILP instead of EQ Qt.
Kim F. Storm <storm@cua.dk>
parents:
70042
diff
changeset
|
839 /* 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
|
840 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
|
841 *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
|
842 *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
|
843 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
|
844 } |
25315
79bb4978ab2e
(Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents:
25300
diff
changeset
|
845 } |
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
846 else |
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
847 { |
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
848 /* 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
|
849 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
|
850 if (!w->pseudo_window_p |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
851 && !WINDOW_RIGHTMOST_P (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
852 && *x > right_x - ux) |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
853 { |
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
854 /* 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
|
855 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
|
856 *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
|
857 *y -= top_y; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
858 return ON_VERTICAL_BORDER; |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
859 } |
34097
0225d8e15f2c
(coordinates_in_window): Handle computations for
Gerd Moellmann <gerd@gnu.org>
parents:
34090
diff
changeset
|
860 } |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
861 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
862 if (*x < text_left) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
863 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
864 if (lmargin_width > 0 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
865 && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
866 ? (*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
|
867 : (*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
|
868 { |
53129
070325c3884d
(coordinates_in_window): Remove redundant tests.
Kim F. Storm <storm@cua.dk>
parents:
52853
diff
changeset
|
869 *x -= left_x; |
51477
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
870 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
|
871 *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
|
872 *y -= top_y; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
873 return ON_LEFT_MARGIN; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
874 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
875 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
876 /* 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
|
877 *x -= left_x; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
878 *y -= top_y; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
879 return ON_LEFT_FRINGE; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
880 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
881 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
882 if (*x >= text_right) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
883 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
884 if (rmargin_width > 0 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
885 && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
886 ? (*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
|
887 : (*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
|
888 { |
66030
999beda71a39
(coordinates_in_window): Fix x position for ON_RIGHT_MARGIN.
Kim F. Storm <storm@cua.dk>
parents:
66018
diff
changeset
|
889 *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
|
890 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
|
891 *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
|
892 *y -= top_y; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
893 return ON_RIGHT_MARGIN; |
3ee34a66739e
(coordinates_in_window): Convert X and Y to window
Kim F. Storm <storm@cua.dk>
parents:
51427
diff
changeset
|
894 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
895 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
896 /* 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
|
897 *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
|
898 *y -= top_y; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
899 return ON_RIGHT_FRINGE; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
900 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
901 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
902 /* 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
|
903 *x -= text_left; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
904 *y -= top_y; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
905 return ON_TEXT; |
432 | 906 } |
907 | |
34640
263ac9dec8b8
(coordinates_in_window): Fix computation for
Gerd Moellmann <gerd@gnu.org>
parents:
34615
diff
changeset
|
908 |
432 | 909 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
|
910 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
|
911 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
|
912 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
|
913 measured in characters from the upper-left corner of the frame. |
99189
dc2662d377a4
* window.c (Fwindowp, Fwindow_live_p, Fwindow_minibuffer_p)
Juanma Barranquero <lekktu@gmail.com>
parents:
99160
diff
changeset
|
914 \(0 . 0) denotes the character in the upper left corner of the |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
915 frame. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
916 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
|
917 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
|
918 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
|
919 If they are in the top mode line of WINDOW, `header-line' is returned. |
41127 | 920 If they are in the left fringe of WINDOW, `left-fringe' is returned. |
921 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
|
922 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
|
923 `vertical-line' is returned. |
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
924 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
|
925 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
|
926 (coordinates, window) |
432 | 927 register Lisp_Object coordinates, window; |
928 { | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
929 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
930 struct frame *f; |
432 | 931 int x, y; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
932 Lisp_Object lx, ly; |
432 | 933 |
53492
6861a5210fdb
(decode_any_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
53143
diff
changeset
|
934 CHECK_WINDOW (window); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
935 w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
936 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
|
937 CHECK_CONS (coordinates); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
938 lx = Fcar (coordinates); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
939 ly = Fcdr (coordinates); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
940 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
|
941 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
|
942 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
|
943 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
|
944 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
945 switch (coordinates_in_window (w, &x, &y)) |
432 | 946 { |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
947 case ON_NOTHING: |
432 | 948 return Qnil; |
949 | |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
950 case ON_TEXT: |
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
951 /* 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
|
952 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
|
953 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
|
954 FRAME_CANON_Y_FROM_PIXEL_Y (f, y)); |
432 | 955 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
956 case ON_MODE_LINE: |
432 | 957 return Qmode_line; |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
958 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
959 case ON_VERTICAL_BORDER: |
732 | 960 return Qvertical_line; |
432 | 961 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
962 case ON_HEADER_LINE: |
25546 | 963 return Qheader_line; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
964 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
965 case ON_LEFT_FRINGE: |
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
966 return Qleft_fringe; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
967 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
968 case ON_RIGHT_FRINGE: |
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
969 return Qright_fringe; |
25315
79bb4978ab2e
(Fcoordinates_in_window_p): Return `left-bitmap-area'
Gerd Moellmann <gerd@gnu.org>
parents:
25300
diff
changeset
|
970 |
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
971 case ON_LEFT_MARGIN: |
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
972 return Qleft_margin; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
973 |
44535
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
974 case ON_RIGHT_MARGIN: |
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
975 return Qright_margin; |
ee637a721e86
(window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
Gerd Moellmann <gerd@gnu.org>
parents:
44264
diff
changeset
|
976 |
56542
6d2d9477f39e
(coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents:
56540
diff
changeset
|
977 case ON_SCROLL_BAR: |
6d2d9477f39e
(coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents:
56540
diff
changeset
|
978 /* 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
|
979 return Qnil; |
6d2d9477f39e
(coordinates_in_window): Return ON_SCROLL_BAR
Richard M. Stallman <rms@gnu.org>
parents:
56540
diff
changeset
|
980 |
432 | 981 default: |
982 abort (); | |
983 } | |
984 } | |
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 /* 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
|
988 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
|
989 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
|
990 |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
991 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
|
992 does, return W in *CW->window, as Lisp_Object, and return in |
30777 | 993 *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
|
994 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
|
995 |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
996 struct check_window_data |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
997 { |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
998 Lisp_Object *window; |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
999 int *x, *y; |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
1000 enum window_part *part; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1001 }; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1002 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1003 static int |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1004 check_window_containing (w, user_data) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1005 struct window *w; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1006 void *user_data; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1007 { |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1008 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
|
1009 enum window_part found; |
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
1010 int continue_p = 1; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1011 |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1012 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
|
1013 if (found != ON_NOTHING) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
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 *cw->part = found; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1016 XSETWINDOW (*cw->window, w); |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
1017 continue_p = 0; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1018 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1019 |
35800
fe8277459ef3
(enum window_part): New enumeration.
Gerd Moellmann <gerd@gnu.org>
parents:
35772
diff
changeset
|
1020 return continue_p; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1021 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1022 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1023 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1024 /* 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
|
1025 return it as a Lisp_Object. |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1026 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1027 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
|
1028 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
|
1029 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
|
1030 |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
1031 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
|
1032 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
|
1033 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1034 This function was previously implemented with a loop cycling over |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1035 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
|
1036 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
|
1037 implementation of next_window using Vwindow_list, because |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1038 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
|
1039 tree of F when this function is called asynchronously from |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1040 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
|
1041 case. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1042 |
265 | 1043 Lisp_Object |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1044 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
|
1045 struct frame *f; |
265 | 1046 int x, y; |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
1047 enum window_part *part; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1048 int *wx, *wy; |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25540
diff
changeset
|
1049 int tool_bar_p; |
265 | 1050 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1051 Lisp_Object window; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1052 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
|
1053 enum window_part dummy; |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
1054 |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
1055 if (part == 0) |
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
1056 part = &dummy; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1057 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1058 window = Qnil; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1059 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
|
1060 foreach_window (f, check_window_containing, &cw); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1061 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1062 /* 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
|
1063 bar exists. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1064 if (NILP (window) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1065 && tool_bar_p |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1066 && WINDOWP (f->tool_bar_window) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1067 && 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
|
1068 && (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
|
1069 != ON_NOTHING)) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1070 { |
50233
e25cbad07868
* window.c (enum window_part): Move to dispextern.h.
Kim F. Storm <storm@cua.dk>
parents:
49836
diff
changeset
|
1071 *part = ON_TEXT; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1072 window = f->tool_bar_window; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1073 } |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
1074 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1075 if (wx) *wx = x; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1076 if (wy) *wy = y; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1077 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1078 return window; |
265 | 1079 } |
1080 | |
681
026f978690be
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
555
diff
changeset
|
1081 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
|
1082 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
|
1083 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
|
1084 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
|
1085 column 0. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1086 (x, y, frame) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1087 Lisp_Object x, y, frame; |
265 | 1088 { |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1089 struct frame *f; |
265 | 1090 |
769 | 1091 if (NILP (frame)) |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
1092 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1093 CHECK_LIVE_FRAME (frame); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1094 f = XFRAME (frame); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1095 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1096 /* 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
|
1097 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
|
1098 CHECK_NUMBER_OR_FLOAT (y); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1099 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1100 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
|
1101 (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
|
1102 + 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
|
1103 (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
|
1104 + FRAME_INTERNAL_BORDER_WIDTH (f)), |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1105 0, 0, 0, 0); |
265 | 1106 } |
1107 | |
1108 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
|
1109 doc: /* Return current value of point in WINDOW. |
75753
5e34b32b9b4c
(Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents:
75348
diff
changeset
|
1110 WINDOW defaults to the selected window. |
5e34b32b9b4c
(Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents:
75348
diff
changeset
|
1111 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1112 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
|
1113 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
|
1114 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1115 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
|
1116 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
|
1117 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
|
1118 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
|
1119 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
|
1120 (window) |
265 | 1121 Lisp_Object window; |
1122 { | |
1123 register struct window *w = decode_window (window); | |
1124 | |
1125 if (w == XWINDOW (selected_window) | |
1126 && current_buffer == XBUFFER (w->buffer)) | |
1127 return Fpoint (); | |
1128 return Fmarker_position (w->pointm); | |
1129 } | |
1130 | |
1131 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
|
1132 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
|
1133 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
|
1134 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
|
1135 (window) |
265 | 1136 Lisp_Object window; |
1137 { | |
1138 return Fmarker_position (decode_window (window)->start); | |
1139 } | |
1140 | |
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
1141 /* 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
|
1142 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1143 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
|
1144 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
|
1145 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
|
1146 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
|
1147 (save-excursion |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1148 (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
|
1149 (vertical-motion (1- (window-height window)) window) |
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
1150 (point))") */ |
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
1151 |
21198
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
1152 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
|
1153 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
|
1154 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
|
1155 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
|
1156 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
|
1157 does not update this value. |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
1158 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
|
1159 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
|
1160 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
|
1161 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
|
1162 (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
|
1163 Lisp_Object window, update; |
265 | 1164 { |
1165 Lisp_Object value; | |
1166 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
|
1167 Lisp_Object buf; |
72998
79ada95d4018
(Fwindow_end): Fix recent change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72990
diff
changeset
|
1168 struct buffer *b; |
4292
990f6ee7f527
(Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents:
4145
diff
changeset
|
1169 |
990f6ee7f527
(Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents:
4145
diff
changeset
|
1170 buf = w->buffer; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1171 CHECK_BUFFER (buf); |
72907
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
1172 b = XBUFFER (buf); |
4292
990f6ee7f527
(Fset_window_buffer): Clear window_end_{pos,valid}.
Richard M. Stallman <rms@gnu.org>
parents:
4145
diff
changeset
|
1173 |
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
1174 #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
|
1175 /* 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
|
1176 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
|
1177 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
|
1178 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
|
1179 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
|
1180 return Qnil; |
8508
6d2f0901efe9
(Fwindow_end): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8492
diff
changeset
|
1181 #endif |
8492
865daa7a9faf
(Fwindow_end): If window_end_valid is nil, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
8486
diff
changeset
|
1182 |
21198
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
1183 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
|
1184 && ! (! 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
|
1185 && XFASTINT (w->last_modified) >= BUF_MODIFF (b) |
75080
1026dad5d8c9
(Fwindow_end): Fix use of >= operator.
Juanma Barranquero <lekktu@gmail.com>
parents:
75077
diff
changeset
|
1186 && 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
|
1187 && !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
|
1188 { |
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1189 struct text_pos startp; |
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1190 struct it it; |
72907
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
1191 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
|
1192 |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
1193 /* 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
|
1194 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
|
1195 if (b != current_buffer) |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
1196 { |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
1197 old_buffer = current_buffer; |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
1198 set_buffer_internal (b); |
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
1199 } |
26635
af8d605cbcf1
(Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
1200 |
af8d605cbcf1
(Fwindow_end): Don't call temp_set_pt_both with
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
1201 /* 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
|
1202 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
|
1203 `-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
|
1204 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
|
1205 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
|
1206 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
|
1207 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
|
1208 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
|
1209 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
|
1210 else |
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1211 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
|
1212 |
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1213 start_display (&it, w, startp); |
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1214 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
|
1215 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
|
1216 move_it_past_eol (&it); |
30743
51d0f4273e89
(Fwindow_end): Rewritten to not use Fvertical_motion,
Gerd Moellmann <gerd@gnu.org>
parents:
30560
diff
changeset
|
1217 value = make_number (IT_CHARPOS (it)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1218 |
36231
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1219 if (old_buffer) |
9fa7c8e6a6d5
(Fwindow_end): Handle case that WINDOW's buffer is not
Gerd Moellmann <gerd@gnu.org>
parents:
36202
diff
changeset
|
1220 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
|
1221 } |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
1222 else |
72907
b9f52d5446b1
(Fwindow_line_visibility): New defun for line-move-partial.
Kim F. Storm <storm@cua.dk>
parents:
72663
diff
changeset
|
1223 XSETINT (value, BUF_Z (b) - XFASTINT (w->window_end_pos)); |
265 | 1224 |
1225 return value; | |
1226 } | |
1227 | |
1228 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
|
1229 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
|
1230 Return POS. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1231 (window, pos) |
265 | 1232 Lisp_Object window, pos; |
1233 { | |
1234 register struct window *w = decode_window (window); | |
1235 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1236 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
|
1237 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
|
1238 && XBUFFER (w->buffer) == current_buffer) |
265 | 1239 Fgoto_char (pos); |
1240 else | |
1241 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
|
1242 |
34615
a8944d7e6773
(Fset_window_point): Remove test for
Gerd Moellmann <gerd@gnu.org>
parents:
34499
diff
changeset
|
1243 /* 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
|
1244 the new value of point. */ |
a8944d7e6773
(Fset_window_point): Remove test for
Gerd Moellmann <gerd@gnu.org>
parents:
34499
diff
changeset
|
1245 if (!EQ (window, selected_window)) |
34491
f9d400d4653a
(Fset_window_point): If displaying cursors in windows
Gerd Moellmann <gerd@gnu.org>
parents:
34417
diff
changeset
|
1246 ++windows_or_buffers_changed; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1247 |
265 | 1248 return pos; |
1249 } | |
1250 | |
1251 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
|
1252 doc: /* Make display in WINDOW start at position POS in WINDOW's buffer. |
98829
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
1253 WINDOW defaults to the selected window. Return POS. |
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
1254 Optional third arg NOFORCE non-nil inhibits next redisplay from |
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
1255 overriding motion of point in order to display at this exact start. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1256 (window, pos, noforce) |
265 | 1257 Lisp_Object window, pos, noforce; |
1258 { | |
1259 register struct window *w = decode_window (window); | |
1260 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1261 CHECK_NUMBER_COERCE_MARKER (pos); |
265 | 1262 set_marker_restricted (w->start, pos, w->buffer); |
1263 /* this is not right, but much easier than doing what is right. */ | |
1264 w->start_at_line_beg = Qnil; | |
485 | 1265 if (NILP (noforce)) |
265 | 1266 w->force_start = Qt; |
1267 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
|
1268 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
|
1269 XSETFASTINT (w->last_overlay_modified, 0); |
338 | 1270 if (!EQ (window, selected_window)) |
1271 windows_or_buffers_changed++; | |
25387
df0083768b79
(Fset_window_point): Reset Vresize_mini_config.
Gerd Moellmann <gerd@gnu.org>
parents:
25375
diff
changeset
|
1272 |
265 | 1273 return pos; |
1274 } | |
1275 | |
98829
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
1276 |
265 | 1277 DEFUN ("window-dedicated-p", Fwindow_dedicated_p, Swindow_dedicated_p, |
98829
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
1278 0, 1, 0, |
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
1279 doc: /* Return non-nil when WINDOW is dedicated to its buffer. |
99034
a63f6def7577
(Fwindow_dedicated_p, Fset_window_dedicated_p): Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98884
diff
changeset
|
1280 More precisely, return the value assigned by the last call of |
99160
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1281 `set-window-dedicated-p' for WINDOW. Return nil if that function was |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1282 never called with WINDOW as its argument, or the value set by that |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1283 function was internally reset since its last call. WINDOW defaults to |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1284 the selected window. |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1285 |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1286 When a window is dedicated to its buffer, `display-buffer' will refrain |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1287 from displaying another buffer in it. `get-lru-window' and |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1288 `get-largest-window' treat dedicated windows specially. |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1289 `delete-windows-on', `replace-buffer-in-windows', `quit-window' and |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1290 `kill-buffer' can delete a dedicated window and the containing frame. |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1291 |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1292 Functions like `set-window-buffer' may change the buffer displayed by a |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1293 window, unless that window is "strongly" dedicated to its buffer, that |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1294 is the value returned by `window-dedicated-p' is t. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1295 (window) |
265 | 1296 Lisp_Object window; |
1297 { | |
1298 return decode_window (window)->dedicated; | |
1299 } | |
1300 | |
722
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
1301 DEFUN ("set-window-dedicated-p", Fset_window_dedicated_p, |
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
1302 Sset_window_dedicated_p, 2, 2, 0, |
98829
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
1303 doc: /* Mark WINDOW as dedicated according to FLAG. |
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
1304 WINDOW defaults to the selected window. FLAG non-nil means mark WINDOW |
99034
a63f6def7577
(Fwindow_dedicated_p, Fset_window_dedicated_p): Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98884
diff
changeset
|
1305 as dedicated to its buffer. FLAG nil means mark WINDOW as non-dedicated. |
98829
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
1306 Return FLAG. |
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
1307 |
99160
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1308 When a window is dedicated to its buffer, `display-buffer' will refrain |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1309 from displaying another buffer in it. `get-lru-window' and |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1310 `get-largest-window' treat dedicated windows specially. |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1311 `delete-windows-on', `replace-buffer-in-windows', `quit-window' and |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1312 `kill-buffer' can delete a dedicated window and the containing |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1313 frame. |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1314 |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1315 As a special case, if FLAG is t, mark WINDOW as "strongly" dedicated to |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1316 its buffer. Functions like `set-window-buffer' may change the buffer |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1317 displayed by a window, unless that window is strongly dedicated to its |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1318 buffer. If and when `set-window-buffer' displays another buffer in a |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
1319 window, it also makes sure that the window is not marked as dedicated. */) |
98829
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
1320 (window, flag) |
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
1321 Lisp_Object window, flag; |
265 | 1322 { |
1323 register struct window *w = decode_window (window); | |
1324 | |
98829
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
1325 w->dedicated = flag; |
265 | 1326 return w->dedicated; |
1327 } | |
1328 | |
98829
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
1329 |
95547
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1330 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
|
1331 0, 1, 0, |
98829
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
1332 doc: /* Return the parameters of WINDOW and their values. |
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
1333 WINDOW defaults to the selected window. The return value is a list of |
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
1334 elements of the form (PARAMETER . VALUE). */) |
95547
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1335 (window) |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1336 Lisp_Object window; |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1337 { |
95564
823072be49ad
(Fwindow_parameter): Return VALUE, not (PARAMETER . VALUE).
Juanma Barranquero <lekktu@gmail.com>
parents:
95550
diff
changeset
|
1338 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
|
1339 } |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1340 |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1341 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
|
1342 2, 2, 0, |
98829
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
1343 doc: /* Return WINDOW's value for PARAMETER. |
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
1344 WINDOW defaults to the selected window. */) |
95547
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1345 (window, parameter) |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1346 Lisp_Object window, parameter; |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1347 { |
95564
823072be49ad
(Fwindow_parameter): Return VALUE, not (PARAMETER . VALUE).
Juanma Barranquero <lekktu@gmail.com>
parents:
95550
diff
changeset
|
1348 Lisp_Object result; |
823072be49ad
(Fwindow_parameter): Return VALUE, not (PARAMETER . VALUE).
Juanma Barranquero <lekktu@gmail.com>
parents:
95550
diff
changeset
|
1349 |
823072be49ad
(Fwindow_parameter): Return VALUE, not (PARAMETER . VALUE).
Juanma Barranquero <lekktu@gmail.com>
parents:
95550
diff
changeset
|
1350 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
|
1351 return CDR_SAFE (result); |
95547
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1352 } |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1353 |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1354 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
|
1355 Sset_window_parameter, 3, 3, 0, |
98829
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
1356 doc: /* Set WINDOW's value of PARAMETER to VALUE. |
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
1357 WINDOW defaults to the selected window. Return VALUE. */) |
95547
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1358 (window, parameter, value) |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1359 Lisp_Object window, parameter, value; |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1360 { |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1361 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
|
1362 Lisp_Object old_alist_elt; |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1363 |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1364 old_alist_elt = Fassq (parameter, w->window_parameters); |
99034
a63f6def7577
(Fwindow_dedicated_p, Fset_window_dedicated_p): Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98884
diff
changeset
|
1365 if (NILP (old_alist_elt)) |
95547
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1366 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
|
1367 else |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1368 Fsetcdr (old_alist_elt, value); |
95564
823072be49ad
(Fwindow_parameter): Return VALUE, not (PARAMETER . VALUE).
Juanma Barranquero <lekktu@gmail.com>
parents:
95550
diff
changeset
|
1369 return value; |
95547
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1370 } |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1371 |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
1372 |
265 | 1373 DEFUN ("window-display-table", Fwindow_display_table, Swindow_display_table, |
1374 0, 1, 0, | |
75753
5e34b32b9b4c
(Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents:
75348
diff
changeset
|
1375 doc: /* Return the display-table that WINDOW is using. |
5e34b32b9b4c
(Fwindow_height, Fwindow_hscroll)
Eli Zaretskii <eliz@gnu.org>
parents:
75348
diff
changeset
|
1376 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
|
1377 (window) |
265 | 1378 Lisp_Object window; |
1379 { | |
1380 return decode_window (window)->display_table; | |
1381 } | |
1382 | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1383 /* 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
|
1384 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
|
1385 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
|
1386 return 0. */ |
265 | 1387 |
13187
1a4cee562d33
(window_display_table): Use DISP_TABLE_P. Return type
Richard M. Stallman <rms@gnu.org>
parents:
13126
diff
changeset
|
1388 struct Lisp_Char_Table * |
265 | 1389 window_display_table (w) |
1390 struct window *w; | |
1391 { | |
30446
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1392 struct Lisp_Char_Table *dp = NULL; |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1393 |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1394 if (DISP_TABLE_P (w->display_table)) |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1395 dp = XCHAR_TABLE (w->display_table); |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1396 else if (BUFFERP (w->buffer)) |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1397 { |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1398 struct buffer *b = XBUFFER (w->buffer); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1399 |
30446
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1400 if (DISP_TABLE_P (b->display_table)) |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1401 dp = XCHAR_TABLE (b->display_table); |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1402 else if (DISP_TABLE_P (Vstandard_display_table)) |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1403 dp = XCHAR_TABLE (Vstandard_display_table); |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1404 } |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1405 |
e3fe041c4e25
(window_display_table): Cleaned up.
Gerd Moellmann <gerd@gnu.org>
parents:
30366
diff
changeset
|
1406 return dp; |
265 | 1407 } |
1408 | |
555 | 1409 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
|
1410 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
|
1411 (window, table) |
265 | 1412 register Lisp_Object window, table; |
1413 { | |
1414 register struct window *w; | |
1415 | |
1416 w = decode_window (window); | |
1417 w->display_table = table; | |
1418 return table; | |
1419 } | |
1420 | |
1421 /* Record info on buffer window w is displaying | |
1422 when it is about to cease to display that buffer. */ | |
21514 | 1423 static void |
265 | 1424 unshow_buffer (w) |
1425 register struct window *w; | |
1426 { | |
6517
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1427 Lisp_Object buf; |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1428 struct buffer *b; |
6517
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1429 |
8f5f79c3091a
(unshow_buffer, window_loop, Fdisplay_buffer): Use assignment, not
Karl Heuer <kwzh@gnu.org>
parents:
6487
diff
changeset
|
1430 buf = w->buffer; |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1431 b = XBUFFER (buf); |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1432 if (b != XMARKER (w->pointm)->buffer) |
265 | 1433 abort (); |
1434 | |
5990
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
1435 #if 0 |
265 | 1436 if (w == XWINDOW (selected_window) |
1437 || ! EQ (buf, XWINDOW (selected_window)->buffer)) | |
1438 /* Do this except when the selected window's buffer | |
1439 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
|
1440 #endif |
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
1441 /* 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
|
1442 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
|
1443 Now that this statement is unconditional, |
936d4a988148
(unshow_buffer): Unconditionally set last_window_start.
Richard M. Stallman <rms@gnu.org>
parents:
5988
diff
changeset
|
1444 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
|
1445 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
|
1446 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
|
1447 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
|
1448 b->last_window_start = marker_position (w->start); |
265 | 1449 |
1450 /* Point in the selected window's buffer | |
1451 is actually stored in that buffer, and the window's pointm isn't used. | |
1452 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
|
1453 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
|
1454 /* 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
|
1455 && !(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
|
1456 && 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
|
1457 && 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
|
1458 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
|
1459 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
|
1460 XMARKER (w->pointm)->charpos, |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1461 BUF_ZV (b)), |
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
1462 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
|
1463 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
|
1464 BUF_ZV_BYTE (b))); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1465 |
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28104
diff
changeset
|
1466 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
|
1467 && 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
|
1468 b->last_selected_window = Qnil; |
265 | 1469 } |
1470 | |
1471 /* Put replacement into the window structure in place of old. */ | |
21514 | 1472 static void |
265 | 1473 replace_window (old, replacement) |
1474 Lisp_Object old, replacement; | |
1475 { | |
1476 register Lisp_Object tem; | |
1477 register struct window *o = XWINDOW (old), *p = XWINDOW (replacement); | |
1478 | |
769 | 1479 /* If OLD is its frame's root_window, then replacement is the new |
1480 root_window for that frame. */ | |
265 | 1481 |
1525
f79a22ad87d0
* window.c (Fwindow_width, Fset_window_hscroll): Use accessors on
Jim Blandy <jimb@redhat.com>
parents:
1444
diff
changeset
|
1482 if (EQ (old, FRAME_ROOT_WINDOW (XFRAME (o->frame)))) |
769 | 1483 FRAME_ROOT_WINDOW (XFRAME (o->frame)) = replacement; |
265 | 1484 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1485 p->left_col = o->left_col; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1486 p->top_line = o->top_line; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1487 p->total_cols = o->total_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1488 p->total_lines = o->total_lines; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1489 p->desired_matrix = p->current_matrix = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1490 p->vscroll = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1491 bzero (&p->cursor, sizeof (p->cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1492 bzero (&p->last_cursor, sizeof (p->last_cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1493 bzero (&p->phys_cursor, sizeof (p->phys_cursor)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1494 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
|
1495 p->phys_cursor_width = -1; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1496 p->must_be_updated_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1497 p->pseudo_window_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1498 XSETFASTINT (p->window_end_vpos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1499 XSETFASTINT (p->window_end_pos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1500 p->window_end_valid = Qnil; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
1501 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
|
1502 p->orig_top_line = p->orig_total_lines = Qnil; |
265 | 1503 |
1504 p->next = tem = o->next; | |
485 | 1505 if (!NILP (tem)) |
265 | 1506 XWINDOW (tem)->prev = replacement; |
1507 | |
1508 p->prev = tem = o->prev; | |
485 | 1509 if (!NILP (tem)) |
265 | 1510 XWINDOW (tem)->next = replacement; |
1511 | |
1512 p->parent = tem = o->parent; | |
485 | 1513 if (!NILP (tem)) |
265 | 1514 { |
1515 if (EQ (XWINDOW (tem)->vchild, old)) | |
1516 XWINDOW (tem)->vchild = replacement; | |
1517 if (EQ (XWINDOW (tem)->hchild, old)) | |
1518 XWINDOW (tem)->hchild = replacement; | |
1519 } | |
1520 | |
1521 /*** Here, if replacement is a vertical combination | |
1522 and so is its new parent, we should make replacement's | |
1523 children be children of that parent instead. ***/ | |
1524 } | |
1525 | |
1526 DEFUN ("delete-window", Fdelete_window, Sdelete_window, 0, 1, "", | |
99210
ce3730476c2a
(Fwindow_height, Fdelete_window, set_window_buffer)
Martin Rudalics <rudalics@gmx.at>
parents:
99189
diff
changeset
|
1527 doc: /* Remove WINDOW from its frame. |
ce3730476c2a
(Fwindow_height, Fdelete_window, set_window_buffer)
Martin Rudalics <rudalics@gmx.at>
parents:
99189
diff
changeset
|
1528 WINDOW defaults to the selected window. Return nil. |
ce3730476c2a
(Fwindow_height, Fdelete_window, set_window_buffer)
Martin Rudalics <rudalics@gmx.at>
parents:
99189
diff
changeset
|
1529 Signal an error when WINDOW is the only window on its frame. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
1530 (window) |
265 | 1531 register Lisp_Object window; |
1532 { | |
92192
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
1533 struct frame *f; |
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
1534 if (NILP (window)) |
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
1535 window = selected_window; |
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
1536 f = XFRAME (WINDOW_FRAME (XWINDOW (window))); |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1537 delete_window (window); |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1538 |
92192
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
1539 run_window_configuration_change_hook (f); |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1540 |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1541 return Qnil; |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1542 } |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1543 |
20351 | 1544 void |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1545 delete_window (window) |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1546 register Lisp_Object window; |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
1547 { |
265 | 1548 register Lisp_Object tem, parent, sib; |
1549 register struct window *p; | |
1550 register struct window *par; | |
34819
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1551 struct frame *f; |
265 | 1552 |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1553 /* 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
|
1554 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
|
1555 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
|
1556 CHECK_WINDOW (window); |
265 | 1557 p = XWINDOW (window); |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1558 |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
1559 /* 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
|
1560 if (NILP (p->buffer) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1561 && NILP (p->hchild) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1562 && NILP (p->vchild)) |
17365
fc2ec9ced22f
(delete_window): Don't return value from void function.
Karl Heuer <kwzh@gnu.org>
parents:
17281
diff
changeset
|
1563 return; |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1564 |
265 | 1565 parent = p->parent; |
485 | 1566 if (NILP (parent)) |
265 | 1567 error ("Attempt to delete minibuffer or sole ordinary window"); |
1568 par = XWINDOW (parent); | |
1569 | |
1570 windows_or_buffers_changed++; | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1571 Vwindow_list = Qnil; |
34819
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1572 f = XFRAME (WINDOW_FRAME (p)); |
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1573 FRAME_WINDOW_SIZES_CHANGED (f) = 1; |
265 | 1574 |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1575 /* 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
|
1576 { |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1577 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
|
1578 |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
1579 /* 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
|
1580 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
|
1581 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
|
1582 swindow = FRAME_SELECTED_WINDOW (f); |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1583 |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1584 while (1) |
3723
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
1585 { |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1586 pwindow = swindow; |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1587 while (!NILP (pwindow)) |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1588 { |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1589 if (EQ (window, pwindow)) |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1590 break; |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1591 pwindow = XWINDOW (pwindow)->parent; |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1592 } |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1593 |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1594 /* 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
|
1595 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
|
1596 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
|
1597 break; |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1598 /* Otherwise, try another window for SWINDOW. */ |
77905
2fd30dc1a157
(delete_window): Delete stray semicolon.
Chong Yidong <cyd@stupidchicken.com>
parents:
77883
diff
changeset
|
1599 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
|
1600 |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1601 /* 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
|
1602 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
|
1603 so we cannot delete. */ |
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1604 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
|
1605 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
|
1606 } |
ccb9c93aac80
(Fdelete_window): Handle deleting a parent of the selected window.
Richard M. Stallman <rms@gnu.org>
parents:
3688
diff
changeset
|
1607 |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1608 /* 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
|
1609 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
|
1610 { |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1611 /* 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
|
1612 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
|
1613 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
|
1614 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
|
1615 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
|
1616 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
|
1617 Fselect_window (swindow, Qnil); |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1618 else |
42603
37c66e967beb
(delete_window): Rewrite the code for changing the
Richard M. Stallman <rms@gnu.org>
parents:
42351
diff
changeset
|
1619 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
|
1620 } |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1621 } |
265 | 1622 |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
1623 /* 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
|
1624 window_deletion_count++; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
1625 |
265 | 1626 tem = p->buffer; |
1627 /* tem is null for dummy parent windows | |
1628 (which have inferiors but not any contents themselves) */ | |
485 | 1629 if (!NILP (tem)) |
265 | 1630 { |
1631 unshow_buffer (p); | |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
1632 unchain_marker (XMARKER (p->pointm)); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
1633 unchain_marker (XMARKER (p->start)); |
265 | 1634 } |
1635 | |
26761
c15c2756ec0f
(delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents:
26635
diff
changeset
|
1636 /* 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
|
1637 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
|
1638 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
|
1639 processed while we are changing them. */ |
c15c2756ec0f
(delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents:
26635
diff
changeset
|
1640 BLOCK_INPUT; |
34819
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1641 free_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f))); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1642 |
265 | 1643 tem = p->next; |
485 | 1644 if (!NILP (tem)) |
265 | 1645 XWINDOW (tem)->prev = p->prev; |
1646 | |
1647 tem = p->prev; | |
485 | 1648 if (!NILP (tem)) |
265 | 1649 XWINDOW (tem)->next = p->next; |
1650 | |
1651 if (EQ (window, par->hchild)) | |
1652 par->hchild = p->next; | |
1653 if (EQ (window, par->vchild)) | |
1654 par->vchild = p->next; | |
1655 | |
1656 /* Find one of our siblings to give our space to. */ | |
1657 sib = p->prev; | |
485 | 1658 if (NILP (sib)) |
265 | 1659 { |
1660 /* If p gives its space to its next sibling, that sibling needs | |
1661 to have its top/left side pulled back to where p's is. | |
1662 set_window_{height,width} will re-position the sibling's | |
1663 children. */ | |
1664 sib = p->next; | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1665 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
|
1666 XWINDOW (sib)->left_col = p->left_col; |
265 | 1667 } |
1668 | |
1669 /* Stretch that sibling. */ | |
485 | 1670 if (!NILP (par->vchild)) |
265 | 1671 set_window_height (sib, |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1672 XFASTINT (XWINDOW (sib)->total_lines) + XFASTINT (p->total_lines), |
265 | 1673 1); |
485 | 1674 if (!NILP (par->hchild)) |
265 | 1675 set_window_width (sib, |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
1676 XFASTINT (XWINDOW (sib)->total_cols) + XFASTINT (p->total_cols), |
265 | 1677 1); |
1678 | |
1679 /* If parent now has only one child, | |
1680 put the child into the parent's place. */ | |
1681 tem = par->hchild; | |
485 | 1682 if (NILP (tem)) |
265 | 1683 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
|
1684 if (NILP (XWINDOW (tem)->next)) { |
265 | 1685 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
|
1686 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
|
1687 } |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1688 |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1689 /* 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
|
1690 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
|
1691 if (! NILP (p->hchild)) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1692 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
|
1693 else if (! NILP (p->vchild)) |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1694 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
|
1695 |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1696 /* Mark this window as deleted. */ |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
1697 p->buffer = p->hchild = p->vchild = Qnil; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1698 |
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
|
1699 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
|
1700 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
|
1701 |
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
|
1702 /* 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
|
1703 one of them. */ |
64133
7e06f331c228
(Frecenter): Fix last change (set iarg before use).
Kim F. Storm <storm@cua.dk>
parents:
64114
diff
changeset
|
1704 |
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
|
1705 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
|
1706 { |
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
|
1707 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
|
1708 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
|
1709 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
|
1710 } |
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
|
1711 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
|
1712 { |
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
|
1713 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
|
1714 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
|
1715 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
|
1716 } |
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
|
1717 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
|
1718 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
|
1719 |
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
|
1720 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
|
1721 { |
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
|
1722 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
|
1723 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
|
1724 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
|
1725 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
|
1726 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
|
1727 } |
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
|
1728 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
|
1729 /* 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
|
1730 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
|
1731 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
|
1732 | |
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
|
1733 -> 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
|
1734 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
|
1735 */ |
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
|
1736 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
|
1737 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
|
1738 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
|
1739 } |
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
|
1740 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
|
1741 } |
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
|
1742 |
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
|
1743 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
1744 /* Adjust glyph matrices. */ |
34819
7fcb09b535b4
(delete_window): Simplify somewhat.
Gerd Moellmann <gerd@gnu.org>
parents:
34786
diff
changeset
|
1745 adjust_glyphs (f); |
26761
c15c2756ec0f
(delete_window): Block input for the time window
Gerd Moellmann <gerd@gnu.org>
parents:
26635
diff
changeset
|
1746 UNBLOCK_INPUT; |
265 | 1747 } |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1748 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1749 |
265 | 1750 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1751 /*********************************************************************** |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1752 Window List |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1753 ***********************************************************************/ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1754 |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1755 /* 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
|
1756 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
|
1757 function window_list. */ |
30037
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 static int |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1760 add_window_to_list (w, user_data) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1761 struct window *w; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1762 void *user_data; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1763 { |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
1764 Lisp_Object *list = (Lisp_Object *) user_data; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1765 Lisp_Object window; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1766 XSETWINDOW (window, w); |
30039
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1767 *list = Fcons (window, *list); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1768 return 1; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1769 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1770 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1771 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1772 /* 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
|
1773 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
|
1774 list, cache it in Vwindow_list, and return that. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1775 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1776 static Lisp_Object |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1777 window_list () |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1778 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1779 if (!CONSP (Vwindow_list)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1780 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1781 Lisp_Object tail; |
30039
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1782 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1783 Vwindow_list = Qnil; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1784 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
|
1785 { |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1786 Lisp_Object args[2]; |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1787 |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1788 /* 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
|
1789 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
|
1790 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
|
1791 args[1] = Qnil; |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1792 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
|
1793 args[0] = Vwindow_list; |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1794 args[1] = Fnreverse (args[1]); |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1795 Vwindow_list = Fnconc (2, args); |
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1796 } |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1797 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1798 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1799 return Vwindow_list; |
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 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1802 |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1803 /* 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
|
1804 OWINDOW, MINIBUF and ALL_FRAMES. |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1805 |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1806 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
|
1807 `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
|
1808 a window means a specific minibuffer window |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1809 |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1810 ALL_FRAMES t means search all frames, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1811 nil means search just current frame, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1812 `visible' means search just visible frames, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1813 0 means search visible and iconified frames, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1814 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
|
1815 a frame means consider windows on that frame, only. */ |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1816 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1817 static int |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1818 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
|
1819 Lisp_Object window, owindow, minibuf, all_frames; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1820 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1821 struct window *w = XWINDOW (window); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1822 struct frame *f = XFRAME (w->frame); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1823 int candidate_p = 1; |
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 if (!BUFFERP (w->buffer)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1826 candidate_p = 0; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1827 else if (MINI_WINDOW_P (w) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1828 && (EQ (minibuf, Qlambda) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1829 || (WINDOWP (minibuf) && !EQ (minibuf, window)))) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1830 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1831 /* If MINIBUF is `lambda' don't consider any mini-windows. |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1832 If it is a window, consider only that one. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1833 candidate_p = 0; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1834 } |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1835 else if (EQ (all_frames, Qt)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1836 candidate_p = 1; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1837 else if (NILP (all_frames)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1838 { |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1839 xassert (WINDOWP (owindow)); |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1840 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
|
1841 } |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1842 else if (EQ (all_frames, Qvisible)) |
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 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
|
1845 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
|
1846 && (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
|
1847 == 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
|
1848 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1849 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1850 else if (INTEGERP (all_frames) && XINT (all_frames) == 0) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1851 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1852 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
|
1853 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
|
1854 #ifdef HAVE_X_WINDOWS |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
1855 /* 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
|
1856 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
|
1857 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
|
1858 `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
|
1859 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
|
1860 that yet. --Stef */ |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
1861 || (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
|
1862 && !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
|
1863 #endif |
85010
a3defcbdb064
(candidate_window_p): Only consider as visible frames that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84758
diff
changeset
|
1864 ) |
a3defcbdb064
(candidate_window_p): Only consider as visible frames that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84758
diff
changeset
|
1865 && (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
|
1866 == FRAME_TERMINAL (XFRAME (selected_frame))); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1867 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1868 else if (WINDOWP (all_frames)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1869 candidate_p = (EQ (FRAME_MINIBUF_WINDOW (f), all_frames) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1870 || EQ (XWINDOW (all_frames)->frame, w->frame) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1871 || 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
|
1872 else if (FRAMEP (all_frames)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1873 candidate_p = EQ (all_frames, w->frame); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1874 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1875 return candidate_p; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1876 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1877 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1878 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1879 /* Decode arguments as allowed by Fnext_window, Fprevious_window, and |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1880 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
|
1881 ALL_FRAMES. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1882 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1883 static void |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1884 decode_next_window_args (window, minibuf, all_frames) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1885 Lisp_Object *window, *minibuf, *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 if (NILP (*window)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1888 *window = selected_window; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1889 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
1890 CHECK_LIVE_WINDOW (*window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1891 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1892 /* 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
|
1893 does. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1894 if (NILP (*minibuf)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1895 *minibuf = minibuf_level ? minibuf_window : Qlambda; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1896 else if (!EQ (*minibuf, Qt)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1897 *minibuf = Qlambda; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1898 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1899 /* Now *MINIBUF can be t => count all minibuffer windows, `lambda' |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1900 => count none of them, or a specific minibuffer window (the |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1901 active one) to count. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1902 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1903 /* ALL_FRAMES nil doesn't specify which frames to include. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1904 if (NILP (*all_frames)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1905 *all_frames = (!EQ (*minibuf, Qlambda) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1906 ? FRAME_MINIBUF_WINDOW (XFRAME (XWINDOW (*window)->frame)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1907 : Qnil); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1908 else if (EQ (*all_frames, Qvisible)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1909 ; |
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
|
1910 else if (EQ (*all_frames, make_number (0))) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1911 ; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1912 else if (FRAMEP (*all_frames)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1913 ; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1914 else if (!EQ (*all_frames, Qt)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1915 *all_frames = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1916 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1917 /* 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
|
1918 search just current frame, `visible' meaning search just visible |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1919 frames, 0 meaning search visible and iconified frames, or a |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1920 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
|
1921 frame, meaning consider windows on that frame, only. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1922 } |
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 |
99277
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
1925 /* Return the next or previous window of WINDOW in cyclic ordering |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1926 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
|
1927 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
|
1928 ALL_FRAMES. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1929 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1930 static Lisp_Object |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1931 next_window (window, minibuf, all_frames, next_p) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1932 Lisp_Object window, minibuf, all_frames; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1933 int next_p; |
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 decode_next_window_args (&window, &minibuf, &all_frames); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1936 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1937 /* 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
|
1938 return the first window on the frame. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1939 if (FRAMEP (all_frames) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1940 && !EQ (all_frames, XWINDOW (window)->frame)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1941 return Fframe_first_window (all_frames); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1942 |
30039
07f23448b6e5
(add_window_to_list): Add parameter LIST.
Gerd Moellmann <gerd@gnu.org>
parents:
30037
diff
changeset
|
1943 if (next_p) |
30037
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 Lisp_Object list; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1946 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1947 /* Find WINDOW in the list of all windows. */ |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1948 list = Fmemq (window, window_list ()); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1949 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1950 /* 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
|
1951 if (CONSP (list)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1952 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
|
1953 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
|
1954 break; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1955 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1956 /* 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
|
1957 if (!CONSP (list)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1958 for (list = Vwindow_list; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1959 CONSP (list) && !EQ (XCAR (list), window); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1960 list = XCDR (list)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1961 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
|
1962 break; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1963 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1964 if (CONSP (list)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1965 window = XCAR (list); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1966 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1967 else |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1968 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1969 Lisp_Object candidate, list; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
1970 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1971 /* 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
|
1972 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
|
1973 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
|
1974 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
|
1975 candidate = Qnil; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1976 for (list = window_list (); CONSP (list); list = XCDR (list)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1977 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1978 if (EQ (XCAR (list), window)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1979 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1980 if (WINDOWP (candidate)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1981 break; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1982 } |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
1983 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
|
1984 all_frames)) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1985 candidate = XCAR (list); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1986 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1987 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1988 if (WINDOWP (candidate)) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1989 window = candidate; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1990 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1991 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1992 return window; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1993 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
1994 |
432 | 1995 |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
1996 DEFUN ("next-window", Fnext_window, Snext_window, 0, 3, 0, |
99277
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
1997 doc: /* Return window following WINDOW in cyclic ordering of windows. |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
1998 WINDOW defaults to the selected window. The optional arguments |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
1999 MINIBUF and ALL-FRAMES specify the set of windows to consider. |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2000 |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2001 MINIBUF t means consider the minibuffer window even if the |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2002 minibuffer is not active. MINIBUF nil or omitted means consider |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2003 the minibuffer window only if the minibuffer is active. Any |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2004 other value means do not consider the minibuffer window even if |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2005 the minibuffer is active. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2006 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2007 Several frames may share a single minibuffer; if the minibuffer |
99277
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2008 is active, all windows on all frames that share that minibuffer |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2009 are considered too. Therefore, if you are using a separate |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2010 minibuffer frame and the minibuffer is active and MINIBUF says it |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2011 counts, `next-window' considers the windows in the frame from |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2012 which you entered the minibuffer, as well as the minibuffer |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2013 window. |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2014 |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2015 ALL-FRAMES nil or omitted means consider all windows on WINDOW's |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2016 frame, plus the minibuffer window if specified by the MINIBUF |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2017 argument, see above. If the minibuffer counts, consider all |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2018 windows on all frames that share that minibuffer too. |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2019 ALL-FRAMES t means consider all windows on all existing frames. |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2020 ALL-FRAMES `visible' means consider all windows on all visible |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2021 frames. |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2022 ALL-FRAMES 0 means consider all windows on all visible and |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2023 iconified frames. |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2024 ALL-FRAMES a frame means consider all windows on that frame only. |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2025 Anything else means consider all windows on WINDOW's frame and no |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2026 others. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2027 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2028 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
|
2029 `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
|
2030 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
|
2031 `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
|
2032 (window, minibuf, all_frames) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2033 Lisp_Object window, minibuf, all_frames; |
265 | 2034 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2035 return next_window (window, minibuf, all_frames, 1); |
265 | 2036 } |
2037 | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2038 |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
2039 DEFUN ("previous-window", Fprevious_window, Sprevious_window, 0, 3, 0, |
99277
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2040 doc: /* Return window preceding WINDOW in cyclic ordering of windows. |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2041 WINDOW defaults to the selected window. The optional arguments |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2042 MINIBUF and ALL-FRAMES specify the set of windows to consider. |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2043 For the precise meaning of these arguments see `next-window'. |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2044 |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2045 If you use consistent values for MINIBUF and ALL-FRAMES, you can |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2046 use `previous-window' to iterate through the entire cycle of |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2047 acceptable windows, eventually ending up back at the window you |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2048 started with. `next-window' traverses the same cycle, in the |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2049 reverse order. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2050 (window, minibuf, all_frames) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2051 Lisp_Object window, minibuf, all_frames; |
265 | 2052 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2053 return next_window (window, minibuf, all_frames, 0); |
265 | 2054 } |
2055 | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2056 |
338 | 2057 DEFUN ("other-window", Fother_window, Sother_window, 1, 2, "p", |
99277
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2058 doc: /* Select another window in cyclic ordering of windows. |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2059 COUNT specifies the number of windows to skip, starting with the |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2060 selected window, before making the selection. If COUNT is |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2061 positive, skip COUNT windows forwards. If COUNT is negative, |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2062 skip -COUNT windows backwards. COUNT zero means do not skip any |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2063 window, so select the selected window. In an interactive call, |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2064 COUNT is the numeric prefix argument. Return nil. |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2065 |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2066 This function uses `next-window' for finding the window to select. |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2067 The argument ALL-FRAMES has the same meaning as in `next-window', |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2068 but the MINIBUF argument of `next-window' is always effectively |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2069 nil. */) |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2070 (count, all_frames) |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2071 Lisp_Object count, all_frames; |
265 | 2072 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2073 Lisp_Object window; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2074 int i; |
265 | 2075 |
99277
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2076 CHECK_NUMBER (count); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2077 window = selected_window; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2078 |
99277
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2079 for (i = XINT (count); i > 0; --i) |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2080 window = Fnext_window (window, Qnil, all_frames); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2081 for (; i < 0; ++i) |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2082 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
|
2083 |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
2084 Fselect_window (window, Qnil); |
265 | 2085 return Qnil; |
2086 } | |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2087 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2088 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2089 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
|
2090 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
|
2091 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
|
2092 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
|
2093 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
|
2094 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
|
2095 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
|
2096 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
|
2097 (frame, minibuf, window) |
33619
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2098 Lisp_Object frame, minibuf, window; |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2099 { |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2100 if (NILP (window)) |
69104
527507f1a62e
(Fwindow_list): Check `window' before doing XWINDOW.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68987
diff
changeset
|
2101 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
|
2102 CHECK_WINDOW (window); |
33619
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2103 if (NILP (frame)) |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2104 frame = selected_frame; |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2105 |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2106 if (!EQ (frame, XWINDOW (window)->frame)) |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2107 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
|
2108 |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2109 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
|
2110 } |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2111 |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2112 |
99277
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
2113 /* Return a list of windows in cyclic ordering. Arguments are like |
33619
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2114 for `next-window'. */ |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2115 |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2116 static Lisp_Object |
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2117 window_list_1 (window, minibuf, all_frames) |
30265
9b1c8eafe4dc
(Fwindow_list): Declare arg `window'.
Dave Love <fx@gnu.org>
parents:
30102
diff
changeset
|
2118 Lisp_Object window, minibuf, all_frames; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2119 { |
56456
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
2120 Lisp_Object tail, list, rest; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2121 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2122 decode_next_window_args (&window, &minibuf, &all_frames); |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2123 list = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2124 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2125 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
|
2126 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
|
2127 list = Fcons (XCAR (tail), list); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2128 |
56456
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
2129 /* 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
|
2130 list = Fnreverse (list); |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
2131 rest = Fmemq (window, list); |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
2132 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
|
2133 { |
56616
76bd0e931318
(window_list_1): YAILOM.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56585
diff
changeset
|
2134 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
|
2135 ; |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
2136 XSETCDR (tail, Qnil); |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
2137 list = nconc2 (rest, list); |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
2138 } |
7f86a9a89685
(coordinates_in_window): Inside the window but outside
Richard M. Stallman <rms@gnu.org>
parents:
56393
diff
changeset
|
2139 return list; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2140 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2141 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
2142 |
265 | 2143 |
2144 /* Look at all windows, performing an operation specified by TYPE | |
2145 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
|
2146 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
|
2147 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
|
2148 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
|
2149 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
|
2150 If MINI is non-zero, perform the operation on minibuffer windows too. */ |
265 | 2151 |
2152 enum window_loop | |
2153 { | |
2154 WINDOW_LOOP_UNUSED, | |
2155 GET_BUFFER_WINDOW, /* Arg is buffer */ | |
2156 GET_LRU_WINDOW, /* Arg is t for full-width windows only */ | |
2157 DELETE_OTHER_WINDOWS, /* Arg is window not to delete */ | |
2158 DELETE_BUFFER_WINDOWS, /* Arg is buffer */ | |
2159 GET_LARGEST_WINDOW, | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2160 UNSHOW_BUFFER, /* Arg is buffer */ |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2161 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
|
2162 CHECK_ALL_WINDOWS |
265 | 2163 }; |
2164 | |
2165 static Lisp_Object | |
769 | 2166 window_loop (type, obj, mini, frames) |
265 | 2167 enum window_loop type; |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2168 Lisp_Object obj, frames; |
265 | 2169 int mini; |
2170 { | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2171 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
|
2172 struct frame *f; |
30102
9406cb07bac7
(window_loop): Add missing gcpro1 local variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30093
diff
changeset
|
2173 struct gcpro gcpro1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2174 |
769 | 2175 /* If we're only looping through windows on a particular frame, |
2176 frame points to that frame. If we're looping through windows | |
2177 on all frames, frame is 0. */ | |
2178 if (FRAMEP (frames)) | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2179 f = XFRAME (frames); |
769 | 2180 else if (NILP (frames)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2181 f = SELECTED_FRAME (); |
265 | 2182 else |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2183 f = NULL; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2184 |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2185 if (f) |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
2186 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
|
2187 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
|
2188 frame_arg = frames; |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
2189 else if (EQ (frames, Qvisible)) |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
2190 frame_arg = frames; |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2191 else |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2192 frame_arg = Qt; |
265 | 2193 |
6247
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
2194 /* 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
|
2195 Qvisible to consider all visible frames, |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
2196 or Qt otherwise. */ |
22d4037cbce2
(Fprevious_window, Fnext_window): ALL_FRAMES = visible
Richard M. Stallman <rms@gnu.org>
parents:
6242
diff
changeset
|
2197 |
265 | 2198 /* 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
|
2199 if (WINDOWP (obj)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2200 window = obj; |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2201 else if (f) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2202 window = FRAME_SELECTED_WINDOW (f); |
265 | 2203 else |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2204 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
|
2205 |
33619
d0482eab29e1
(Fwindow_list): Change parameter list to be XEmacs
Gerd Moellmann <gerd@gnu.org>
parents:
33463
diff
changeset
|
2206 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
|
2207 GCPRO1 (windows); |
265 | 2208 best_window = Qnil; |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2209 |
67234
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
2210 for (; CONSP (windows); windows = XCDR (windows)) |
265 | 2211 { |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2212 struct window *w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2213 |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2214 window = XCAR (windows); |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2215 w = XWINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2216 |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2217 /* 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
|
2218 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
|
2219 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
|
2220 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
|
2221 /* 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
|
2222 || type == UNSHOW_BUFFER |
265 | 2223 || (mini && minibuf_level > 0)) |
2224 switch (type) | |
2225 { | |
2226 case GET_BUFFER_WINDOW: | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2227 if (EQ (w->buffer, obj) |
16522
63ca7c6ceeff
(window_loop, case GET_BUFFER_WINDOW):
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
2228 /* Don't find any minibuffer window |
63ca7c6ceeff
(window_loop, case GET_BUFFER_WINDOW):
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
2229 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
|
2230 && (MINI_WINDOW_P (w) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2231 ? EQ (window, minibuf_window) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2232 : 1)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2233 { |
36068
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
2234 if (NILP (best_window)) |
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
2235 best_window = window; |
acd9eaaa94c1
(window_loop) <GET_BUFFER_WINDOW>: Prefer to return
Gerd Moellmann <gerd@gnu.org>
parents:
35891
diff
changeset
|
2236 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
|
2237 /* 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
|
2238 RETURN_UNGCPRO (window); |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
2239 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
|
2240 /* 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
|
2241 best_window = window; |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2242 } |
265 | 2243 break; |
2244 | |
2245 case GET_LRU_WINDOW: | |
66711
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2246 /* `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
|
2247 `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
|
2248 `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
|
2249 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
|
2250 || (!(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
|
2251 /* Minibuffer windows are always ignored. */ |
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2252 || MINI_WINDOW_P (w)) |
265 | 2253 break; |
485 | 2254 if (NILP (best_window) |
265 | 2255 || (XFASTINT (XWINDOW (best_window)->use_time) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2256 > XFASTINT (w->use_time))) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2257 best_window = window; |
265 | 2258 break; |
2259 | |
2260 case DELETE_OTHER_WINDOWS: | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2261 if (!EQ (window, obj)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2262 Fdelete_window (window); |
265 | 2263 break; |
2264 | |
2265 case DELETE_BUFFER_WINDOWS: | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2266 if (EQ (w->buffer, obj)) |
265 | 2267 { |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2268 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
|
2269 |
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
2270 /* 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
|
2271 kill the frame. */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2272 if (EQ (window, FRAME_ROOT_WINDOW (f)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2273 && !NILP (w->dedicated) |
10808
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
2274 && other_visible_frames (f)) |
265 | 2275 { |
10808
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
2276 /* 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
|
2277 There might be one, the minibuffer! */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2278 while (CONSP (XCDR (windows)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2279 && EQ (XWINDOW (XCAR (windows))->frame, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2280 XWINDOW (XCAR (XCDR (windows)))->frame)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2281 windows = XCDR (windows); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2282 |
10808
64fcde7a1438
(window_loop): Handle special display buffer frames
Richard M. Stallman <rms@gnu.org>
parents:
10666
diff
changeset
|
2283 /* Now we can safely delete the frame. */ |
100632
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
99745
diff
changeset
|
2284 delete_frame (w->frame, Qnil); |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2285 } |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2286 else if (NILP (w->parent)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2287 { |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2288 /* 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
|
2289 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
|
2290 display there. */ |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2291 Lisp_Object buffer; |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2292 buffer = Fother_buffer (obj, Qnil, w->frame); |
99541
8f3f7e087ae6
(window_loop): In DELETE_BUFFER_WINDOWS case, reset
Martin Rudalics <rudalics@gmx.at>
parents:
99322
diff
changeset
|
2293 /* Reset dedicated state of window. */ |
8f3f7e087ae6
(window_loop): In DELETE_BUFFER_WINDOWS case, reset
Martin Rudalics <rudalics@gmx.at>
parents:
99322
diff
changeset
|
2294 w->dedicated = Qnil; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2295 Fset_window_buffer (window, buffer, Qnil); |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2296 if (EQ (window, selected_window)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2297 Fset_buffer (w->buffer); |
265 | 2298 } |
2299 else | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2300 Fdelete_window (window); |
265 | 2301 } |
2302 break; | |
2303 | |
2304 case GET_LARGEST_WINDOW: | |
66711
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2305 { /* 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
|
2306 /* 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
|
2307 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
|
2308 break; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2309 |
31393
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2310 if (NILP (best_window)) |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2311 best_window = window; |
31393
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2312 else |
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2313 { |
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2314 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
|
2315 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
|
2316 > 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
|
2317 best_window = window; |
9cb95a7ee33e
(window_loop) <GET_LARGEST_WINDOW>: Fix bug making
Gerd Moellmann <gerd@gnu.org>
parents:
31117
diff
changeset
|
2318 } |
265 | 2319 } |
2320 break; | |
2321 | |
2322 case UNSHOW_BUFFER: | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2323 if (EQ (w->buffer, obj)) |
265 | 2324 { |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2325 Lisp_Object buffer; |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2326 struct frame *f = XFRAME (w->frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2327 |
265 | 2328 /* 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
|
2329 buffer = Fother_buffer (obj, Qnil, w->frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2330 |
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2331 /* 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
|
2332 kill the frame. */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2333 if (EQ (window, FRAME_ROOT_WINDOW (f)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2334 && !NILP (w->dedicated) |
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2335 && other_visible_frames (f)) |
8536
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2336 { |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2337 /* Skip the other windows on this frame. |
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2338 There might be one, the minibuffer! */ |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2339 while (CONSP (XCDR (windows)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2340 && EQ (XWINDOW (XCAR (windows))->frame, |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2341 XWINDOW (XCAR (XCDR (windows)))->frame)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2342 windows = XCDR (windows); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2343 |
8536
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2344 /* Now we can safely delete the frame. */ |
100632
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
99745
diff
changeset
|
2345 delete_frame (w->frame, Qnil); |
8536
b97057eb17d3
(window_loop, case UNSHOW_BUFFER):
Richard M. Stallman <rms@gnu.org>
parents:
8508
diff
changeset
|
2346 } |
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2347 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
|
2348 { |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2349 Lisp_Object window; |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2350 XSETWINDOW (window, w); |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2351 /* 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
|
2352 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
|
2353 Fdelete_window (window); |
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
2354 } |
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2355 else |
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2356 { |
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2357 /* 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
|
2358 w->dedicated = Qnil; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2359 Fset_window_buffer (window, buffer, Qnil); |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2360 if (EQ (window, selected_window)) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2361 Fset_buffer (w->buffer); |
7647
d93dff6fbc73
(window_loop, UNSHOW_BUFFER case):
Richard M. Stallman <rms@gnu.org>
parents:
7618
diff
changeset
|
2362 } |
265 | 2363 } |
2364 break; | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2365 |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2366 case REDISPLAY_BUFFER_WINDOWS: |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2367 if (EQ (w->buffer, obj)) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2368 { |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2369 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
|
2370 w->update_mode_line = Qt; |
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
2371 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
|
2372 ++update_mode_lines; |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2373 best_window = window; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2374 } |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2375 break; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
2376 |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2377 /* 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
|
2378 case CHECK_ALL_WINDOWS: |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2379 if (! NILP (w->buffer) |
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2380 && NILP (XBUFFER (w->buffer)->name)) |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2381 abort (); |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2382 break; |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
2383 |
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
2384 case WINDOW_LOOP_UNUSED: |
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
2385 break; |
265 | 2386 } |
2387 } | |
2388 | |
30093
22f8fc642575
(Fwindow_list): Reverse list at the end.
Gerd Moellmann <gerd@gnu.org>
parents:
30045
diff
changeset
|
2389 UNGCPRO; |
265 | 2390 return best_window; |
14536
12de7dac154b
(display_buffer_1): Fix typo in last change.
Roland McGrath <roland@gnu.org>
parents:
14535
diff
changeset
|
2391 } |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
2392 |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2393 /* 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
|
2394 |
25268 | 2395 void |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2396 check_all_windows () |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2397 { |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2398 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
|
2399 } |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
2400 |
66598
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
2401 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
|
2402 doc: /* Return the window least recently selected or used for display. |
76825 | 2403 \(LRU means Least Recently Used.) |
2404 | |
54883
375346b8175c
(Fget_lru_window): Doc fix.
Nick Roberts <nickrob@snap.net.nz>
parents:
54267
diff
changeset
|
2405 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
|
2406 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
|
2407 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
|
2408 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
|
2409 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
|
2410 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
|
2411 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
|
2412 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
|
2413 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
|
2414 (frame, dedicated) |
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
2415 Lisp_Object frame, dedicated; |
265 | 2416 { |
2417 register Lisp_Object w; | |
2418 /* 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
|
2419 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
|
2420 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
|
2421 0, frame); |
485 | 2422 if (!NILP (w) && !EQ (w, selected_window)) |
265 | 2423 return w; |
2424 /* 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
|
2425 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
|
2426 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
|
2427 0, frame); |
265 | 2428 } |
2429 | |
66598
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
2430 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
|
2431 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
|
2432 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
|
2433 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
|
2434 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
|
2435 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
|
2436 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
|
2437 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
|
2438 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
|
2439 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
|
2440 (frame, dedicated) |
bc45ad547d66
(window_loop): For LRU and LARGEST, let the `mini' argument
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66239
diff
changeset
|
2441 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
|
2442 { |
66711
d89d56f50d43
(Fget_lru_window, Fget_largest_window, window_loop):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66664
diff
changeset
|
2443 return window_loop (GET_LARGEST_WINDOW, dedicated, 0, |
769 | 2444 frame); |
265 | 2445 } |
2446 | |
99120
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2447 DEFUN ("get-buffer-window", Fget_buffer_window, Sget_buffer_window, 0, 2, 0, |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2448 doc: /* Return a window currently displaying BUFFER-OR-NAME, or nil if none. |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2449 BUFFER-OR-NAME may be a buffer or a buffer name and defaults to the |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2450 current buffer. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2451 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
|
2452 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
|
2453 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
|
2454 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
|
2455 If FRAME is a frame, search only that frame. */) |
99120
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2456 (buffer_or_name, frame) |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2457 Lisp_Object buffer_or_name, frame; |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2458 { |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2459 Lisp_Object buffer; |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2460 |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2461 if (NILP (buffer_or_name)) |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2462 buffer = Fcurrent_buffer (); |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2463 else |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2464 buffer = Fget_buffer (buffer_or_name); |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2465 |
9105
984a4b1be1d1
(Fwindowp, Fwindow_live_p, window_display_table, window_loop,
Karl Heuer <kwzh@gnu.org>
parents:
9028
diff
changeset
|
2466 if (BUFFERP (buffer)) |
769 | 2467 return window_loop (GET_BUFFER_WINDOW, buffer, 1, frame); |
265 | 2468 else |
2469 return Qnil; | |
2470 } | |
2471 | |
2472 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
|
2473 0, 1, "", |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2474 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
|
2475 Only the frame WINDOW is on is affected. |
99120
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2476 This function tries to reduce display jumps by keeping the text |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2477 previously visible in WINDOW in the same place on the frame. Doing this |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2478 depends on the value of (window-start WINDOW), so if calling this |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2479 function in a program gives strange scrolling, make sure the |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2480 window-start value is reasonable when this function is called. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2481 (window) |
265 | 2482 Lisp_Object window; |
2483 { | |
2484 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
|
2485 int startpos; |
35038
ac8eb6b4eee6
(Fdelete_other_windows): Set window's window_end_valid
Gerd Moellmann <gerd@gnu.org>
parents:
35024
diff
changeset
|
2486 int top, new_top; |
265 | 2487 |
485 | 2488 if (NILP (window)) |
265 | 2489 window = selected_window; |
2490 else | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
2491 CHECK_LIVE_WINDOW (window); |
265 | 2492 w = XWINDOW (window); |
9028
74119e5602eb
(Fdelete_other_windows): Nice error if WINDOW is minibuf.
Richard M. Stallman <rms@gnu.org>
parents:
8991
diff
changeset
|
2493 |
7348
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2494 startpos = marker_position (w->start); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2495 top = WINDOW_TOP_EDGE_LINE (w) - FRAME_TOP_MARGIN (XFRAME (WINDOW_FRAME (w))); |
265 | 2496 |
9028
74119e5602eb
(Fdelete_other_windows): Nice error if WINDOW is minibuf.
Richard M. Stallman <rms@gnu.org>
parents:
8991
diff
changeset
|
2497 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
|
2498 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
|
2499 |
2190
482c7827b968
(Fdelete_other_windows): Handle FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents:
1994
diff
changeset
|
2500 window_loop (DELETE_OTHER_WINDOWS, window, 0, WINDOW_FRAME (w)); |
265 | 2501 |
7348
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2502 /* 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
|
2503 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
|
2504 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
|
2505 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
|
2506 not current, due to typeahead). */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2507 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
|
2508 if (new_top != top |
ac8eb6b4eee6
(Fdelete_other_windows): Set window's window_end_valid
Gerd Moellmann <gerd@gnu.org>
parents:
35024
diff
changeset
|
2509 && 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
|
2510 && 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
|
2511 { |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2512 struct position pos; |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2513 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
|
2514 |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2515 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
|
2516 /* 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
|
2517 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
|
2518 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
|
2519 |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
2520 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
|
2521 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
|
2522 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
|
2523 || 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
|
2524 : Qnil); |
13198
43d90596da34
(Fdelete_other_windows): Set w->force_start.
Richard M. Stallman <rms@gnu.org>
parents:
13187
diff
changeset
|
2525 /* 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
|
2526 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
|
2527 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
|
2528 |
99b9c9068761
(Fdelete_other_windows): Do nothing if w->start is outside region.
Karl Heuer <kwzh@gnu.org>
parents:
7347
diff
changeset
|
2529 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
|
2530 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2531 |
265 | 2532 return Qnil; |
2533 } | |
2534 | |
2535 DEFUN ("delete-windows-on", Fdelete_windows_on, Sdelete_windows_on, | |
99120
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2536 0, 2, "bDelete windows on (buffer): ", |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2537 doc: /* Delete all windows showing BUFFER-OR-NAME. |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2538 BUFFER-OR-NAME may be a buffer or the name of an existing buffer and |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2539 defaults to the current buffer. |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2540 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
2541 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
|
2542 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
|
2543 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
|
2544 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
|
2545 If FRAME is t, search only the selected frame. |
98829
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
2546 If FRAME is a frame, search only that frame. |
99120
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2547 When a window showing BUFFER-OR-NAME is dedicated and the only window of |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2548 its frame, that frame is deleted when there are other frames left. */) |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2549 (buffer_or_name, frame) |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2550 Lisp_Object buffer_or_name, frame; |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2551 { |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2552 Lisp_Object buffer; |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2553 |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
2554 /* 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
|
2555 expects. */ |
22223
5d15aed3a37c
(Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents:
22187
diff
changeset
|
2556 if (NILP (frame)) |
5d15aed3a37c
(Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents:
22187
diff
changeset
|
2557 frame = Qt; |
5d15aed3a37c
(Fdelete_windows_on): For FRAME, change t to nil
Richard M. Stallman <rms@gnu.org>
parents:
22187
diff
changeset
|
2558 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
|
2559 frame = Qnil; |
4145
a0b726903a1f
* window.c [not MULTI_FRAME] (Fdelete_windows_on): Set FRAME
Jim Blandy <jimb@redhat.com>
parents:
3803
diff
changeset
|
2560 |
99120
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2561 if (NILP (buffer_or_name)) |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2562 buffer = Fcurrent_buffer (); |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2563 else |
265 | 2564 { |
99120
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2565 buffer = Fget_buffer (buffer_or_name); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
2566 CHECK_BUFFER (buffer); |
265 | 2567 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2568 |
99120
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2569 window_loop (DELETE_BUFFER_WINDOWS, buffer, 0, frame); |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2570 |
265 | 2571 return Qnil; |
2572 } | |
2573 | |
2574 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
|
2575 Sreplace_buffer_in_windows, |
99120
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2576 0, 1, "bReplace buffer in windows: ", |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2577 doc: /* Replace BUFFER-OR-NAME with some other buffer in all windows showing it. |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2578 BUFFER-OR-NAME may be a buffer or the name of an existing buffer and |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2579 defaults to the current buffer. |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2580 |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2581 When a window showing BUFFER-OR-NAME is dedicated that window is |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2582 deleted. If that window is the only window on its frame, that frame is |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2583 deleted too when there are other frames left. If there are no other |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2584 frames left, some other buffer is displayed in that window. */) |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2585 (buffer_or_name) |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2586 Lisp_Object buffer_or_name; |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2587 { |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2588 Lisp_Object buffer; |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2589 |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2590 if (NILP (buffer_or_name)) |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2591 buffer = Fcurrent_buffer (); |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2592 else |
265 | 2593 { |
99120
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2594 buffer = Fget_buffer (buffer_or_name); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
2595 CHECK_BUFFER (buffer); |
265 | 2596 } |
99120
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2597 |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2598 window_loop (UNSHOW_BUFFER, buffer, 0, Qt); |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
2599 |
265 | 2600 return Qnil; |
2601 } | |
13918
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2602 |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2603 /* 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
|
2604 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
|
2605 |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2606 void |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2607 replace_buffer_in_all_windows (buffer) |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2608 Lisp_Object buffer; |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2609 { |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2610 Lisp_Object tail, frame; |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2611 |
2f6eaea659da
(replace_buffer_in_all_windows): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13780
diff
changeset
|
2612 /* 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
|
2613 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
|
2614 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
|
2615 FOR_EACH_FRAME (tail, frame) |
20066
affc9c857428
(replace_buffer_in_all_windows):
Karl Heuer <kwzh@gnu.org>
parents:
20046
diff
changeset
|
2616 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
|
2617 } |
265 | 2618 |
2619 /* 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
|
2620 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2621 /* 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
|
2622 might crash Emacs. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2623 |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2624 #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
|
2625 #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
|
2626 |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2627 /* 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
|
2628 the total number of lines of w. */ |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2629 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2630 #define WINDOW_TOTAL_SIZE(w, wp) \ |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2631 (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
|
2632 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2633 /* 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
|
2634 minimum allowable size. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2635 |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
2636 void |
972
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2637 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
|
2638 FRAME_PTR frame; |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
2639 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
|
2640 { |
4347
d6b289b1a6dc
* window.c (check_frame_size): Include the menu bar height in the
Jim Blandy <jimb@redhat.com>
parents:
4292
diff
changeset
|
2641 /* 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
|
2642 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
|
2643 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
|
2644 int min_height |
87fe94f01b8e
(check_frame_size): Fix minimum height calculation.
Richard M. Stallman <rms@gnu.org>
parents:
42862
diff
changeset
|
2645 = ((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
|
2646 ? MIN_SAFE_WINDOW_HEIGHT |
87fe94f01b8e
(check_frame_size): Fix minimum height calculation.
Richard M. Stallman <rms@gnu.org>
parents:
42862
diff
changeset
|
2647 : 2 * MIN_SAFE_WINDOW_HEIGHT); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2648 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2649 if (FRAME_TOP_MARGIN (frame) > 0) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
2650 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
|
2651 |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2652 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
|
2653 *rows = min_height; |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2654 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
|
2655 *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
|
2656 } |
f47d221cbfe6
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
Jim Blandy <jimb@redhat.com>
parents:
780
diff
changeset
|
2657 |
25268 | 2658 /* Value is non-zero if window W is fixed-size. WIDTH_P non-zero means |
2659 check if W's width can be changed, otherwise check W's height. | |
2660 CHECK_SIBLINGS_P non-zero means check resizablity of WINDOW's | |
2661 siblings, too. If none of the siblings is resizable, WINDOW isn't | |
2662 either. */ | |
2663 | |
2664 static int | |
2665 window_fixed_size_p (w, width_p, check_siblings_p) | |
2666 struct window *w; | |
2667 int width_p, check_siblings_p; | |
2668 { | |
2669 int fixed_p; | |
2670 struct window *c; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2671 |
25268 | 2672 if (!NILP (w->hchild)) |
2673 { | |
2674 c = XWINDOW (w->hchild); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2675 |
25268 | 2676 if (width_p) |
2677 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2678 /* A horizontal combination is fixed-width if all of if its |
25268 | 2679 children are. */ |
2680 while (c && window_fixed_size_p (c, width_p, 0)) | |
2681 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2682 fixed_p = c == NULL; | |
2683 } | |
2684 else | |
2685 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2686 /* A horizontal combination is fixed-height if one of if its |
25268 | 2687 children is. */ |
2688 while (c && !window_fixed_size_p (c, width_p, 0)) | |
2689 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2690 fixed_p = c != NULL; | |
2691 } | |
2692 } | |
2693 else if (!NILP (w->vchild)) | |
2694 { | |
2695 c = XWINDOW (w->vchild); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2696 |
25268 | 2697 if (width_p) |
2698 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2699 /* A vertical combination is fixed-width if one of if its |
25268 | 2700 children is. */ |
2701 while (c && !window_fixed_size_p (c, width_p, 0)) | |
2702 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2703 fixed_p = c != NULL; | |
2704 } | |
2705 else | |
2706 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2707 /* A vertical combination is fixed-height if all of if its |
25268 | 2708 children are. */ |
2709 while (c && window_fixed_size_p (c, width_p, 0)) | |
2710 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; | |
2711 fixed_p = c == NULL; | |
2712 } | |
2713 } | |
2714 else if (BUFFERP (w->buffer)) | |
2715 { | |
65602
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2716 struct buffer *old = current_buffer; |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2717 Lisp_Object val; |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2718 |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2719 current_buffer = XBUFFER (w->buffer); |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2720 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
|
2721 current_buffer = old; |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2722 |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2723 fixed_p = 0; |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2724 if (!EQ (val, Qunbound)) |
25268 | 2725 { |
65602
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2726 fixed_p = !NILP (val); |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2727 |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2728 if (fixed_p |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2729 && ((EQ (val, Qheight) && width_p) |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2730 || (EQ (val, Qwidth) && !width_p))) |
25b770eb7993
(make_window): Don't initialize height_fixed_p.
Andreas Schwab <schwab@suse.de>
parents:
65004
diff
changeset
|
2731 fixed_p = 0; |
25268 | 2732 } |
2733 | |
2734 /* Can't tell if this one is resizable without looking at | |
2735 siblings. If all siblings are fixed-size this one is too. */ | |
2736 if (!fixed_p && check_siblings_p && WINDOWP (w->parent)) | |
2737 { | |
2738 Lisp_Object child; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2739 |
85330
0bc184c59770
* xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85260
diff
changeset
|
2740 for (child = w->prev; WINDOWP (child); child = XWINDOW (child)->prev) |
25268 | 2741 if (!window_fixed_size_p (XWINDOW (child), width_p, 0)) |
2742 break; | |
2743 | |
2744 if (NILP (child)) | |
85330
0bc184c59770
* xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85260
diff
changeset
|
2745 for (child = w->next; WINDOWP (child); child = XWINDOW (child)->next) |
25268 | 2746 if (!window_fixed_size_p (XWINDOW (child), width_p, 0)) |
2747 break; | |
2748 | |
2749 if (NILP (child)) | |
2750 fixed_p = 1; | |
2751 } | |
2752 } | |
2753 else | |
2754 fixed_p = 1; | |
2755 | |
2756 return fixed_p; | |
2757 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2758 |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2759 /* 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
|
2760 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
|
2761 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
|
2762 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
|
2763 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
|
2764 minibuffer window, always return 1. */ |
78415
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
2765 |
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
2766 static int |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2767 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
|
2768 struct window *w; |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2769 int width_p, safe_p; |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2770 { |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2771 /* 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
|
2772 window_min_width here. */ |
78415
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
2773 if (width_p) |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2774 { |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2775 int safe_size = (MIN_SAFE_WINDOW_WIDTH |
99034
a63f6def7577
(Fwindow_dedicated_p, Fset_window_dedicated_p): Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98884
diff
changeset
|
2776 + WINDOW_FRINGE_COLS (w) |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2777 + WINDOW_SCROLL_BAR_COLS (w)); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2778 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2779 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
|
2780 } |
78415
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
2781 else if (MINI_WINDOW_P (w)) |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2782 return 1; |
78415
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
2783 else |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2784 { |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2785 int safe_size = (MIN_SAFE_WINDOW_HEIGHT |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2786 + ((BUFFERP (w->buffer) |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2787 && !NILP (XBUFFER (w->buffer)->mode_line_format)) |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2788 ? 1 : 0)); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2789 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2790 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
|
2791 } |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2792 } |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2793 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2794 /* 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
|
2795 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
|
2796 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
|
2797 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
|
2798 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
|
2799 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
|
2800 sizes of W's children. */ |
25268 | 2801 |
2802 static int | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2803 window_min_size_1 (w, width_p, safe_p) |
25254 | 2804 struct window *w; |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2805 int width_p, safe_p; |
25254 | 2806 { |
25268 | 2807 struct window *c; |
25254 | 2808 int size; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2809 |
25268 | 2810 if (!NILP (w->hchild)) |
2811 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2812 /* W is a horizontal combination. */ |
25268 | 2813 c = XWINDOW (w->hchild); |
2814 size = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2815 |
25268 | 2816 if (width_p) |
2817 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2818 /* 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
|
2819 the minimum widths of its children. */ |
25268 | 2820 while (c) |
2821 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2822 size += window_min_size_1 (c, 1, safe_p); |
25268 | 2823 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; |
2824 } | |
2825 } | |
2826 else | |
2827 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2828 /* The minimum height of a horizontal combination is the |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2829 maximum of the minimum heights of its children. */ |
25268 | 2830 while (c) |
2831 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2832 size = max (window_min_size_1 (c, 0, safe_p), size); |
25268 | 2833 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; |
2834 } | |
2835 } | |
2836 } | |
2837 else if (!NILP (w->vchild)) | |
2838 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2839 /* W is a vertical combination. */ |
25268 | 2840 c = XWINDOW (w->vchild); |
2841 size = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2842 |
25268 | 2843 if (width_p) |
2844 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2845 /* 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
|
2846 of the minimum widths of its children. */ |
25268 | 2847 while (c) |
2848 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2849 size = max (window_min_size_1 (c, 1, safe_p), size); |
25268 | 2850 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; |
2851 } | |
2852 } | |
2853 else | |
2854 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2855 /* 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
|
2856 the minimum height of its children. */ |
25268 | 2857 while (c) |
2858 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2859 size += window_min_size_1 (c, 0, safe_p); |
25268 | 2860 c = WINDOWP (c->next) ? XWINDOW (c->next) : NULL; |
2861 } | |
2862 } | |
2863 } | |
25254 | 2864 else |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2865 /* W is a leaf window. */ |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2866 size = window_min_size_2 (w, width_p, safe_p); |
25254 | 2867 |
2868 return size; | |
2869 } | |
2870 | |
25268 | 2871 /* 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
|
2872 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
|
2873 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
|
2874 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
|
2875 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
|
2876 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
|
2877 to 1 if W is fixed-size unless FIXED is null. */ |
25268 | 2878 |
2879 static int | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2880 window_min_size (w, width_p, safe_p, ignore_fixed_p, fixed) |
25268 | 2881 struct window *w; |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2882 int width_p, safe_p, ignore_fixed_p, *fixed; |
25268 | 2883 { |
2884 int size, fixed_p; | |
2885 | |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2886 if (ignore_fixed_p) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2887 fixed_p = 0; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2888 else |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
2889 fixed_p = window_fixed_size_p (w, width_p, 1); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2890 |
25268 | 2891 if (fixed) |
2892 *fixed = fixed_p; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2893 |
25268 | 2894 if (fixed_p) |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2895 size = WINDOW_TOTAL_SIZE (w, width_p); |
25268 | 2896 else |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2897 size = window_min_size_1 (w, width_p, safe_p); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
2898 |
25268 | 2899 return size; |
2900 } | |
2901 | |
2902 | |
51223
c1daf1c22f97
(Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents:
51207
diff
changeset
|
2903 /* 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
|
2904 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
|
2905 is still too narrow. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2906 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2907 static int |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2908 adjust_window_margins (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2909 struct window *w; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2910 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2911 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
|
2912 - WINDOW_FRINGE_COLS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2913 - WINDOW_SCROLL_BAR_COLS (w)); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2914 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
|
2915 + WINDOW_RIGHT_MARGIN_COLS (w)); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2916 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2917 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
|
2918 return 1; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2919 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2920 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
|
2921 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2922 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2923 /* 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
|
2924 margins will fix that. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2925 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
|
2926 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
|
2927 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2928 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
|
2929 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
|
2930 = make_number (margin_cols/2); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2931 else |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2932 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
|
2933 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2934 else |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2935 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
|
2936 return 1; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2937 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
2938 |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2939 /* 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
|
2940 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
|
2941 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
|
2942 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
|
2943 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
|
2944 shrink columns, otherwise shrink lines. |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2945 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2946 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
|
2947 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
|
2948 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
|
2949 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
|
2950 and scrollbars. |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2951 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2952 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
|
2953 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
|
2954 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
|
2955 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
|
2956 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2957 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
|
2958 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
|
2959 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
|
2960 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
|
2961 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
|
2962 static int * |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2963 shrink_windows (total, size, nchildren, shrinkable, resize_fixed_p, |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2964 forward, width_p, safe_p) |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2965 int total, size, nchildren, shrinkable; |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2966 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
|
2967 Lisp_Object forward; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2968 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2969 int available_resize = 0; |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2970 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
|
2971 struct window *c; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2972 Lisp_Object child; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2973 int smallest = total; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2974 int total_removed = 0; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2975 int total_shrink = total - size; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2976 int i; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2977 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2978 new_sizes = xmalloc (sizeof (*new_sizes) * nchildren); |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2979 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
|
2980 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2981 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
|
2982 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2983 int child_size; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2984 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2985 c = XWINDOW (child); |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2986 child_size = WINDOW_TOTAL_SIZE (c, width_p); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2987 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2988 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
|
2989 new_sizes[i] = -1; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2990 else |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2991 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2992 new_sizes[i] = child_size; |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2993 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
|
2994 if (child_size > min_sizes[i] |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2995 && NILP (c->resize_proportionally)) |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
2996 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
|
2997 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2998 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
2999 /* 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
|
3000 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
|
3001 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3002 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
|
3003 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3004 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
|
3005 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
|
3006 smallest = new_sizes[i]; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3007 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3008 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
|
3009 if (new_sizes[i] == smallest) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3010 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3011 /* 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
|
3012 new_sizes[i] = 0; |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3013 if (smallest > min_sizes[i]) |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3014 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
|
3015 available_resize += smallest; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3016 --shrinkable; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3017 total_removed += smallest; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3018 |
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
|
3019 /* 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
|
3020 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
|
3021 |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3022 /* 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
|
3023 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
|
3024 break; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3025 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3026 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3027 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3028 /* 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
|
3029 proportional to its size. */ |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3030 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
|
3031 { |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3032 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
|
3033 { |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3034 int to_shrink = total_shrink * new_sizes[i] / total; |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3035 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3036 if (new_sizes[i] - to_shrink < min_sizes[i]) |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3037 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
|
3038 new_sizes[i] -= to_shrink; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3039 total_removed += to_shrink; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3040 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3041 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3042 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3043 /* 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
|
3044 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
|
3045 while (total_shrink > total_removed) |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3046 { |
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
|
3047 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
|
3048 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
|
3049 |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
3050 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
|
3051 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
|
3052 { |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
3053 ++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
|
3054 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
|
3055 } |
58441
9b7ff064cb26
(set_window_buffer): Clear display_error_modiff.
Kim F. Storm <storm@cua.dk>
parents:
58265
diff
changeset
|
3056 |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3057 for (i = 0; i < nchildren; ++i) |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3058 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
|
3059 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3060 --new_sizes[i]; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3061 ++total_removed; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3062 |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3063 /* 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
|
3064 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
|
3065 break; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3066 } |
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
|
3067 |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
3068 /* 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
|
3069 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
|
3070 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
|
3071 } |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
3072 |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
3073 /* 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
|
3074 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
|
3075 { |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
3076 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
|
3077 { |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
3078 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
|
3079 { |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
3080 ++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
|
3081 --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
|
3082 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
|
3083 } |
72149deebe89
* window.c (shrink_windows): Handle special case of one window left
Jan Djärv <jan.h.d@swipnet.se>
parents:
58175
diff
changeset
|
3084 } |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3085 } |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3086 |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3087 xfree (min_sizes); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3088 |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3089 return new_sizes; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3090 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3091 |
25268 | 3092 /* 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
|
3093 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
|
3094 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
|
3095 |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3096 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
|
3097 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
|
3098 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
|
3099 |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3100 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
|
3101 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
|
3102 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
|
3103 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
|
3104 This should give better behavior when resizing frames. */ |
25268 | 3105 |
3106 static void | |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3107 size_window (window, size, width_p, nodelete_p, first_only, last_only) |
25268 | 3108 Lisp_Object window; |
3109 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
|
3110 int first_only, last_only; |
25268 | 3111 { |
3112 struct window *w = XWINDOW (window); | |
3113 struct window *c; | |
3114 Lisp_Object child, *forward, *sideward; | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3115 int old_size = WINDOW_TOTAL_SIZE (w, width_p); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3116 |
32824
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
3117 size = max (0, size); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3118 |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3119 /* Delete WINDOW if it's too small. */ |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3120 if (nodelete_p != 1 && !NILP (w->parent) |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3121 && 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
|
3122 { |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3123 delete_window (window); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3124 return; |
25268 | 3125 } |
3126 | |
3127 /* Set redisplay hints. */ | |
32824
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
3128 w->last_modified = make_number (0); |
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
3129 w->last_overlay_modified = make_number (0); |
25268 | 3130 windows_or_buffers_changed++; |
32824
6521cc146e8e
(size_window): Prevent setting window's width or
Gerd Moellmann <gerd@gnu.org>
parents:
32800
diff
changeset
|
3131 FRAME_WINDOW_SIZES_CHANGED (XFRAME (w->frame)) = 1; |
25268 | 3132 |
3133 if (width_p) | |
3134 { | |
3135 sideward = &w->vchild; | |
3136 forward = &w->hchild; | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3137 w->total_cols = make_number (size); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3138 adjust_window_margins (w); |
25268 | 3139 } |
3140 else | |
3141 { | |
3142 sideward = &w->hchild; | |
3143 forward = &w->vchild; | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3144 w->total_lines = make_number (size); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3145 w->orig_total_lines = Qnil; |
25268 | 3146 } |
3147 | |
3148 if (!NILP (*sideward)) | |
3149 { | |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3150 /* We have a chain of parallel siblings whose size should all change. */ |
25268 | 3151 for (child = *sideward; !NILP (child); child = c->next) |
3152 { | |
3153 c = XWINDOW (child); | |
3154 if (width_p) | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3155 c->left_col = w->left_col; |
25268 | 3156 else |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3157 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
|
3158 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
|
3159 first_only, last_only); |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3160 } |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3161 } |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3162 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
|
3163 { |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3164 /* 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
|
3165 Lisp_Object last_child; |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3166 int child_size; |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3167 |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3168 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
|
3169 { |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3170 c = XWINDOW (child); |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3171 last_child = child; |
25268 | 3172 } |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3173 |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3174 child_size = WINDOW_TOTAL_SIZE (c, width_p); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3175 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
|
3176 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
|
3177 } |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3178 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
|
3179 { |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3180 /* 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
|
3181 int child_size; |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3182 |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3183 child = *forward; |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3184 c = XWINDOW (child); |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3185 |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3186 if (width_p) |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3187 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
|
3188 else |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3189 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
|
3190 |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3191 child_size = WINDOW_TOTAL_SIZE (c, width_p); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3192 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
|
3193 width_p, nodelete_p, first_only, last_only); |
25268 | 3194 } |
3195 else if (!NILP (*forward)) | |
3196 { | |
3197 int fixed_size, each, extra, n; | |
3198 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
|
3199 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
|
3200 int *new_sizes = NULL; |
25268 | 3201 |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3202 /* Determine the fixed-size portion of this window, and the |
25268 | 3203 number of child windows. */ |
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
3204 fixed_size = nchildren = nfixed = total = 0; |
25268 | 3205 for (child = *forward; !NILP (child); child = c->next, ++nchildren) |
3206 { | |
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
3207 int child_size; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3208 |
25268 | 3209 c = XWINDOW (child); |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3210 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
|
3211 total += child_size; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3212 |
25268 | 3213 if (window_fixed_size_p (c, width_p, 0)) |
3214 { | |
32928
859adc7ac97d
(size_window): Compute size difference from sum of old
Gerd Moellmann <gerd@gnu.org>
parents:
32871
diff
changeset
|
3215 fixed_size += child_size; |
25268 | 3216 ++nfixed; |
3217 } | |
3218 } | |
3219 | |
3220 /* If the new size is smaller than fixed_size, or if there | |
3221 aren't any resizable windows, allow resizing fixed-size | |
3222 windows. */ | |
3223 resize_fixed_p = nfixed == nchildren || size < fixed_size; | |
3224 | |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3225 /* Compute how many lines/columns to add/remove to each child. The |
25268 | 3226 value of extra takes care of rounding errors. */ |
3227 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
|
3228 if (size < total && n > 1) |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3229 new_sizes = shrink_windows (total, size, nchildren, n, |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3230 resize_fixed_p, *forward, width_p, |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3231 nodelete_p == 2); |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3232 else |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3233 { |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3234 each = (size - total) / n; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3235 extra = (size - total) - n * each; |
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3236 } |
25268 | 3237 |
3238 /* 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
|
3239 first_pos = width_p ? XINT (w->left_col) : XINT (w->top_line); |
25268 | 3240 last_pos = first_pos; |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3241 for (n = 0, child = *forward; !NILP (child); child = c->next, ++n) |
25268 | 3242 { |
3243 int new_size, old_size; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3244 |
25268 | 3245 c = XWINDOW (child); |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3246 old_size = WINDOW_TOTAL_SIZE (c, width_p); |
25268 | 3247 new_size = old_size; |
3248 | |
3249 /* The top or left edge position of this child equals the | |
3250 bottom or right edge of its predecessor. */ | |
3251 if (width_p) | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3252 c->left_col = make_number (last_pos); |
25268 | 3253 else |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3254 c->top_line = make_number (last_pos); |
25268 | 3255 |
3256 /* If this child can be resized, do it. */ | |
3257 if (resize_fixed_p || !window_fixed_size_p (c, width_p, 0)) | |
3258 { | |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3259 new_size = new_sizes ? new_sizes[n] : old_size + each + extra; |
25268 | 3260 extra = 0; |
3261 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3262 |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3263 /* Set new size. Note that size_window also propagates |
25268 | 3264 edge positions to children, so it's not a no-op if we |
3265 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
|
3266 size_window (child, new_size, width_p, 1, first_only, last_only); |
25268 | 3267 |
3268 /* Remember the bottom/right edge position of this child; it | |
3269 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
|
3270 last_pos += new_size; |
25268 | 3271 } |
3272 | |
95481
4390d64d3328
Make "xfree (NULL)" a no-op; remove useless if-before-xfree.
Jim Meyering <jim@meyering.net>
parents:
94963
diff
changeset
|
3273 xfree (new_sizes); |
52821
20085e7ea081
* window.c (shrink_windows): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52617
diff
changeset
|
3274 |
25268 | 3275 /* We should have covered the parent exactly with child windows. */ |
3276 xassert (size == last_pos - first_pos); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
3277 |
25268 | 3278 /* Now delete any children that became too small. */ |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3279 if (nodelete_p != 1) |
25268 | 3280 for (child = *forward; !NILP (child); child = c->next) |
3281 { | |
3282 int child_size; | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3283 |
25268 | 3284 c = XWINDOW (child); |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3285 child_size = WINDOW_TOTAL_SIZE (c, width_p); |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3286 size_window (child, child_size, width_p, nodelete_p, |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3287 first_only, last_only); |
25268 | 3288 } |
3289 } | |
3290 } | |
3291 | |
3292 /* 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
|
3293 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
|
3294 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
|
3295 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
|
3296 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
|
3297 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
|
3298 displayed correctly. */ |
265 | 3299 |
20351 | 3300 void |
265 | 3301 set_window_height (window, height, nodelete) |
3302 Lisp_Object window; | |
3303 int height; | |
3304 int nodelete; | |
3305 { | |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3306 size_window (window, height, 0, nodelete, 0, 0); |
265 | 3307 } |
3308 | |
25268 | 3309 /* 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
|
3310 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
|
3311 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
|
3312 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
|
3313 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
|
3314 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
|
3315 displayed correctly. */ |
265 | 3316 |
20351 | 3317 void |
265 | 3318 set_window_width (window, width, nodelete) |
3319 Lisp_Object window; | |
3320 int width; | |
3321 int nodelete; | |
3322 { | |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
3323 size_window (window, width, 1, nodelete, 0, 0); |
265 | 3324 } |
25268 | 3325 |
50367
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3326 /* 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
|
3327 |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3328 void |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3329 change_window_heights (window, n) |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3330 Lisp_Object window; |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3331 int n; |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3332 { |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3333 struct window *w = XWINDOW (window); |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3334 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3335 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
|
3336 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
|
3337 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3338 if (INTEGERP (w->orig_top_line)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3339 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
|
3340 if (INTEGERP (w->orig_total_lines)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3341 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
|
3342 |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3343 /* 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
|
3344 if (!NILP (w->vchild)) |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3345 change_window_heights (w->vchild, n); |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3346 |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3347 /* 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
|
3348 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
|
3349 { |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3350 w = XWINDOW (window); |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3351 change_window_heights (window, n); |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3352 } |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3353 } |
169f9122da43
Remove extern decl for frame parameter vars.
Kim F. Storm <storm@cua.dk>
parents:
50233
diff
changeset
|
3354 |
265 | 3355 |
362 | 3356 int window_select_count; |
265 | 3357 |
51240
1fe905dd5836
(Fset_window_buffer): Add type of `keep_margins' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51223
diff
changeset
|
3358 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
|
3359 EXFUN (Fset_window_scroll_bars, 4); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3360 |
93068
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3361 static void |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3362 run_funs (Lisp_Object funs) |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3363 { |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3364 for (; CONSP (funs); funs = XCDR (funs)) |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3365 if (!EQ (XCAR (funs), Qt)) |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3366 call0 (XCAR (funs)); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3367 } |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3368 |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3369 static Lisp_Object select_window_norecord (Lisp_Object window); |
99322
e03a3537f4a2
(select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
99277
diff
changeset
|
3370 static Lisp_Object select_frame_norecord (Lisp_Object frame); |
93068
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3371 |
88050
449ffc76e463
* window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87847
diff
changeset
|
3372 void |
449ffc76e463
* window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87847
diff
changeset
|
3373 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
|
3374 { |
99120
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
3375 int count = SPECPDL_INDEX (); |
93068
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3376 Lisp_Object frame, global_wcch |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3377 = Fdefault_value (Qwindow_configuration_change_hook); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3378 XSETFRAME (frame, f); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3379 |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3380 if (NILP (Vrun_hooks)) |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3381 return; |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3382 |
99120
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
3383 if (SELECTED_FRAME () != f) |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
3384 { |
99322
e03a3537f4a2
(select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
99277
diff
changeset
|
3385 record_unwind_protect (select_frame_norecord, Fselected_frame ()); |
e03a3537f4a2
(select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
99277
diff
changeset
|
3386 Fselect_frame (frame, Qt); |
99120
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
3387 } |
93068
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3388 |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3389 /* 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
|
3390 if (current_buffer != XBUFFER (Fwindow_buffer (Qnil))) |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3391 { |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3392 record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3393 Fset_buffer (Fwindow_buffer (Qnil)); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3394 } |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3395 |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3396 /* Look for buffer-local values. */ |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3397 { |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3398 Lisp_Object windows = Fwindow_list (frame, Qlambda, Qnil); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3399 for (; CONSP (windows); windows = XCDR (windows)) |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3400 { |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3401 Lisp_Object window = XCAR (windows); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3402 Lisp_Object buffer = Fwindow_buffer (window); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3403 if (!NILP (Flocal_variable_p (Qwindow_configuration_change_hook, |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3404 buffer))) |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3405 { |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3406 int count = SPECPDL_INDEX (); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3407 record_unwind_protect (select_window_norecord, Fselected_window ()); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3408 select_window_norecord (window); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3409 run_funs (Fbuffer_local_value (Qwindow_configuration_change_hook, |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3410 buffer)); |
99120
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
3411 unbind_to (count, Qnil); |
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
3412 } |
93068
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3413 } |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3414 } |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3415 |
93068
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3416 run_funs (global_wcch); |
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
3417 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
|
3418 } |
449ffc76e463
* window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87847
diff
changeset
|
3419 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3420 /* 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
|
3421 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
|
3422 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
|
3423 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
|
3424 reset from the buffer's local settings. */ |
24997
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 void |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3427 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
|
3428 Lisp_Object window, buffer; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3429 int run_hooks_p, keep_margins_p; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3430 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3431 struct window *w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3432 struct buffer *b = XBUFFER (buffer); |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
3433 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
|
3434 int samebuf = EQ (buffer, w->buffer); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3435 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3436 w->buffer = buffer; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3437 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3438 if (EQ (window, selected_window)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3439 b->last_selected_window = window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3440 |
58441
9b7ff064cb26
(set_window_buffer): Clear display_error_modiff.
Kim F. Storm <storm@cua.dk>
parents:
58265
diff
changeset
|
3441 /* Let redisplay errors through. */ |
9b7ff064cb26
(set_window_buffer): Clear display_error_modiff.
Kim F. Storm <storm@cua.dk>
parents:
58265
diff
changeset
|
3442 b->display_error_modiff = 0; |
9b7ff064cb26
(set_window_buffer): Clear display_error_modiff.
Kim F. Storm <storm@cua.dk>
parents:
58265
diff
changeset
|
3443 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3444 /* Update time stamps of buffer display. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3445 if (INTEGERP (b->display_count)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3446 XSETINT (b->display_count, XINT (b->display_count) + 1); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3447 b->display_time = Fcurrent_time (); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3448 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3449 XSETFASTINT (w->window_end_pos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3450 XSETFASTINT (w->window_end_vpos, 0); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3451 bzero (&w->last_cursor, sizeof w->last_cursor); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3452 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
|
3453 if (!(keep_margins_p && samebuf)) |
99189
dc2662d377a4
* window.c (Fwindowp, Fwindow_live_p, Fwindow_minibuffer_p)
Juanma Barranquero <lekktu@gmail.com>
parents:
99160
diff
changeset
|
3454 { /* If we're not actually changing the buffer, don't reset hscroll and |
87847
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3455 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
|
3456 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
|
3457 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
|
3458 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
|
3459 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
|
3460 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
|
3461 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
|
3462 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
|
3463 w->vscroll = 0; |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3464 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
|
3465 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
|
3466 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
|
3467 buffer); |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3468 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
|
3469 w->force_start = Qnil; |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3470 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
|
3471 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
|
3472 } |
800f21c9f989
(set_window_buffer): Don't unnecessarily reset hscroll and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
3473 /* 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
|
3474 I doubt it's worth the trouble. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3475 windows_or_buffers_changed++; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3476 |
98154
b67146e746c0
(set_window_buffer): Always preserve current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
97141
diff
changeset
|
3477 /* We must select BUFFER for running the window-scroll-functions. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3478 /* We can't check ! NILP (Vwindow_scroll_functions) here |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3479 because that might itself be a local variable. */ |
98154
b67146e746c0
(set_window_buffer): Always preserve current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
97141
diff
changeset
|
3480 if (window_initialized) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3481 { |
98154
b67146e746c0
(set_window_buffer): Always preserve current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
97141
diff
changeset
|
3482 record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3483 Fset_buffer (buffer); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3484 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3485 |
95777
edc51d72cb17
* window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
3486 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
|
3487 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3488 if (!keep_margins_p) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3489 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3490 /* 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
|
3491 |
51223
c1daf1c22f97
(Fset_window_scroll_bars): Fix typo in argument name.
Juanma Barranquero <lekktu@gmail.com>
parents:
51207
diff
changeset
|
3492 /* 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
|
3493 temporarily disable window margins. */ |
52617
f8adaf14f570
(set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents:
52565
diff
changeset
|
3494 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
|
3495 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
|
3496 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3497 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
|
3498 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3499 Fset_window_fringes (window, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3500 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
|
3501 b->fringes_outside_margins); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3502 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3503 Fset_window_scroll_bars (window, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3504 b->scroll_bar_width, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3505 b->vertical_scroll_bar_type, Qnil); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3506 |
52617
f8adaf14f570
(set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents:
52565
diff
changeset
|
3507 w->left_margin_cols = save_left; |
f8adaf14f570
(set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents:
52565
diff
changeset
|
3508 w->right_margin_cols = save_right; |
f8adaf14f570
(set_window_buffer): Fix redisplay problems when
Kim F. Storm <storm@cua.dk>
parents:
52565
diff
changeset
|
3509 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3510 Fset_window_margins (window, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3511 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
|
3512 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3513 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3514 if (run_hooks_p) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3515 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3516 if (! NILP (Vwindow_scroll_functions)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3517 run_hook_with_args_2 (Qwindow_scroll_functions, window, |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3518 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
|
3519 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
|
3520 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3521 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3522 unbind_to (count, Qnil); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3523 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3524 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3525 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3526 DEFUN ("set-window-buffer", Fset_window_buffer, Sset_window_buffer, 2, 3, 0, |
98829
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
3527 doc: /* Make WINDOW display BUFFER-OR-NAME as its contents. |
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
3528 WINDOW defaults to the selected window. BUFFER-OR-NAME must be a buffer |
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
3529 or the name of an existing buffer. Optional third argument KEEP-MARGINS |
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
3530 non-nil means that WINDOW's current display margins, fringe widths, and |
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
3531 scroll bar settings are preserved; the default is to reset these from |
99120
43309e005911
(Fget_buffer_window, Fdelete_windows_on, Freplace_buffer_in_windows):
Martin Rudalics <rudalics@gmx.at>
parents:
99034
diff
changeset
|
3532 the local settings for BUFFER-OR-NAME or the frame defaults. Return nil. |
98829
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
3533 |
99160
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
3534 This function throws an error when WINDOW is strongly dedicated to its |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
3535 buffer (that is `window-dedicated-p' returns t for WINDOW) and does not |
966b11d23209
(Fwindow_dedicated_p, Fset_window_dedicated_p)
Martin Rudalics <rudalics@gmx.at>
parents:
99142
diff
changeset
|
3536 already display BUFFER-OR-NAME. |
57031
0730ef55b4d8
(Fset_window_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56616
diff
changeset
|
3537 |
99210
ce3730476c2a
(Fwindow_height, Fdelete_window, set_window_buffer)
Martin Rudalics <rudalics@gmx.at>
parents:
99189
diff
changeset
|
3538 This function runs `window-scroll-functions' before running |
ce3730476c2a
(Fwindow_height, Fdelete_window, set_window_buffer)
Martin Rudalics <rudalics@gmx.at>
parents:
99189
diff
changeset
|
3539 `window-configuration-change-hook'. */) |
98829
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
3540 (window, buffer_or_name, keep_margins) |
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
3541 register Lisp_Object window, buffer_or_name, keep_margins; |
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
3542 { |
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
3543 register Lisp_Object tem, buffer; |
265 | 3544 register struct window *w = decode_window (window); |
3545 | |
27848
27b993d2ea05
(Fset_window_buffer): Set WINDOW to the window
Gerd Moellmann <gerd@gnu.org>
parents:
27699
diff
changeset
|
3546 XSETWINDOW (window, w); |
98829
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
3547 buffer = Fget_buffer (buffer_or_name); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3548 CHECK_BUFFER (buffer); |
485 | 3549 if (NILP (XBUFFER (buffer)->name)) |
265 | 3550 error ("Attempt to display deleted buffer"); |
3551 | |
3552 tem = w->buffer; | |
98884
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3553 if (NILP (tem)) |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3554 error ("Window is deleted"); |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3555 else if (!EQ (tem, Qt)) |
98829
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
3556 /* w->buffer is t when the window is first being set up. */ |
265 | 3557 { |
99142
ed258613edc7
(Fset_window_buffer): Undo 2008-10-18 change to re-instate
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
99120
diff
changeset
|
3558 if (!EQ (tem, buffer)) |
ed258613edc7
(Fset_window_buffer): Undo 2008-10-18 change to re-instate
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
99120
diff
changeset
|
3559 if (EQ (w->dedicated, Qt)) |
ed258613edc7
(Fset_window_buffer): Undo 2008-10-18 change to re-instate
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
99120
diff
changeset
|
3560 error ("Window is dedicated to `%s'", SDATA (XBUFFER (tem)->name)); |
ed258613edc7
(Fset_window_buffer): Undo 2008-10-18 change to re-instate
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
99120
diff
changeset
|
3561 else |
ed258613edc7
(Fset_window_buffer): Undo 2008-10-18 change to re-instate
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
99120
diff
changeset
|
3562 w->dedicated = Qnil; |
265 | 3563 |
3564 unshow_buffer (w); | |
3565 } | |
3566 | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3567 set_window_buffer (window, buffer, 1, !NILP (keep_margins)); |
265 | 3568 return Qnil; |
3569 } | |
3570 | |
98829
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
3571 /* Note that selected_window can be nil when this is called from |
e27ba9bfde7a
(Fwindow_width, Fset_window_start)
Martin Rudalics <rudalics@gmx.at>
parents:
98792
diff
changeset
|
3572 Fset_window_configuration. */ |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3573 |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3574 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
|
3575 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
|
3576 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
|
3577 and make WINDOW the frame's selected window. Return WINDOW. |
98176
9f150a0f6e59
(Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents:
98154
diff
changeset
|
3578 Optional second arg NORECORD non-nil means do not put this buffer |
99322
e03a3537f4a2
(select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
99277
diff
changeset
|
3579 at the front of the list of recently selected ones and do not |
e03a3537f4a2
(select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
99277
diff
changeset
|
3580 make this window the most recently selected one. |
98176
9f150a0f6e59
(Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents:
98154
diff
changeset
|
3581 |
9f150a0f6e59
(Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents:
98154
diff
changeset
|
3582 Note that the main editor command loop selects the buffer of the |
9f150a0f6e59
(Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents:
98154
diff
changeset
|
3583 selected window before each command. */) |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3584 (window, norecord) |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3585 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
|
3586 { |
265 | 3587 register struct window *w; |
27869
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3588 register struct window *ow; |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3589 struct frame *sf; |
265 | 3590 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3591 CHECK_LIVE_WINDOW (window); |
265 | 3592 |
3593 w = XWINDOW (window); | |
39953
3a1666ed16b8
(select_window_1): Unfreeze window start. Remove a
Gerd Moellmann <gerd@gnu.org>
parents:
39952
diff
changeset
|
3594 w->frozen_window_start_p = 0; |
265 | 3595 |
98176
9f150a0f6e59
(Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents:
98154
diff
changeset
|
3596 if (NILP (norecord)) |
9f150a0f6e59
(Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents:
98154
diff
changeset
|
3597 { |
9f150a0f6e59
(Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents:
98154
diff
changeset
|
3598 ++window_select_count; |
9f150a0f6e59
(Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents:
98154
diff
changeset
|
3599 XSETFASTINT (w->use_time, window_select_count); |
9f150a0f6e59
(Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents:
98154
diff
changeset
|
3600 } |
9f150a0f6e59
(Fselect_window): Don't update window_select_count and
Martin Rudalics <rudalics@gmx.at>
parents:
98154
diff
changeset
|
3601 |
265 | 3602 if (EQ (window, selected_window)) |
3603 return window; | |
3604 | |
84758
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
3605 sf = SELECTED_FRAME (); |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
3606 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
|
3607 { |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
3608 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
|
3609 /* 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
|
3610 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
|
3611 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
|
3612 frame is active. */ |
99322
e03a3537f4a2
(select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
99277
diff
changeset
|
3613 Fselect_frame (WINDOW_FRAME (w), norecord); |
84758
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
3614 /* 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
|
3615 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
|
3616 return window; |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
3617 } |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
3618 else |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
3619 sf->selected_window = window; |
1ad5dfad0058
(candidate_window_p): Consider frames that are being placed
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84505
diff
changeset
|
3620 |
61444 | 3621 /* Store the current buffer's actual point into the |
3622 old selected window. It belongs to that window, | |
3623 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
|
3624 if (!NILP (selected_window)) |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3625 { |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3626 ow = XWINDOW (selected_window); |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3627 if (! NILP (ow->buffer)) |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3628 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
|
3629 BUF_PT (XBUFFER (ow->buffer)), |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3630 BUF_PT_BYTE (XBUFFER (ow->buffer))); |
1322db65a230
(select_window_1): If selected_window is nil,
Gerd Moellmann <gerd@gnu.org>
parents:
27850
diff
changeset
|
3631 } |
265 | 3632 |
3633 selected_window = window; | |
3634 | |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3635 if (NILP (norecord)) |
22187
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
3636 record_buffer (w->buffer); |
265 | 3637 Fset_buffer (w->buffer); |
3638 | |
16068
b19129a8c644
(unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
3639 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
|
3640 |
265 | 3641 /* Go to the point recorded in the window. |
3642 This is important when the buffer is in more | |
3643 than one window. It also matters when | |
3644 redisplay_window has altered point after scrolling, | |
3645 because it makes the change only in the window. */ | |
3646 { | |
3647 register int new_point = marker_position (w->pointm); | |
3648 if (new_point < BEGV) | |
3649 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
|
3650 else if (new_point > ZV) |
265 | 3651 SET_PT (ZV); |
3652 else | |
3653 SET_PT (new_point); | |
3654 } | |
3655 | |
3656 windows_or_buffers_changed++; | |
3657 return window; | |
3658 } | |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3659 |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3660 static Lisp_Object |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3661 select_window_norecord (window) |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3662 Lisp_Object window; |
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3663 { |
99277
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
3664 return WINDOW_LIVE_P (window) |
d10f49e09034
(Fnext_window, Fprevious_window): Rewrite doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
99210
diff
changeset
|
3665 ? Fselect_window (window, Qt) : selected_window; |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
3666 } |
99322
e03a3537f4a2
(select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
99277
diff
changeset
|
3667 |
e03a3537f4a2
(select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
99277
diff
changeset
|
3668 static Lisp_Object |
e03a3537f4a2
(select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
99277
diff
changeset
|
3669 select_frame_norecord (frame) |
e03a3537f4a2
(select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
99277
diff
changeset
|
3670 Lisp_Object frame; |
e03a3537f4a2
(select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
99277
diff
changeset
|
3671 { |
e03a3537f4a2
(select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
99277
diff
changeset
|
3672 return FRAME_LIVE_P (XFRAME (frame)) |
e03a3537f4a2
(select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
99277
diff
changeset
|
3673 ? Fselect_frame (frame, Qt) : selected_frame; |
e03a3537f4a2
(select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
99277
diff
changeset
|
3674 } |
22187
9509e86a7be5
(window_loop): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
22155
diff
changeset
|
3675 |
95590
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95566
diff
changeset
|
3676 Lisp_Object |
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95566
diff
changeset
|
3677 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
|
3678 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
|
3679 { |
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95566
diff
changeset
|
3680 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
|
3681 } |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3682 |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3683 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
|
3684 0, 1, 0, |
71717
dfc0eccac6a1
(Fforce_window_update): Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
71396
diff
changeset
|
3685 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
|
3686 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
|
3687 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
|
3688 displaying that buffer. */) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3689 (object) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3690 Lisp_Object object; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3691 { |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3692 if (NILP (object)) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3693 { |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3694 windows_or_buffers_changed++; |
54178
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
3695 update_mode_lines++; |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3696 return Qt; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3697 } |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3698 |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3699 if (WINDOWP (object)) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3700 { |
54178
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
3701 struct window *w = XWINDOW (object); |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3702 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
|
3703 w->update_mode_line = Qt; |
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
3704 if (BUFFERP (w->buffer)) |
1ab08664aea0
(window_loop, Fforce_window_update): Force mode line
Kim F. Storm <storm@cua.dk>
parents:
53927
diff
changeset
|
3705 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
|
3706 ++update_mode_lines; |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3707 return Qt; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3708 } |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
3709 |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3710 if (STRINGP (object)) |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3711 object = Fget_buffer (object); |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3712 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
|
3713 { |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3714 /* 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
|
3715 of each of those windows. */ |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3716 |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3717 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
|
3718 return NILP (object) ? Qnil : Qt; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3719 } |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3720 |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3721 /* 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
|
3722 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
|
3723 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
|
3724 return Qnil; |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3725 } |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3726 |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
3727 |
265 | 3728 void |
3729 temp_output_buffer_show (buf) | |
3730 register Lisp_Object buf; | |
3731 { | |
3732 register struct buffer *old = current_buffer; | |
3733 register Lisp_Object window; | |
3734 register struct window *w; | |
3735 | |
18493
d65021d5c39e
(temp_output_buffer_show): Copy default-directory from current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
18065
diff
changeset
|
3736 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
|
3737 |
265 | 3738 Fset_buffer (buf); |
10302
34556316a48a
(temp_output_buffer_show): Use BUF_SAVE_MODIFF.
Richard M. Stallman <rms@gnu.org>
parents:
10043
diff
changeset
|
3739 BUF_SAVE_MODIFF (XBUFFER (buf)) = MODIFF; |
265 | 3740 BEGV = BEG; |
3741 ZV = Z; | |
3742 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
|
3743 #if 0 /* rms: there should be no reason for this. */ |
25375 | 3744 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
|
3745 #endif |
265 | 3746 set_buffer_internal (old); |
3747 | |
67234
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
3748 if (!NILP (Vtemp_buffer_show_function)) |
265 | 3749 call1 (Vtemp_buffer_show_function, buf); |
3750 else | |
3751 { | |
95590
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95566
diff
changeset
|
3752 window = display_buffer (buf, Qnil, Qnil); |
265 | 3753 |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
3754 if (!EQ (XWINDOW (window)->frame, selected_frame)) |
769 | 3755 Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window))); |
265 | 3756 Vminibuf_scroll_window = window; |
3757 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
|
3758 XSETFASTINT (w->hscroll, 0); |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
3759 XSETFASTINT (w->min_hscroll, 0); |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3760 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
|
3761 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
|
3762 |
22149
ad3ee5ec90d1
(Fselect_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
21844
diff
changeset
|
3763 /* 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
|
3764 and its buffer current. */ |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3765 |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3766 if (!NILP (Vrun_hooks) |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3767 && !NILP (Fboundp (Qtemp_buffer_show_hook)) |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3768 && !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
|
3769 { |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3770 int count = SPECPDL_INDEX (); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3771 Lisp_Object prev_window, prev_buffer; |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3772 prev_window = selected_window; |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3773 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
|
3774 |
51674
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3775 /* 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
|
3776 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
|
3777 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
|
3778 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
|
3779 record_unwind_protect (Fset_buffer, prev_buffer); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3780 record_unwind_protect (select_window_norecord, prev_window); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3781 Fselect_window (window, Qt); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3782 Fset_buffer (w->buffer); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3783 call1 (Vrun_hooks, Qtemp_buffer_show_hook); |
c78e0c6e92aa
(Fset_window_dedicated_p): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51477
diff
changeset
|
3784 unbind_to (count, Qnil); |
11405
645e3883da72
(temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents:
11307
diff
changeset
|
3785 } |
645e3883da72
(temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents:
11307
diff
changeset
|
3786 } |
265 | 3787 } |
3788 | |
21514 | 3789 static void |
265 | 3790 make_dummy_parent (window) |
3791 Lisp_Object window; | |
3792 { | |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3793 Lisp_Object new; |
265 | 3794 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
|
3795 int i; |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3796 |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3797 o = XWINDOW (window); |
36432
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
3798 p = allocate_window (); |
9970
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3799 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
|
3800 ((struct Lisp_Vector *) p)->contents[i] |
28af746067b2
(make_window, make_dummy_parent): Use allocate_window.
Gerd Moellmann <gerd@gnu.org>
parents:
36231
diff
changeset
|
3801 = ((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
|
3802 XSETWINDOW (new, p); |
76910d506a80
(make_dummy_parent, make_window): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9964
diff
changeset
|
3803 |
58265
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
3804 ++sequence_number; |
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
3805 XSETFASTINT (p->sequence_number, sequence_number); |
265 | 3806 |
3807 /* Put new into window structure in place of window */ | |
3808 replace_window (window, new); | |
3809 | |
3810 o->next = Qnil; | |
3811 o->prev = Qnil; | |
3812 o->vchild = Qnil; | |
3813 o->hchild = Qnil; | |
3814 o->parent = new; | |
3815 | |
3816 p->start = Qnil; | |
3817 p->pointm = Qnil; | |
3818 p->buffer = Qnil; | |
3819 } | |
3820 | |
3821 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
|
3822 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
|
3823 WINDOW defaults to selected one and SIZE to half its size. |
98792
052c176f40f3
(Fsplit_window): Rename arg horflag to horizontal.
Martin Rudalics <rudalics@gmx.at>
parents:
98176
diff
changeset
|
3824 If optional third arg HORIZONTAL is non-nil, split side by side and put |
052c176f40f3
(Fsplit_window): Rename arg horflag to horizontal.
Martin Rudalics <rudalics@gmx.at>
parents:
98176
diff
changeset
|
3825 SIZE columns in the first of the pair. In that case, SIZE includes that |
052c176f40f3
(Fsplit_window): Rename arg horflag to horizontal.
Martin Rudalics <rudalics@gmx.at>
parents:
98176
diff
changeset
|
3826 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
|
3827 Interactively, all arguments are nil. |
8eb84bf840a8
(Fwindow_buffer, Fother_window, Fget_lru_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56174
diff
changeset
|
3828 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
|
3829 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
|
3830 if it was selected before. |
c53dfaf68575
(Fsplit_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
71041
diff
changeset
|
3831 |
98792
052c176f40f3
(Fsplit_window): Rename arg horflag to horizontal.
Martin Rudalics <rudalics@gmx.at>
parents:
98176
diff
changeset
|
3832 See Info node `(elisp)Splitting Windows' for more details and examples. */) |
052c176f40f3
(Fsplit_window): Rename arg horflag to horizontal.
Martin Rudalics <rudalics@gmx.at>
parents:
98176
diff
changeset
|
3833 (window, size, horizontal) |
052c176f40f3
(Fsplit_window): Rename arg horflag to horizontal.
Martin Rudalics <rudalics@gmx.at>
parents:
98176
diff
changeset
|
3834 Lisp_Object window, size, horizontal; |
265 | 3835 { |
3836 register Lisp_Object new; | |
3837 register struct window *o, *p; | |
13723
4e170419e83c
(Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents:
13619
diff
changeset
|
3838 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
|
3839 register int size_int; |
265 | 3840 |
485 | 3841 if (NILP (window)) |
265 | 3842 window = selected_window; |
3843 else | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3844 CHECK_LIVE_WINDOW (window); |
265 | 3845 |
3846 o = XWINDOW (window); | |
13723
4e170419e83c
(Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents:
13619
diff
changeset
|
3847 fo = XFRAME (WINDOW_FRAME (o)); |
265 | 3848 |
13780
732a8bd9c552
(Fsplit_window): Rename size to size_int and chsize to size.
Karl Heuer <kwzh@gnu.org>
parents:
13723
diff
changeset
|
3849 if (NILP (size)) |
265 | 3850 { |
98792
052c176f40f3
(Fsplit_window): Rename arg horflag to horizontal.
Martin Rudalics <rudalics@gmx.at>
parents:
98176
diff
changeset
|
3851 if (!NILP (horizontal)) |
13723
4e170419e83c
(Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents:
13619
diff
changeset
|
3852 /* 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
|
3853 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
|
3854 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
|
3855 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
|
3856 size_int = (XFASTINT (o->total_cols) + 1) >> 1; |
265 | 3857 else |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3858 size_int = XFASTINT (o->total_lines) >> 1; |
265 | 3859 } |
3860 else | |
3861 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
3862 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
|
3863 size_int = XINT (size); |
265 | 3864 } |
3865 | |
3866 if (MINI_WINDOW_P (o)) | |
3867 error ("Attempt to split minibuffer window"); | |
98792
052c176f40f3
(Fsplit_window): Rename arg horflag to horizontal.
Martin Rudalics <rudalics@gmx.at>
parents:
98176
diff
changeset
|
3868 else if (window_fixed_size_p (o, !NILP (horizontal), 0)) |
25268 | 3869 error ("Attempt to split fixed-size window"); |
265 | 3870 |
98792
052c176f40f3
(Fsplit_window): Rename arg horflag to horizontal.
Martin Rudalics <rudalics@gmx.at>
parents:
98176
diff
changeset
|
3871 if (NILP (horizontal)) |
265 | 3872 { |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3873 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
|
3874 |
78415
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
3875 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
|
3876 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
|
3877 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
|
3878 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
|
3879 XFASTINT (o->total_lines) - size_int); |
485 | 3880 if (NILP (o->parent) |
3881 || NILP (XWINDOW (o->parent)->vchild)) | |
265 | 3882 { |
3883 make_dummy_parent (window); | |
3884 new = o->parent; | |
3885 XWINDOW (new)->vchild = window; | |
3886 } | |
3887 } | |
3888 else | |
3889 { | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
3890 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
|
3891 |
78415
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
3892 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
|
3893 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
|
3894 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
|
3895 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
|
3896 XFASTINT (o->total_cols) - size_int); |
485 | 3897 if (NILP (o->parent) |
3898 || NILP (XWINDOW (o->parent)->hchild)) | |
265 | 3899 { |
3900 make_dummy_parent (window); | |
3901 new = o->parent; | |
3902 XWINDOW (new)->hchild = window; | |
3903 } | |
3904 } | |
3905 | |
3906 /* Now we know that window's parent is a vertical combination | |
3907 if we are dividing vertically, or a horizontal combination | |
3908 if we are making side-by-side windows */ | |
3909 | |
3910 windows_or_buffers_changed++; | |
13723
4e170419e83c
(Fsplit_window): Account for scroll bar width.
Karl Heuer <kwzh@gnu.org>
parents:
13619
diff
changeset
|
3911 FRAME_WINDOW_SIZES_CHANGED (fo) = 1; |
265 | 3912 new = make_window (); |
3913 p = XWINDOW (new); | |
3914 | |
769 | 3915 p->frame = o->frame; |
265 | 3916 p->next = o->next; |
485 | 3917 if (!NILP (p->next)) |
265 | 3918 XWINDOW (p->next)->prev = new; |
3919 p->prev = window; | |
3920 o->next = new; | |
3921 p->parent = o->parent; | |
3922 p->buffer = Qt; | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3923 p->window_end_valid = Qnil; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3924 bzero (&p->last_cursor, sizeof p->last_cursor); |
265 | 3925 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3926 /* Duplicate special geometry settings. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3927 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3928 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
|
3929 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
|
3930 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
|
3931 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
|
3932 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
|
3933 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
|
3934 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
|
3935 |
769 | 3936 /* Apportion the available frame space among the two new windows */ |
265 | 3937 |
98792
052c176f40f3
(Fsplit_window): Rename arg horflag to horizontal.
Martin Rudalics <rudalics@gmx.at>
parents:
98176
diff
changeset
|
3938 if (!NILP (horizontal)) |
265 | 3939 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3940 p->total_lines = o->total_lines; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3941 p->top_line = o->top_line; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3942 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
|
3943 XSETFASTINT (o->total_cols, size_int); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3944 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
|
3945 adjust_window_margins (p); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3946 adjust_window_margins (o); |
265 | 3947 } |
3948 else | |
3949 { | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3950 p->left_col = o->left_col; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3951 p->total_cols = o->total_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3952 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
|
3953 XSETFASTINT (o->total_lines, size_int); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3954 XSETFASTINT (p->top_line, XFASTINT (o->top_line) + size_int); |
265 | 3955 } |
3956 | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3957 /* Adjust glyph matrices. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
3958 adjust_glyphs (fo); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3959 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
3960 Fset_window_buffer (new, o->buffer, Qt); |
265 | 3961 return new; |
3962 } | |
3963 | |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
3964 DEFUN ("enlarge-window", Fenlarge_window, Senlarge_window, 1, 2, "p", |
98884
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3965 doc: /* Make selected window SIZE lines taller. |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3966 Interactively, if no argument is given, make the selected window one |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3967 line taller. If optional argument HORIZONTAL is non-nil, make selected |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3968 window wider by SIZE columns. If SIZE is negative, shrink the window by |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3969 -SIZE lines or columns. Return nil. |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3970 |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3971 This function can delete windows if they get too small. The size of |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3972 fixed size windows is not altered by this function. */) |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3973 (size, horizontal) |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3974 Lisp_Object size, horizontal; |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3975 { |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3976 CHECK_NUMBER (size); |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3977 enlarge_window (selected_window, XINT (size), !NILP (horizontal)); |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3978 |
92192
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
3979 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
|
3980 |
265 | 3981 return Qnil; |
3982 } | |
3983 | |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
3984 DEFUN ("shrink-window", Fshrink_window, Sshrink_window, 1, 2, "p", |
98884
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3985 doc: /* Make selected window SIZE lines smaller. |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3986 Interactively, if no argument is given, make the selected window one |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3987 line smaller. If optional argument HORIZONTAL is non-nil, make the |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3988 window narrower by SIZE columns. If SIZE is negative, enlarge selected |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3989 window by -SIZE lines or columns. Return nil. |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3990 |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3991 This function can delete windows if they get too small. The size of |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3992 fixed size windows is not altered by this function. */) |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3993 (size, horizontal) |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3994 Lisp_Object size, horizontal; |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3995 { |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3996 CHECK_NUMBER (size); |
52608ae6f162
(Fwindow_dedicated_p, Fset_window_dedicated_p):
Martin Rudalics <rudalics@gmx.at>
parents:
98829
diff
changeset
|
3997 enlarge_window (selected_window, -XINT (size), !NILP (horizontal)); |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
3998 |
92192
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
3999 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
|
4000 |
265 | 4001 return Qnil; |
4002 } | |
4003 | |
4004 int | |
4005 window_height (window) | |
4006 Lisp_Object window; | |
4007 { | |
4008 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
|
4009 return WINDOW_TOTAL_LINES (p); |
265 | 4010 } |
4011 | |
4012 int | |
4013 window_width (window) | |
4014 Lisp_Object window; | |
4015 { | |
4016 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
|
4017 return WINDOW_TOTAL_COLS (p); |
265 | 4018 } |
4019 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4020 |
265 | 4021 #define CURBEG(w) \ |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
4022 *(horiz_flag ? &(XWINDOW (w)->left_col) : &(XWINDOW (w)->top_line)) |
265 | 4023 |
4024 #define CURSIZE(w) \ | |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
4025 *(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
|
4026 |
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
4027 |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4028 /* 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
|
4029 horizontally; zero means do it vertically. |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
4030 |
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
4031 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
|
4032 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
|
4033 deleted. */ |
265 | 4034 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4035 static void |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4036 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
|
4037 Lisp_Object window; |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4038 int delta, horiz_flag; |
265 | 4039 { |
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
4040 Lisp_Object parent, next, prev; |
25268 | 4041 struct window *p; |
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
4042 Lisp_Object *sizep; |
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
4043 int maximum; |
20351 | 4044 int (*sizefun) P_ ((Lisp_Object)) |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
4045 = horiz_flag ? window_width : window_height; |
25268 | 4046 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
|
4047 = (horiz_flag ? set_window_width : set_window_height); |
25268 | 4048 |
4049 /* 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
|
4050 if (window_fixed_size_p (XWINDOW (window), horiz_flag, 1)) |
25268 | 4051 error ("Window is not resizable"); |
4052 | |
4053 /* Find the parent of the selected window. */ | |
265 | 4054 while (1) |
4055 { | |
4056 p = XWINDOW (window); | |
4057 parent = p->parent; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4058 |
485 | 4059 if (NILP (parent)) |
265 | 4060 { |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
4061 if (horiz_flag) |
265 | 4062 error ("No other window to side of this one"); |
4063 break; | |
4064 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4065 |
66664
93a5a20be8f1
(Fenlarge_window): Rename SIDE to HORIZONTAL.
Richard M. Stallman <rms@gnu.org>
parents:
66657
diff
changeset
|
4066 if (horiz_flag |
25268 | 4067 ? !NILP (XWINDOW (parent)->hchild) |
485 | 4068 : !NILP (XWINDOW (parent)->vchild)) |
265 | 4069 break; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4070 |
265 | 4071 window = parent; |
4072 } | |
4073 | |
1049
25046e48ce9a
* window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents:
1016
diff
changeset
|
4074 sizep = &CURSIZE (window); |
25046e48ce9a
* window.c (coordinates_in_window): Do not assume that all
Jim Blandy <jimb@redhat.com>
parents:
1016
diff
changeset
|
4075 |
265 | 4076 { |
4077 register int maxdelta; | |
4078 | |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
4079 /* 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
|
4080 |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4081 maxdelta = (!NILP (parent) ? (*sizefun) (parent) - XINT (*sizep) |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4082 /* 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
|
4083 : !NILP (p->next) ? ((*sizefun) (p->next) |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4084 - window_min_size (XWINDOW (p->next), |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4085 horiz_flag, 0, 0, 0)) |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4086 /* 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
|
4087 : !NILP (p->prev) ? ((*sizefun) (p->prev) |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4088 - window_min_size (XWINDOW (p->prev), |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4089 horiz_flag, 0, 0, 0)) |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4090 /* 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
|
4091 or a minibufferless frame. */ |
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4092 : (delta = 0)); |
265 | 4093 |
4094 if (delta > maxdelta) | |
4095 /* This case traps trying to make the minibuffer | |
769 | 4096 the full frame, or make the only window aside from the |
4097 minibuffer the full frame. */ | |
265 | 4098 delta = maxdelta; |
7618
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
4099 } |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
4100 |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4101 if (XINT (*sizep) + delta < window_min_size (XWINDOW (window), |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4102 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
|
4103 { |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
4104 delete_window (window); |
432 | 4105 return; |
7618
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
4106 } |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
4107 |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
4108 if (delta == 0) |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
4109 return; |
45298374e242
(change_window_height): Test for DELTA too small
Richard M. Stallman <rms@gnu.org>
parents:
7545
diff
changeset
|
4110 |
42308
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
4111 /* 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
|
4112 maximum = 0; |
85330
0bc184c59770
* xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85260
diff
changeset
|
4113 for (next = p->next; WINDOWP (next); next = XWINDOW (next)->next) |
25254 | 4114 maximum += (*sizefun) (next) - window_min_size (XWINDOW (next), |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4115 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
|
4116 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
|
4117 maximum += (*sizefun) (prev) - window_min_size (XWINDOW (prev), |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4118 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
|
4119 |
c931d7a1b0df
(enlarge_window): New arg PRESERVE_BEFORE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
42089
diff
changeset
|
4120 /* 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
|
4121 if (delta <= maximum) |
265 | 4122 { |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4123 Lisp_Object first_unaffected; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4124 Lisp_Object first_affected; |
25268 | 4125 int fixed_p; |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4126 |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4127 next = p->next; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4128 prev = p->prev; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4129 first_affected = window; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4130 /* 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
|
4131 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
|
4132 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
|
4133 while (delta != 0 |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4134 && (!NILP (next) || !NILP (prev))) |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4135 { |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4136 if (! NILP (next)) |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4137 { |
25254 | 4138 int this_one = ((*sizefun) (next) |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4139 - window_min_size (XWINDOW (next), horiz_flag, |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4140 0, 0, &fixed_p)); |
25268 | 4141 if (!fixed_p) |
4142 { | |
4143 if (this_one > delta) | |
4144 this_one = delta; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4145 |
25268 | 4146 (*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
|
4147 (*setsizefun) (window, XINT (*sizep) + this_one, 0); |
25268 | 4148 |
4149 delta -= this_one; | |
4150 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4151 |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4152 next = XWINDOW (next)->next; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4153 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4154 |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4155 if (delta == 0) |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4156 break; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4157 |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4158 if (! NILP (prev)) |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4159 { |
25254 | 4160 int this_one = ((*sizefun) (prev) |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4161 - window_min_size (XWINDOW (prev), horiz_flag, |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4162 0, 0, &fixed_p)); |
25268 | 4163 if (!fixed_p) |
4164 { | |
4165 if (this_one > delta) | |
4166 this_one = delta; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4167 |
25268 | 4168 first_affected = prev; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4169 |
25268 | 4170 (*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
|
4171 (*setsizefun) (window, XINT (*sizep) + this_one, 0); |
25268 | 4172 |
4173 delta -= this_one; | |
4174 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4175 |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4176 prev = XWINDOW (prev)->prev; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4177 } |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4178 } |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4179 |
25268 | 4180 xassert (delta == 0); |
4181 | |
16982
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4182 /* 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
|
4183 based on the new sizes. */ |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4184 first_unaffected = next; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4185 prev = first_affected; |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4186 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
|
4187 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
|
4188 { |
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
4189 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
|
4190 /* 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
|
4191 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
|
4192 (*setsizefun) (next, (*sizefun) (next), 0); |
8516fb50f3e5
(change_window_height): Take size from multiple siblings,
Richard M. Stallman <rms@gnu.org>
parents:
16980
diff
changeset
|
4193 } |
265 | 4194 } |
4195 else | |
4196 { | |
4197 register int delta1; | |
4198 register int opht = (*sizefun) (parent); | |
4199 | |
28463
4591d285fb65
* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
4200 if (opht <= XINT (*sizep) + delta) |
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4201 { |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4202 /* 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
|
4203 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
|
4204 Lisp_Object start, tem, next; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4205 |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4206 start = XWINDOW (parent)->vchild; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4207 if (NILP (start)) |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4208 start = XWINDOW (parent)->hchild; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4209 |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4210 /* 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
|
4211 tem = XWINDOW (window)->next; |
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4212 while (! NILP (tem)) |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4213 { |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4214 next = XWINDOW (tem)->next; |
42862
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4215 delete_window (tem); |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4216 tem = next; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4217 } |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4218 |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4219 /* 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
|
4220 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
|
4221 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
|
4222 tem = start; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4223 while (! EQ (tem, window)) |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4224 { |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4225 next = XWINDOW (tem)->next; |
ca273f84f170
(MIN_SAFE_WINDOW_HEIGHT): Value now 1.
Richard M. Stallman <rms@gnu.org>
parents:
42816
diff
changeset
|
4226 delete_window (tem); |
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4227 tem = next; |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4228 } |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4229 } |
265 | 4230 else |
25268 | 4231 { |
4232 /* Otherwise, make delta1 just right so that if we add | |
4233 delta1 lines to this window and to the parent, and then | |
4234 shrink the parent back to its original size, the new | |
4235 proportional size of this window will increase by delta. | |
4236 | |
4237 The function size_window will compute the new height h' | |
4238 of the window from delta1 as: | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4239 |
25268 | 4240 e = delta1/n |
4241 x = delta1 - delta1/n * n for the 1st resizable child | |
4242 h' = h + e + x | |
4243 | |
4244 where n is the number of children that can be resized. | |
4245 We can ignore x by choosing a delta1 that is a multiple of | |
4246 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
|
4247 |
25268 | 4248 h' = h + delta |
4249 | |
4250 So, delta1 must be | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4251 |
25268 | 4252 h + e = h + delta |
4253 delta1/n = delta | |
4254 delta1 = n * delta. | |
4255 | |
47973
b75515b80900
(window_loop): For GET_LRU_WINDOW and GET_LARGEST_WINDOW>,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47865
diff
changeset
|
4256 The number of children n equals the number of resizable |
25268 | 4257 children of this window + 1 because we know window itself |
96361
a99299e4d2de
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
95777
diff
changeset
|
4258 is resizable (otherwise we would have signaled an error). |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4259 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4260 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
|
4261 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
|
4262 use resize_proportionally to work around this problem. */ |
25268 | 4263 |
4264 struct window *w = XWINDOW (window); | |
4265 Lisp_Object s; | |
4266 int n = 1; | |
4267 | |
85330
0bc184c59770
* xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85260
diff
changeset
|
4268 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
|
4269 if (!window_fixed_size_p (XWINDOW (s), horiz_flag, 0)) |
25268 | 4270 ++n; |
85330
0bc184c59770
* xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85260
diff
changeset
|
4271 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
|
4272 if (!window_fixed_size_p (XWINDOW (s), horiz_flag, 0)) |
25268 | 4273 ++n; |
4274 | |
4275 delta1 = n * delta; | |
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4276 |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4277 /* 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
|
4278 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
|
4279 XSETINT (CURSIZE (parent), opht + delta1); |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4280 (*setsizefun) (window, XINT (*sizep) + delta1, 0); |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4281 |
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4282 /* 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
|
4283 shrinking this window and siblings proportionately. This |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4284 brings parent back to correct size. Delta1 was calculated |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4285 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
|
4286 out of the siblings. |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4287 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4288 Temporarily set resize_proportionally to Qt to assure that, |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4289 if necessary, shrink_windows deletes smaller windows rather |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4290 than shrink this window. */ |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4291 w->resize_proportionally = Qt; |
42816
3ba600a336b4
(enlarge_window): When exceeding size of parent,
Richard M. Stallman <rms@gnu.org>
parents:
42603
diff
changeset
|
4292 (*setsizefun) (parent, opht, 0); |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4293 w->resize_proportionally = Qnil; |
25268 | 4294 } |
265 | 4295 } |
4296 | |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
4297 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
|
4298 XSETFASTINT (p->last_overlay_modified, 0); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4299 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4300 /* Adjust glyph matrices. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4301 adjust_glyphs (XFRAME (WINDOW_FRAME (XWINDOW (window)))); |
265 | 4302 } |
25254 | 4303 |
67156
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 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
|
4306 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
|
4307 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
|
4308 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4309 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
|
4310 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
|
4311 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
|
4312 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4313 static void |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4314 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
|
4315 Lisp_Object window; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4316 int delta, horiz_flag; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4317 { |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4318 Lisp_Object parent, child; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4319 struct window *p; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4320 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
|
4321 int delcount = window_deletion_count; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4322 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4323 CHECK_WINDOW (window); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4324 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4325 /* 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
|
4326 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
|
4327 error ("Window is not resizable"); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4328 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4329 while (1) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4330 { |
70081
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4331 Lisp_Object first_parallel = Qnil; |
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4332 |
71339
0c8a94363573
(adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents:
71286
diff
changeset
|
4333 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
|
4334 { |
71396
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
4335 /* 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
|
4336 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
|
4337 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
|
4338 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
|
4339 } |
0c8a94363573
(adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents:
71286
diff
changeset
|
4340 |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4341 p = XWINDOW (window); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4342 parent = p->parent; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4343 |
70081
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4344 /* 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
|
4345 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
|
4346 if (horiz_flag) |
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4347 { |
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4348 if (! NILP (parent) && !NILP (XWINDOW (parent)->vchild)) |
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4349 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
|
4350 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
|
4351 { |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
4352 /* 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
|
4353 which has no parent. */ |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
4354 first_parallel = window; |
58383949ec48
(size_window): New arg FIRST_ONLY. All callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
71339
diff
changeset
|
4355 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
|
4356 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
|
4357 } |
70081
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4358 } |
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4359 else |
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4360 { |
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4361 if (! NILP (parent) && !NILP (XWINDOW (parent)->hchild)) |
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4362 first_parallel = XWINDOW (parent)->hchild; |
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4363 } |
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4364 |
71339
0c8a94363573
(adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents:
71286
diff
changeset
|
4365 /* 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
|
4366 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
|
4367 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
|
4368 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
|
4369 && 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
|
4370 { |
0c8a94363573
(adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents:
71286
diff
changeset
|
4371 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
|
4372 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
|
4373 } |
0c8a94363573
(adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents:
71286
diff
changeset
|
4374 |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4375 /* Don't make this window too small. */ |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4376 if (XINT (CURSIZE (window)) + delta |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4377 < 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
|
4378 { |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4379 Fset_window_configuration (old_config); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4380 error ("Cannot adjust window size as specified"); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4381 } |
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 /* Clear out some redisplay caches. */ |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4384 XSETFASTINT (p->last_modified, 0); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4385 XSETFASTINT (p->last_overlay_modified, 0); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4386 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4387 /* Adjust this window's edge. */ |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4388 XSETINT (CURSIZE (window), |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4389 XINT (CURSIZE (window)) + delta); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4390 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4391 /* 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
|
4392 make them smaller, and exit the loop. |
7130f5a10a22
(adjust_window_trailing_edge): Correctly distinguish
Richard M. Stallman <rms@gnu.org>
parents:
70058
diff
changeset
|
4393 |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4394 (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
|
4395 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
|
4396 if (NILP (first_parallel)) |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4397 { |
71339
0c8a94363573
(adjust_window_trailing_edge): Don't break out of the loop
Richard M. Stallman <rms@gnu.org>
parents:
71286
diff
changeset
|
4398 if (!NILP (p->next)) |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4399 { |
68724
fb5a31085a6f
* window.c (adjust_window_trailing_edge): Check that shrinking
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
4400 /* 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
|
4401 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
|
4402 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
|
4403 { |
fb5a31085a6f
* window.c (adjust_window_trailing_edge): Check that shrinking
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
4404 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
|
4405 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
|
4406 } |
fb5a31085a6f
* window.c (adjust_window_trailing_edge): Check that shrinking
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
4407 |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4408 XSETINT (CURBEG (p->next), |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4409 XINT (CURBEG (p->next)) + delta); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4410 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
|
4411 horiz_flag, 0, 1, 0); |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4412 break; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4413 } |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4414 } |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4415 else |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4416 /* 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
|
4417 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
|
4418 for (child = first_parallel; |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4419 ! NILP (child); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4420 child = XWINDOW (child)->next) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4421 if (! EQ (child, window)) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4422 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
|
4423 horiz_flag, 0, 0, 1); |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4424 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4425 window = parent; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4426 } |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4427 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4428 /* 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
|
4429 we failed. Report failure. */ |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4430 if (delcount != window_deletion_count) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4431 { |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4432 Fset_window_configuration (old_config); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4433 error ("Cannot adjust window size as specified"); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4434 } |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4435 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4436 /* Adjust glyph matrices. */ |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4437 adjust_glyphs (XFRAME (WINDOW_FRAME (XWINDOW (window)))); |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4438 } |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4439 |
265 | 4440 #undef CURBEG |
4441 #undef CURSIZE | |
4442 | |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4443 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
|
4444 Sadjust_window_trailing_edge, 3, 3, 0, |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4445 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
|
4446 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
|
4447 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
|
4448 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4449 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
|
4450 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
|
4451 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
|
4452 (window, delta, horizontal) |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4453 Lisp_Object window, delta, horizontal; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4454 { |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4455 CHECK_NUMBER (delta); |
92192
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
4456 if (NILP (window)) |
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
4457 window = selected_window; |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4458 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
|
4459 |
92192
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
4460 run_window_configuration_change_hook |
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
4461 (XFRAME (WINDOW_FRAME (XWINDOW (window)))); |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4462 |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4463 return Qnil; |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4464 } |
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
4465 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4466 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4467 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4468 /*********************************************************************** |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4469 Resizing Mini-Windows |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4470 ***********************************************************************/ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4471 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4472 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
|
4473 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4474 enum save_restore_action |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4475 { |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4476 CHECK_ORIG_SIZES, |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4477 SAVE_ORIG_SIZES, |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4478 RESTORE_ORIG_SIZES |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4479 }; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4480 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4481 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
|
4482 enum save_restore_action)); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4483 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4484 /* 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
|
4485 from lowest windows first. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4486 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4487 static void |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4488 shrink_window_lowest_first (w, height) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4489 struct window *w; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4490 int height; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4491 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4492 struct window *c; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4493 Lisp_Object child; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4494 int old_height; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4495 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4496 xassert (!MINI_WINDOW_P (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 /* Set redisplay hints. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4499 XSETFASTINT (w->last_modified, 0); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4500 XSETFASTINT (w->last_overlay_modified, 0); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4501 windows_or_buffers_changed++; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4502 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
|
4503 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4504 old_height = XFASTINT (w->total_lines); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4505 XSETFASTINT (w->total_lines, height); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4506 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4507 if (!NILP (w->hchild)) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4508 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4509 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
|
4510 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4511 c = XWINDOW (child); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4512 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
|
4513 shrink_window_lowest_first (c, height); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4514 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4515 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4516 else if (!NILP (w->vchild)) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4517 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4518 Lisp_Object last_child; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4519 int delta = old_height - height; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4520 int last_top; |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
4521 |
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31393
diff
changeset
|
4522 last_child = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4523 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4524 /* 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
|
4525 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
|
4526 backwards. */ |
85330
0bc184c59770
* xfns.c (Fx_create_frame, Fx_display_list):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85260
diff
changeset
|
4527 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
|
4528 last_child = child; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4529 |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4530 /* 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
|
4531 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
|
4532 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4533 int this_one; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4534 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4535 c = XWINDOW (child); |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4536 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
|
4537 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4538 if (this_one > delta) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4539 this_one = delta; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4540 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4541 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
|
4542 delta -= this_one; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4543 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4544 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4545 /* Compute new positions. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4546 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
|
4547 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
|
4548 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4549 c = XWINDOW (child); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4550 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
|
4551 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
|
4552 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
|
4553 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4554 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4555 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4556 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4557 |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4558 /* 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
|
4559 rooted at W. ACTION says what to do. |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4560 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4561 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
|
4562 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
|
4563 tree. Value is non-zero if they are valid. |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4564 |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4565 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
|
4566 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
|
4567 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4568 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
|
4569 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
|
4570 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4571 static int |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4572 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
|
4573 struct window *w; |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4574 enum save_restore_action action; |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4575 { |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4576 int success_p = 1; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4577 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4578 while (w) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4579 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4580 if (!NILP (w->hchild)) |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4581 { |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4582 if (!save_restore_orig_size (XWINDOW (w->hchild), action)) |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4583 success_p = 0; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4584 } |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4585 else if (!NILP (w->vchild)) |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4586 { |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4587 if (!save_restore_orig_size (XWINDOW (w->vchild), action)) |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4588 success_p = 0; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4589 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4590 |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4591 switch (action) |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4592 { |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4593 case CHECK_ORIG_SIZES: |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4594 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
|
4595 return 0; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4596 break; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4597 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4598 case SAVE_ORIG_SIZES: |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4599 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
|
4600 w->orig_total_lines = w->total_lines; |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4601 XSETFASTINT (w->last_modified, 0); |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4602 XSETFASTINT (w->last_overlay_modified, 0); |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4603 break; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4604 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4605 case RESTORE_ORIG_SIZES: |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4606 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
|
4607 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
|
4608 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
|
4609 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
|
4610 XSETFASTINT (w->last_modified, 0); |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4611 XSETFASTINT (w->last_overlay_modified, 0); |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4612 break; |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4613 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4614 default: |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4615 abort (); |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4616 } |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4617 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4618 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
|
4619 } |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4620 |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4621 return success_p; |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4622 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4623 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4624 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4625 /* 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
|
4626 without deleting other windows. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4627 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4628 void |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4629 grow_mini_window (w, delta) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4630 struct window *w; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4631 int delta; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4632 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4633 struct frame *f = XFRAME (w->frame); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4634 struct window *root; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4635 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4636 xassert (MINI_WINDOW_P (w)); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4637 xassert (delta >= 0); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4638 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4639 /* 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
|
4640 other windows. */ |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4641 root = XWINDOW (FRAME_ROOT_WINDOW (f)); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4642 if (delta) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4643 { |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
4644 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
|
4645 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
|
4646 /* 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
|
4647 min_height. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4648 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
|
4649 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4650 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4651 if (delta) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4652 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4653 /* 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
|
4654 if (!save_restore_orig_size (root, CHECK_ORIG_SIZES)) |
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4655 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
|
4656 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4657 /* Shrink other windows. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4658 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
|
4659 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4660 /* Grow the mini-window. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4661 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
|
4662 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
|
4663 XSETFASTINT (w->last_modified, 0); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4664 XSETFASTINT (w->last_overlay_modified, 0); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4665 |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4666 adjust_glyphs (f); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4667 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4668 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4669 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4670 |
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
4671 /* 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
|
4672 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
|
4673 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
|
4674 line. */ |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4675 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4676 void |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4677 shrink_mini_window (w) |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4678 struct window *w; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4679 { |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4680 struct frame *f = XFRAME (w->frame); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4681 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
|
4682 |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4683 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
|
4684 { |
26046
9204dfa34c1b
(enum save_restore_action): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25797
diff
changeset
|
4685 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
|
4686 adjust_glyphs (f); |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4687 FRAME_WINDOW_SIZES_CHANGED (f) = 1; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4688 windows_or_buffers_changed = 1; |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4689 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4690 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
|
4691 { |
35621
5f154b8fc2bd
(size_window): Set the window's orig_top to nil when
Gerd Moellmann <gerd@gnu.org>
parents:
35483
diff
changeset
|
4692 /* 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
|
4693 among the other windows. */ |
25797
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
4694 Lisp_Object window; |
0d73a1e7b7f2
(enlarge_window): Add window parameter instead of using
Gerd Moellmann <gerd@gnu.org>
parents:
25792
diff
changeset
|
4695 XSETWINDOW (window, w); |
67328
97a5b7b69235
(enlarge_window): Eliminate arg preserve_before.
Richard M. Stallman <rms@gnu.org>
parents:
67234
diff
changeset
|
4696 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
|
4697 } |
25792
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4698 } |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4699 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4700 |
80e84cb91f1e
(window_min_size): Add parameter ignore_fixed_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25739
diff
changeset
|
4701 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4702 /* 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
|
4703 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
|
4704 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
|
4705 the frame are cleared. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4706 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4707 void |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4708 mark_window_cursors_off (w) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4709 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4710 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4711 while (w) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4712 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4713 if (!NILP (w->hchild)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4714 mark_window_cursors_off (XWINDOW (w->hchild)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4715 else if (!NILP (w->vchild)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4716 mark_window_cursors_off (XWINDOW (w->vchild)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4717 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4718 w->phys_cursor_on_p = 0; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4719 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4720 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4721 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4722 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4723 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4724 |
37270
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4725 /* Return number of lines of text (not counting mode lines) in W. */ |
265 | 4726 |
4727 int | |
4728 window_internal_height (w) | |
4729 struct window *w; | |
4730 { | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4731 int ht = XFASTINT (w->total_lines); |
265 | 4732 |
37270
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4733 if (!MINI_WINDOW_P (w)) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4734 { |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4735 if (!NILP (w->parent) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4736 || !NILP (w->vchild) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4737 || !NILP (w->hchild) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4738 || !NILP (w->next) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4739 || !NILP (w->prev) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4740 || WINDOW_WANTS_MODELINE_P (w)) |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4741 --ht; |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4742 |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4743 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
|
4744 --ht; |
9bf32a648127
(window_internal_height): Return 1 less if the
Gerd Moellmann <gerd@gnu.org>
parents:
36809
diff
changeset
|
4745 } |
265 | 4746 |
4747 return ht; | |
4748 } | |
4749 | |
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4750 |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4751 /* 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
|
4752 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
|
4753 separating W from the sibling to its right. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4754 |
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4755 int |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4756 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
|
4757 struct window *w; |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4758 { |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4759 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
|
4760 int width = XINT (w->total_cols); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4761 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4762 if (WINDOW_HAS_VERTICAL_SCROLL_BAR (w)) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4763 /* 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
|
4764 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
|
4765 else if (!FRAME_WINDOW_P (f) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4766 && !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
|
4767 /* The column of `|' characters separating side-by-side windows |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4768 occupies one column only. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4769 width -= 1; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4770 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4771 if (FRAME_WINDOW_P (f)) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4772 /* 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
|
4773 used for normal text. */ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4774 width -= (WINDOW_FRINGE_COLS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4775 + WINDOW_LEFT_MARGIN_COLS (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
4776 + 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
|
4777 |
701db778b7a4
(Fwindow_edges): Use new WINDOW_RIGHT_EDGE macro.
Richard M. Stallman <rms@gnu.org>
parents:
16208
diff
changeset
|
4778 return width; |
1783
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4779 } |
8e7932110418
* window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents:
1716
diff
changeset
|
4780 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4781 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4782 /************************************************************************ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4783 Window Scrolling |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4784 ***********************************************************************/ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4785 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4786 /* 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
|
4787 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
|
4788 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
|
4789 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
|
4790 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
|
4791 respectively. */ |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4792 |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4793 static void |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4794 window_scroll (window, n, whole, noerror) |
265 | 4795 Lisp_Object window; |
4796 int n; | |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
4797 int whole; |
522 | 4798 int noerror; |
265 | 4799 { |
47865
22b1643144e9
(window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents:
47567
diff
changeset
|
4800 immediate_quit = 1; |
22b1643144e9
(window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents:
47567
diff
changeset
|
4801 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4802 /* 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
|
4803 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
|
4804 if (FRAME_WINDOW_P (XFRAME (XWINDOW (window)->frame))) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4805 window_scroll_pixel_based (window, n, whole, noerror); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4806 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4807 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
|
4808 |
22b1643144e9
(window_scroll): Set immediate_quit.
Richard M. Stallman <rms@gnu.org>
parents:
47567
diff
changeset
|
4809 immediate_quit = 0; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4810 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4811 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4812 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4813 /* 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
|
4814 heights. See the comment of window_scroll for parameter |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4815 descriptions. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4816 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4817 static void |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4818 window_scroll_pixel_based (window, n, whole, noerror) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4819 Lisp_Object window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4820 int n; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4821 int whole; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4822 int noerror; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4823 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4824 struct it it; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4825 struct window *w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4826 struct text_pos start; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4827 int this_scroll_margin; |
95550
e057f981a6b5
(Fset_window_parameter): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
95547
diff
changeset
|
4828 /* 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
|
4829 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
|
4830 int x, y, rtop, rbot, rowh, vpos; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4831 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4832 SET_TEXT_POS_FROM_MARKER (start, w->start); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4833 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4834 /* 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
|
4835 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
|
4836 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
|
4837 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
|
4838 |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4839 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
|
4840 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4841 /* 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
|
4842 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
|
4843 results for variable height lines. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4844 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
|
4845 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
|
4846 move_it_vertically_backward (&it, window_box_height (w) / 2); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
4847 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4848 /* 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
|
4849 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
|
4850 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
|
4851 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
|
4852 start of the line containing PT in this case. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4853 if (it.current_y <= 0) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4854 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4855 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
|
4856 move_it_vertically_backward (&it, 0); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4857 it.current_y = 0; |
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 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4860 start = it.current.pos; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4861 } |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4862 else if (auto_window_vscroll_p) |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4863 { |
72663
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4864 if (rtop || rbot) /* partially visible */ |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4865 { |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4866 int px; |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4867 int dy = WINDOW_FRAME_LINE_HEIGHT (w); |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4868 if (whole) |
59717
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4869 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
|
4870 - 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
|
4871 dy); |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4872 dy *= n; |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4873 |
72663
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4874 if (n < 0) |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4875 { |
72663
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4876 /* 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
|
4877 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
|
4878 { |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4879 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
|
4880 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
|
4881 return; |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4882 } |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4883 } |
72663
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4884 if (n > 0) |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4885 { |
72663
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4886 /* 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
|
4887 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
|
4888 { |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4889 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
|
4890 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
|
4891 return; |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4892 } |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4893 |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4894 /* 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
|
4895 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
|
4896 { |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4897 int spos; |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4898 |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4899 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
|
4900 /* 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
|
4901 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
|
4902 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
|
4903 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
|
4904 else |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4905 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
|
4906 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
|
4907 w->buffer); |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4908 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
|
4909 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
|
4910 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
|
4911 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
|
4912 /* 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
|
4913 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
|
4914 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
|
4915 return; |
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4916 } |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4917 } |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4918 } |
72663
6e654c485c0a
(Fpos_visible_in_window_p): Adapt to new pos_visible_p.
Kim F. Storm <storm@cua.dk>
parents:
72615
diff
changeset
|
4919 /* Cancel previous vscroll. */ |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
4920 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
|
4921 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4922 |
58083 | 4923 /* 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
|
4924 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
|
4925 if (!NILP (Vscroll_preserve_screen_position)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4926 { |
69209
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
4927 /* 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
|
4928 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
|
4929 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
|
4930 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
|
4931 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
|
4932 || (!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
|
4933 && !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
|
4934 { |
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
4935 start_display (&it, w, start); |
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
4936 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
|
4937 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
|
4938 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
|
4939 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4940 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4941 else |
95566
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
4942 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
|
4943 = window_scroll_pixel_based_preserve_x = -1; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4944 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4945 /* 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
|
4946 backward. The result is the new window start. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4947 start_display (&it, w, start); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4948 if (whole) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4949 { |
59717
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4950 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
|
4951 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
|
4952 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
|
4953 - 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
|
4954 dy) * n; |
34717
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4955 |
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4956 /* 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
|
4957 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
|
4958 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
|
4959 if (dy <= 0) |
59717
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4960 { |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4961 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
|
4962 /* 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
|
4963 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
|
4964 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
|
4965 && start_pos > BEGV) |
351ffb20ab9f
(window_scroll_pixel_based): Fix scrolling in the wrong
Kim F. Storm <storm@cua.dk>
parents:
59700
diff
changeset
|
4966 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
|
4967 } |
34717
c794dfe043b6
(window_scroll_pixel_based): Don't use
Gerd Moellmann <gerd@gnu.org>
parents:
34640
diff
changeset
|
4968 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
|
4969 { |
75b50deae4e9
(window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents:
59677
diff
changeset
|
4970 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
|
4971 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
|
4972 /* 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
|
4973 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
|
4974 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
|
4975 && start_pos < ZV) |
75b50deae4e9
(window_scroll_pixel_based): Force moving to next line
Kim F. Storm <storm@cua.dk>
parents:
59677
diff
changeset
|
4976 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
|
4977 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4978 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4979 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4980 move_it_by_lines (&it, n, 1); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4981 |
49011
594a08370cb3
(window_scroll_pixel_based): Partially undo last change.
Richard M. Stallman <rms@gnu.org>
parents:
48945
diff
changeset
|
4982 /* 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
|
4983 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
|
4984 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
|
4985 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
|
4986 || (n < 0 && IT_CHARPOS (it) == CHARPOS (start))) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
4987 { |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
4988 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
|
4989 { |
48945
a96801f68a82
(window_scroll_pixel_based): Fix check for reaching BEGV.
Richard M. Stallman <rms@gnu.org>
parents:
48927
diff
changeset
|
4990 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
|
4991 && (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
|
4992 > it.last_visible_y)) |
35126
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4993 { |
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4994 /* 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
|
4995 visible. */ |
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4996 w->vscroll = (it.last_visible_y |
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4997 - 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
|
4998 adjust_glyphs (it.f); |
67fa29af4c7b
(window_scroll_pixel_based): Adjust glyph matrices
Gerd Moellmann <gerd@gnu.org>
parents:
35038
diff
changeset
|
4999 } |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5000 else if (noerror) |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5001 return; |
71286
1d2d52a04520
(window_scroll_pixel_based): Signal "Beginning of buffer" when scroll-down
Eli Zaretskii <eliz@gnu.org>
parents:
71146
diff
changeset
|
5002 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
|
5003 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
|
5004 else |
71991
2cbe7a01a491
(window_scroll_pixel_based, window_scroll_line_based):
Kim F. Storm <storm@cua.dk>
parents:
71844
diff
changeset
|
5005 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
|
5006 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5007 else |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5008 { |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5009 if (w->vscroll != 0) |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5010 /* 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
|
5011 visible. */ |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5012 w->vscroll = 0; |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5013 else if (noerror) |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5014 return; |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5015 else |
71991
2cbe7a01a491
(window_scroll_pixel_based, window_scroll_line_based):
Kim F. Storm <storm@cua.dk>
parents:
71844
diff
changeset
|
5016 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
|
5017 } |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5018 |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5019 /* 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
|
5020 |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5021 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
|
5022 |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5023 /* 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
|
5024 vscrolled = 1; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5025 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5026 |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5027 if (! vscrolled) |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5028 { |
45562
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
5029 int pos = IT_CHARPOS (it); |
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
5030 int bytepos; |
49836
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
5031 |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
5032 /* 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
|
5033 the next character. */ |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
5034 if (in_display_vector_p (&it)) |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
5035 { |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
5036 ++pos; |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
5037 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
|
5038 } |
33592610b3e0
(window_scroll_pixel_based): Move outside a
Andreas Schwab <schwab@suse.de>
parents:
49600
diff
changeset
|
5039 |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5040 /* 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
|
5041 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
|
5042 w->buffer); |
45562
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
5043 bytepos = XMARKER (w->start)->bytepos; |
1b62cee42a61
(window_scroll_pixel_based): Don't call Fbolp;
Richard M. Stallman <rms@gnu.org>
parents:
44890
diff
changeset
|
5044 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
|
5045 ? Qt : Qnil); |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5046 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
|
5047 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
|
5048 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
|
5049 /* 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
|
5050 window-scroll-functions. */ |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5051 w->force_start = Qt; |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5052 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5053 |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5054 /* 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
|
5055 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
|
5056 it.current_y = it.vpos = 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5057 |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5058 /* Move PT out of scroll margins. |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5059 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
|
5060 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
|
5061 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
|
5062 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
|
5063 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
|
5064 |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5065 if (n > 0) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5066 { |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5067 /* 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
|
5068 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
|
5069 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
|
5070 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
|
5071 && (NILP (Vscroll_preserve_screen_position) |
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
5072 || 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
|
5073 /* 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
|
5074 ; |
69408
aa89c5390b12
Rename preserve_y to window_scroll_pixel_based_preserve_y.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69342
diff
changeset
|
5075 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
|
5076 { |
59342
132e8f3a36a1
(window_scroll_pixel_based): Don't correct preserve_y
Richard M. Stallman <rms@gnu.org>
parents:
59258
diff
changeset
|
5077 /* 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
|
5078 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
|
5079 move_it_to (&it, -1, |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5080 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
|
5081 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
|
5082 - (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
|
5083 -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
|
5084 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
|
5085 } |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5086 else |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5087 { |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5088 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
|
5089 { |
6bcf9f9c10df
(window_scroll_pixel_based): Exit the move_it_by_lines
Richard M. Stallman <rms@gnu.org>
parents:
44155
diff
changeset
|
5090 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
|
5091 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
|
5092 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
|
5093 break; |
6bcf9f9c10df
(window_scroll_pixel_based): Exit the move_it_by_lines
Richard M. Stallman <rms@gnu.org>
parents:
44155
diff
changeset
|
5094 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5095 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5096 } |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5097 } |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5098 else if (n < 0) |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5099 { |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5100 int charpos, bytepos; |
60198
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
5101 int partial_p; |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5102 |
69408
aa89c5390b12
Rename preserve_y to window_scroll_pixel_based_preserve_y.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69342
diff
changeset
|
5103 /* 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
|
5104 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
|
5105 charpos = IT_CHARPOS (it); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5106 bytepos = IT_BYTEPOS (it); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5107 |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5108 /* 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
|
5109 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
|
5110 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
|
5111 (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
|
5112 - 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
|
5113 -1, |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5114 MOVE_TO_POS | MOVE_TO_Y); |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5115 |
60198
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
5116 /* 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
|
5117 charpos = IT_CHARPOS (it); |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
5118 bytepos = IT_BYTEPOS (it); |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
5119 |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
5120 /* 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
|
5121 if (it.what == IT_EOB) |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
5122 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
|
5123 else |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
5124 { |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
5125 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
|
5126 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
|
5127 } |
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
5128 |
63865
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
5129 if (charpos == PT && !partial_p |
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
5130 && (NILP (Vscroll_preserve_screen_position) |
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
5131 || 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
|
5132 /* 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
|
5133 ; |
69408
aa89c5390b12
Rename preserve_y to window_scroll_pixel_based_preserve_y.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69342
diff
changeset
|
5134 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
|
5135 { |
59258
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5136 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
|
5137 start_display (&it, w, start); |
69209
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
5138 /* 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
|
5139 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
|
5140 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
|
5141 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
|
5142 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
|
5143 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
|
5144 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
|
5145 } |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5146 else |
e5b68c4be92b
(window_scroll_pixel_based): Only look at
Richard M. Stallman <rms@gnu.org>
parents:
58732
diff
changeset
|
5147 { |
60198
d75e10df3675
(window_scroll_pixel_based): When scrolling backwards,
Kim F. Storm <storm@cua.dk>
parents:
59717
diff
changeset
|
5148 if (partial_p) |
34381
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5149 /* 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
|
5150 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
|
5151 { |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5152 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
|
5153 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
|
5154 } |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5155 else |
f9d7bc96177b
(Fpos_visible_in_window_p): Replace FULLY parameter with PARTIALLY,
Miles Bader <miles@gnu.org>
parents:
34277
diff
changeset
|
5156 /* 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
|
5157 SET_PT_BOTH (charpos, bytepos); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5158 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5159 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5160 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5161 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5162 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5163 /* 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
|
5164 See the comment of window_scroll for parameter descriptions. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5165 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5166 static void |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5167 window_scroll_line_based (window, n, whole, noerror) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5168 Lisp_Object window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5169 int n; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5170 int whole; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5171 int noerror; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5172 { |
265 | 5173 register struct window *w = XWINDOW (window); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5174 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
|
5175 register int pos, pos_byte; |
265 | 5176 register int ht = window_internal_height (w); |
5177 register Lisp_Object tem; | |
5178 int lose; | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5179 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
|
5180 int startpos; |
95566
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5181 Lisp_Object original_pos = Qnil; |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5182 |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5183 /* 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
|
5184 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
|
5185 if (whole) |
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5186 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
|
5187 |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5188 startpos = marker_position (w->start); |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5189 |
95566
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5190 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
|
5191 { |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5192 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
|
5193 || (!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
|
5194 && !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
|
5195 { |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5196 struct position posit |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5197 = *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
|
5198 PT, ht, 0, |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5199 -1, XINT (w->hscroll), |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5200 0, w); |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5201 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
|
5202 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
|
5203 } |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5204 |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
5205 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
|
5206 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
|
5207 } |
13102
960db92441d8
(window_scroll): Always set force_start.
Richard M. Stallman <rms@gnu.org>
parents:
12981
diff
changeset
|
5208 |
9324
ac6a5691607f
(make_window, Fset_window_hscroll, Fset_window_start, set_window_height,
Karl Heuer <kwzh@gnu.org>
parents:
9282
diff
changeset
|
5209 XSETFASTINT (tem, PT); |
32773
a7fdbf39d4de
(window_scroll_pixel_based, window_scroll_line_based):
Miles Bader <miles@gnu.org>
parents:
32752
diff
changeset
|
5210 tem = Fpos_visible_in_window_p (tem, window, Qnil); |
265 | 5211 |
485 | 5212 if (NILP (tem)) |
265 | 5213 { |
6341
dfc758dd2b08
(window_scroll, Fmove_to_window_line): Avoid dividing negative numbers,
Karl Heuer <kwzh@gnu.org>
parents:
6326
diff
changeset
|
5214 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
|
5215 startpos = PT; |
265 | 5216 } |
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
|
5217 |
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
|
5218 SET_PT (startpos); |
7347 | 5219 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
|
5220 Fvertical_motion (make_number (n), window); |
7347 | 5221 pos = PT; |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5222 pos_byte = PT_BYTE; |
265 | 5223 bolp = Fbolp (); |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5224 SET_PT_BOTH (opoint, opoint_byte); |
265 | 5225 |
5226 if (lose) | |
522 | 5227 { |
5228 if (noerror) | |
5229 return; | |
5230 else | |
71991
2cbe7a01a491
(window_scroll_pixel_based, window_scroll_line_based):
Kim F. Storm <storm@cua.dk>
parents:
71844
diff
changeset
|
5231 xsignal0 (Qbeginning_of_buffer); |
522 | 5232 } |
265 | 5233 |
5234 if (pos < ZV) | |
5235 { | |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5236 int this_scroll_margin = scroll_margin; |
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5237 |
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5238 /* 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
|
5239 if (this_scroll_margin < 0) |
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5240 this_scroll_margin = 0; |
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5241 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5242 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
|
5243 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
|
5244 |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5245 set_marker_restricted_both (w->start, w->buffer, pos, pos_byte); |
265 | 5246 w->start_at_line_beg = bolp; |
5247 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
|
5248 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
|
5249 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
|
5250 /* 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
|
5251 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
|
5252 w->force_start = Qt; |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5253 |
63865
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
5254 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
|
5255 && (whole || !EQ (Vscroll_preserve_screen_position, Qt))) |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5256 { |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5257 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
|
5258 Fvertical_motion (original_pos, window); |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5259 } |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5260 /* 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
|
5261 that it is outside the scroll margin. */ |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5262 else if (n > 0) |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5263 { |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5264 int top_margin; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5265 |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5266 if (this_scroll_margin > 0) |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5267 { |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5268 SET_PT_BOTH (pos, pos_byte); |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5269 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
|
5270 top_margin = PT; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5271 } |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5272 else |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5273 top_margin = pos; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5274 |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5275 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
|
5276 SET_PT_BOTH (opoint, opoint_byte); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5277 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
|
5278 { |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5279 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
|
5280 Fvertical_motion (original_pos, window); |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5281 } |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
5282 else |
20046
8baac8399a29
(window_scroll): When scrolling forward and point is
Karl Heuer <kwzh@gnu.org>
parents:
19667
diff
changeset
|
5283 SET_PT (top_margin); |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5284 } |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5285 else if (n < 0) |
265 | 5286 { |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5287 int bottom_margin; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5288 |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5289 /* 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
|
5290 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
|
5291 SET_PT_BOTH (pos, pos_byte); |
16559
d62b7f309f2b
(window_scroll): Handle scroll_margin
Richard M. Stallman <rms@gnu.org>
parents:
16555
diff
changeset
|
5292 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
|
5293 if (XFASTINT (tem) == ht - this_scroll_margin) |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5294 bottom_margin = PT; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5295 else |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5296 bottom_margin = PT + 1; |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5297 |
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5298 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
|
5299 SET_PT_BOTH (opoint, opoint_byte); |
265 | 5300 else |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5301 { |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5302 if (!NILP (Vscroll_preserve_screen_position)) |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
5303 { |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5304 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
|
5305 Fvertical_motion (original_pos, window); |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
5306 } |
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
5307 else |
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
5308 Fvertical_motion (make_number (-1), window); |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5309 } |
265 | 5310 } |
5311 } | |
5312 else | |
522 | 5313 { |
5314 if (noerror) | |
5315 return; | |
5316 else | |
71991
2cbe7a01a491
(window_scroll_pixel_based, window_scroll_line_based):
Kim F. Storm <storm@cua.dk>
parents:
71844
diff
changeset
|
5317 xsignal0 (Qend_of_buffer); |
522 | 5318 } |
265 | 5319 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5320 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5321 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5322 /* 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
|
5323 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
|
5324 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
|
5325 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
|
5326 up. This is the guts of Fscroll_up and Fscroll_down. */ |
265 | 5327 |
5328 static void | |
5329 scroll_command (n, direction) | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5330 Lisp_Object n; |
265 | 5331 int direction; |
5332 { | |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46271
diff
changeset
|
5333 int count = SPECPDL_INDEX (); |
265 | 5334 |
85260 | 5335 xassert (eabs (direction) == 1); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5336 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5337 /* 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
|
5338 the moment. But don't screw up if window_scroll gets an error. */ |
265 | 5339 if (XBUFFER (XWINDOW (selected_window)->buffer) != current_buffer) |
548 | 5340 { |
5341 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
5342 Fset_buffer (XWINDOW (selected_window)->buffer); | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5343 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5344 /* Make redisplay consider other windows than just selected_window. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5345 ++windows_or_buffers_changed; |
548 | 5346 } |
265 | 5347 |
485 | 5348 if (NILP (n)) |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5349 window_scroll (selected_window, direction, 1, 0); |
265 | 5350 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
|
5351 window_scroll (selected_window, -direction, 1, 0); |
265 | 5352 else |
5353 { | |
5354 n = Fprefix_numeric_value (n); | |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5355 window_scroll (selected_window, XINT (n) * direction, 0, 0); |
265 | 5356 } |
548 | 5357 |
5358 unbind_to (count, Qnil); | |
265 | 5359 } |
5360 | |
93547
7a747c3c0def
(Fscroll_up, Fscroll_down, Fscroll_left)
Chong Yidong <cyd@stupidchicken.com>
parents:
93436
diff
changeset
|
5361 DEFUN ("scroll-up", Fscroll_up, Sscroll_up, 0, 1, "^P", |
99034
a63f6def7577
(Fwindow_dedicated_p, Fset_window_dedicated_p): Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98884
diff
changeset
|
5362 doc: /* Scroll text of selected window upward ARG lines. |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
5363 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
|
5364 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
|
5365 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
|
5366 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
|
5367 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
|
5368 (arg) |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5369 Lisp_Object arg; |
265 | 5370 { |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5371 scroll_command (arg, 1); |
265 | 5372 return Qnil; |
5373 } | |
5374 | |
93547
7a747c3c0def
(Fscroll_up, Fscroll_down, Fscroll_left)
Chong Yidong <cyd@stupidchicken.com>
parents:
93436
diff
changeset
|
5375 DEFUN ("scroll-down", Fscroll_down, Sscroll_down, 0, 1, "^P", |
99034
a63f6def7577
(Fwindow_dedicated_p, Fset_window_dedicated_p): Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98884
diff
changeset
|
5376 doc: /* Scroll text of selected window down ARG lines. |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
5377 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
|
5378 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
|
5379 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
|
5380 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
|
5381 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
|
5382 (arg) |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5383 Lisp_Object arg; |
265 | 5384 { |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5385 scroll_command (arg, -1); |
265 | 5386 return Qnil; |
5387 } | |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5388 |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5389 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
|
5390 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
|
5391 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
|
5392 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
|
5393 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
|
5394 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
|
5395 `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
|
5396 () |
265 | 5397 { |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5398 Lisp_Object window; |
265 | 5399 |
5400 if (MINI_WINDOW_P (XWINDOW (selected_window)) | |
485 | 5401 && !NILP (Vminibuf_scroll_window)) |
265 | 5402 window = Vminibuf_scroll_window; |
5403 /* If buffer is specified, scroll that buffer. */ | |
485 | 5404 else if (!NILP (Vother_window_scroll_buffer)) |
265 | 5405 { |
5406 window = Fget_buffer_window (Vother_window_scroll_buffer, Qnil); | |
485 | 5407 if (NILP (window)) |
95590
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95566
diff
changeset
|
5408 window = display_buffer (Vother_window_scroll_buffer, Qt, Qnil); |
265 | 5409 } |
5410 else | |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5411 { |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5412 /* 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
|
5413 frame. */ |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5414 window = Fnext_window (selected_window, Qnil, Qnil); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5415 |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5416 if (EQ (window, selected_window)) |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5417 /* 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
|
5418 visible frame. */ |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5419 do |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5420 window = Fnext_window (window, Qnil, Qt); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5421 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
|
5422 && ! EQ (window, selected_window)); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5423 } |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1805
diff
changeset
|
5424 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
5425 CHECK_LIVE_WINDOW (window); |
265 | 5426 |
5427 if (EQ (window, selected_window)) | |
5428 error ("There is no other window"); | |
5429 | |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5430 return window; |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5431 } |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5432 |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5433 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
|
5434 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
|
5435 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
|
5436 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
|
5437 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
|
5438 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
|
5439 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
|
5440 |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
5441 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
|
5442 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
|
5443 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
|
5444 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
|
5445 `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
|
5446 (arg) |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5447 Lisp_Object arg; |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5448 { |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5449 Lisp_Object window; |
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5450 struct window *w; |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46271
diff
changeset
|
5451 int count = SPECPDL_INDEX (); |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5452 |
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
5453 window = Fother_window_for_scrolling (); |
265 | 5454 w = XWINDOW (window); |
5455 | |
5456 /* Don't screw up if window_scroll gets an error. */ | |
5457 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
|
5458 ++windows_or_buffers_changed; |
265 | 5459 |
5460 Fset_buffer (w->buffer); | |
5461 SET_PT (marker_position (w->pointm)); | |
5462 | |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5463 if (NILP (arg)) |
37307
f028d889de06
(window_scroll): Change the meaning of N to mean
Gerd Moellmann <gerd@gnu.org>
parents:
37305
diff
changeset
|
5464 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
|
5465 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
|
5466 window_scroll (window, -1, 1, 1); |
265 | 5467 else |
5468 { | |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5469 if (CONSP (arg)) |
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5470 arg = Fcar (arg); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
5471 CHECK_NUMBER (arg); |
16751
d393cbcfb69c
(window_scroll): Preserve vpos of point
Richard M. Stallman <rms@gnu.org>
parents:
16658
diff
changeset
|
5472 window_scroll (window, XINT (arg), 0, 1); |
265 | 5473 } |
5474 | |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5475 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
|
5476 unbind_to (count, Qnil); |
265 | 5477 |
5478 return Qnil; | |
5479 } | |
5480 | |
93547
7a747c3c0def
(Fscroll_up, Fscroll_down, Fscroll_left)
Chong Yidong <cyd@stupidchicken.com>
parents:
93436
diff
changeset
|
5481 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
|
5482 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
|
5483 Default for ARG is window width minus 2. |
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
5484 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
|
5485 effect after the change. |
99189
dc2662d377a4
* window.c (Fwindowp, Fwindow_live_p, Fwindow_minibuffer_p)
Juanma Barranquero <lekktu@gmail.com>
parents:
99160
diff
changeset
|
5486 If SET-MINIMUM is non-nil, the new scroll amount becomes the |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5487 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
|
5488 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
|
5489 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
|
5490 (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
|
5491 register Lisp_Object arg, set_minimum; |
265 | 5492 { |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5493 Lisp_Object result; |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5494 int hscroll; |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5495 struct window *w = XWINDOW (selected_window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5496 |
485 | 5497 if (NILP (arg)) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5498 XSETFASTINT (arg, window_box_text_cols (w) - 2); |
265 | 5499 else |
5500 arg = Fprefix_numeric_value (arg); | |
5501 | |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5502 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
|
5503 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
|
5504 |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5505 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
|
5506 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
|
5507 |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5508 return result; |
265 | 5509 } |
5510 | |
93547
7a747c3c0def
(Fscroll_up, Fscroll_down, Fscroll_left)
Chong Yidong <cyd@stupidchicken.com>
parents:
93436
diff
changeset
|
5511 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
|
5512 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
|
5513 Default for ARG is window width minus 2. |
34107437eb4d
(Fscroll_left, Fscroll_right): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
40235
diff
changeset
|
5514 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
|
5515 effect after the change. |
99189
dc2662d377a4
* window.c (Fwindowp, Fwindow_live_p, Fwindow_minibuffer_p)
Juanma Barranquero <lekktu@gmail.com>
parents:
99160
diff
changeset
|
5516 If SET-MINIMUM is non-nil, the new scroll amount becomes the |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5517 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
|
5518 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
|
5519 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
|
5520 (arg, set_minimum) |
57898
f85e0cc87926
(Fscroll_right): Fix last change.
Andreas Schwab <schwab@suse.de>
parents:
57874
diff
changeset
|
5521 register Lisp_Object arg, set_minimum; |
265 | 5522 { |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5523 Lisp_Object result; |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5524 int hscroll; |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5525 struct window *w = XWINDOW (selected_window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5526 |
485 | 5527 if (NILP (arg)) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5528 XSETFASTINT (arg, window_box_text_cols (w) - 2); |
265 | 5529 else |
5530 arg = Fprefix_numeric_value (arg); | |
5531 | |
35341
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5532 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
|
5533 result = Fset_window_hscroll (selected_window, make_number (hscroll)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5534 |
57874
b3e916ae83ea
(window_scroll_pixel_based): Update preserve_y for header line if any.
Richard M. Stallman <rms@gnu.org>
parents:
57508
diff
changeset
|
5535 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
|
5536 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
|
5537 |
f3eb82d93802
(Fset_window_hscroll): Don't set window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents:
35126
diff
changeset
|
5538 return result; |
265 | 5539 } |
5540 | |
43624
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5541 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
|
5542 doc: /* Return the window which was selected when entering the minibuffer. |
99034
a63f6def7577
(Fwindow_dedicated_p, Fset_window_dedicated_p): Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98884
diff
changeset
|
5543 Returns nil, if selected window is not a minibuffer window. */) |
43624
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5544 () |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5545 { |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5546 if (minibuf_level > 0 |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5547 && MINI_WINDOW_P (XWINDOW (selected_window)) |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5548 && WINDOW_LIVE_P (minibuf_selected_window)) |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5549 return minibuf_selected_window; |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5550 |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5551 return Qnil; |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5552 } |
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
5553 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5554 /* 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
|
5555 as opposed to its height. */ |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5556 |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5557 static int |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5558 displayed_window_lines (w) |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5559 struct window *w; |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5560 { |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5561 struct it it; |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5562 struct text_pos start; |
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
5563 int height = window_box_height (w); |
33059
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5564 struct buffer *old_buffer; |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5565 int bottom_y; |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5566 |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5567 if (XBUFFER (w->buffer) != current_buffer) |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5568 { |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5569 old_buffer = current_buffer; |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5570 set_buffer_internal (XBUFFER (w->buffer)); |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5571 } |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5572 else |
8fab1b57781b
(displayed_window_lines): Change buffers if necessary.
Gerd Moellmann <gerd@gnu.org>
parents:
32937
diff
changeset
|
5573 old_buffer = NULL; |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5574 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5575 /* 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
|
5576 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
|
5577 calls (recenter -1) while W->start is 1. */ |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5578 if (XMARKER (w->start)->charpos < BEGV) |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5579 SET_TEXT_POS (start, BEGV, BEGV_BYTE); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5580 else if (XMARKER (w->start)->charpos > ZV) |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5581 SET_TEXT_POS (start, ZV, ZV_BYTE); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5582 else |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5583 SET_TEXT_POS_FROM_MARKER (start, w->start); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5584 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5585 start_display (&it, w, start); |
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
5586 move_it_vertically (&it, height); |
36202
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5587 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
|
5588 |
47234
ca48173ebf57
(displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents:
46410
diff
changeset
|
5589 /* 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
|
5590 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
|
5591 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
|
5592 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
|
5593 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
|
5594 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
|
5595 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
|
5596 height++; |
ca48173ebf57
(displayed_window_lines): Correct for one-off bug
Richard M. Stallman <rms@gnu.org>
parents:
46410
diff
changeset
|
5597 |
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
5598 /* 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
|
5599 if (bottom_y < height) |
29488
4eef390d6155
(displayed_window_lines): Take empty lines at
Gerd Moellmann <gerd@gnu.org>
parents:
29485
diff
changeset
|
5600 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5601 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
|
5602 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
|
5603 } |
34384
9669bb49fca2
(Fmove_to_window_line): Skip past any partially visible first line.
Miles Bader <miles@gnu.org>
parents:
34381
diff
changeset
|
5604 |
36202
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5605 if (old_buffer) |
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5606 set_buffer_internal (old_buffer); |
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5607 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5608 return it.vpos; |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5609 } |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5610 |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5611 |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5612 DEFUN ("recenter", Frecenter, Srecenter, 0, 1, "P", |
103557
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
5613 doc: /* Center point in selected window and maybe redisplay frame. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5614 With prefix argument ARG, recenter putting point on screen line ARG |
99034
a63f6def7577
(Fwindow_dedicated_p, Fset_window_dedicated_p): Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98884
diff
changeset
|
5615 relative to the selected window. If ARG is negative, it counts up from the |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5616 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
|
5617 |
103557
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
5618 If ARG is omitted or nil, then recenter with point on the middle line of |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
5619 the selected window; if the variable `recenter-redisplay' is non-nil, |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
5620 also erase the entire frame and redraw it (when `auto-resize-tool-bars' |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
5621 is set to `grow-only', this resets the tool-bar's height to the minimum |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
5622 height needed); if `recenter-redisplay' has the special value `tty', |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
5623 then only tty frame are redrawn. |
74966
749691edf645
(Frecenter): Set minimize_tool_bar_window_p flag
Kim F. Storm <storm@cua.dk>
parents:
74255
diff
changeset
|
5624 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5625 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
|
5626 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
|
5627 (arg) |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5628 register Lisp_Object arg; |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5629 { |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5630 struct window *w = XWINDOW (selected_window); |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5631 struct buffer *buf = XBUFFER (w->buffer); |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5632 struct buffer *obuf = current_buffer; |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5633 int center_p = 0; |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5634 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
|
5635 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
|
5636 int this_scroll_margin; |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5637 |
42089
ca7101bea5ee
(Frecenter): Clear display_error_modiff field.
Richard M. Stallman <rms@gnu.org>
parents:
41980
diff
changeset
|
5638 /* 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
|
5639 obuf->display_error_modiff = 0; |
ca7101bea5ee
(Frecenter): Clear display_error_modiff field.
Richard M. Stallman <rms@gnu.org>
parents:
41980
diff
changeset
|
5640 |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5641 if (NILP (arg)) |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5642 { |
103557
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
5643 if (!NILP (Vrecenter_redisplay) |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
5644 && (!EQ (Vrecenter_redisplay, Qtty) |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
5645 || !NILP (Ftty_type (selected_frame)))) |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
5646 { |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
5647 int i; |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
5648 |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
5649 /* Invalidate pixel data calculated for all compositions. */ |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
5650 for (i = 0; i < n_compositions; i++) |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
5651 composition_table[i]->font = NULL; |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
5652 |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
5653 WINDOW_XFRAME (w)->minimize_tool_bar_window_p = 1; |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
5654 |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
5655 Fredraw_frame (WINDOW_FRAME (w)); |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
5656 SET_FRAME_GARBAGED (WINDOW_XFRAME (w)); |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
5657 } |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
5658 |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5659 center_p = 1; |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5660 } |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5661 else if (CONSP (arg)) /* Just C-u. */ |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5662 center_p = 1; |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5663 else |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5664 { |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5665 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
|
5666 CHECK_NUMBER (arg); |
64133
7e06f331c228
(Frecenter): Fix last change (set iarg before use).
Kim F. Storm <storm@cua.dk>
parents:
64114
diff
changeset
|
5667 iarg = XINT (arg); |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5668 } |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5669 |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5670 set_buffer_internal (buf); |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5671 |
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
|
5672 /* 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
|
5673 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
|
5674 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
|
5675 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
|
5676 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
|
5677 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5678 /* 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
|
5679 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
|
5680 line counts would lead to strange effects. */ |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5681 if (FRAME_WINDOW_P (XFRAME (w->frame))) |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5682 { |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5683 if (center_p) |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5684 { |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5685 struct it it; |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5686 struct text_pos pt; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5687 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5688 SET_TEXT_POS (pt, PT, PT_BYTE); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5689 start_display (&it, w, pt); |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5690 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
|
5691 charpos = IT_CHARPOS (it); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5692 bytepos = IT_BYTEPOS (it); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5693 } |
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
|
5694 else if (iarg < 0) |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5695 { |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5696 struct it it; |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5697 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
|
5698 int nlines = -iarg; |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5699 int extra_line_spacing; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5700 int h = window_box_height (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5701 |
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
|
5702 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
|
5703 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5704 SET_TEXT_POS (pt, PT, PT_BYTE); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5705 start_display (&it, w, pt); |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5706 |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5707 /* 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
|
5708 move_it_by_lines (&it, 0, 1); |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5709 |
38722
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
5710 /* 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
|
5711 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
|
5712 and the lines below. */ |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5713 it.current_y = 0; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5714 it.vpos = 0; |
38722
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
5715 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
|
5716 |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5717 if (it.vpos == nlines) |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5718 h -= it.current_y; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5719 else |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5720 { |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5721 /* Last line has no newline */ |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5722 h -= line_bottom_y (&it); |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5723 it.vpos++; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5724 } |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5725 |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5726 /* 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
|
5727 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
|
5728 |
b1f9c6a7a002
(Frecenter): If ARG < 0, and on a window system
Gerd Moellmann <gerd@gnu.org>
parents:
37307
diff
changeset
|
5729 /* 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
|
5730 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
|
5731 if (it.vpos < nlines) |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5732 { |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5733 nlines -= it.vpos; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5734 extra_line_spacing = it.extra_line_spacing; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5735 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
|
5736 } |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5737 if (h <= 0) |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5738 return Qnil; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5739 |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5740 /* 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
|
5741 start_display (&it, w, pt); |
58175
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5742 it.current_y = 0; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5743 move_it_vertically_backward (&it, h); |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5744 |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5745 /* 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
|
5746 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
|
5747 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
|
5748 in the middle), so move forward. |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5749 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
|
5750 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
|
5751 */ |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5752 h += extra_line_spacing; |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5753 while (-it.current_y > h) |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5754 move_it_by_lines (&it, 1, 1); |
eeb5474ef89f
(window_scroll_pixel_based, Frecenter): Use
Kim F. Storm <storm@cua.dk>
parents:
58083
diff
changeset
|
5755 |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5756 charpos = IT_CHARPOS (it); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5757 bytepos = IT_BYTEPOS (it); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5758 } |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5759 else |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5760 { |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5761 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
|
5762 |
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 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
|
5764 |
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 pos = *vmotion (PT, -iarg, w); |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5766 charpos = pos.bufpos; |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5767 bytepos = pos.bytepos; |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5768 } |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5769 } |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5770 else |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5771 { |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5772 struct position pos; |
36635
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5773 int ht = window_internal_height (w); |
f85346ef86be
(Frecenter): Rewrite code handling negative values
Gerd Moellmann <gerd@gnu.org>
parents:
36471
diff
changeset
|
5774 |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5775 if (center_p) |
64236
667d6d6c7fd9
(Frecenter): Yet another int/Lisp_Object mixup (YAILOM).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64134
diff
changeset
|
5776 iarg = ht / 2; |
64134
0fcb7f3236c9
(Frecenter): Remove superfluous settings of iarg.
Kim F. Storm <storm@cua.dk>
parents:
64133
diff
changeset
|
5777 else if (iarg < 0) |
0fcb7f3236c9
(Frecenter): Remove superfluous settings of iarg.
Kim F. Storm <storm@cua.dk>
parents:
64133
diff
changeset
|
5778 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
|
5779 |
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 /* 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
|
5781 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
|
5782 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
|
5783 |
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 pos = *vmotion (PT, - iarg, w); |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5785 charpos = pos.bufpos; |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5786 bytepos = pos.bytepos; |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5787 } |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5788 |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5789 /* Set the new window start. */ |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5790 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
|
5791 w->window_end_valid = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5792 |
46108
7b8b4ec9573c
(Frecenter): With arg, set optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
46021
diff
changeset
|
5793 w->optional_new_start = Qt; |
7b8b4ec9573c
(Frecenter): With arg, set optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents:
46021
diff
changeset
|
5794 |
34991
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5795 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
|
5796 w->start_at_line_beg = Qt; |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5797 else |
ad94ea6e6549
(Frecenter): Handle centering in graphical frames
Gerd Moellmann <gerd@gnu.org>
parents:
34986
diff
changeset
|
5798 w->start_at_line_beg = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
5799 |
34874
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5800 set_buffer_internal (obuf); |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5801 return Qnil; |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5802 } |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5803 |
3af71a0ef007
(Frecenter): Use displayed_window_lines instead
Gerd Moellmann <gerd@gnu.org>
parents:
34831
diff
changeset
|
5804 |
34416
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5805 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
|
5806 0, 1, 0, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5807 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
|
5808 WINDOW defaults to the selected window. |
99210
ce3730476c2a
(Fwindow_height, Fdelete_window, set_window_buffer)
Martin Rudalics <rudalics@gmx.at>
parents:
99189
diff
changeset
|
5809 |
100770 | 5810 The return value does not include the mode line, any header line, nor |
5811 any partial-height lines in the text display area. */) | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5812 (window) |
34416
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5813 Lisp_Object window; |
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5814 { |
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5815 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
|
5816 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
|
5817 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
|
5818 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
|
5819 } |
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5820 |
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
5821 |
265 | 5822 |
5823 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
|
5824 1, 1, "P", |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
5825 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
|
5826 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
|
5827 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
|
5828 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
|
5829 (arg) |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5830 Lisp_Object arg; |
265 | 5831 { |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5832 struct window *w = XWINDOW (selected_window); |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5833 int lines, start; |
6326
5e662ad3f594
(Fdelete_other_windows): Pass new arg to Fvertical_motion.
Richard M. Stallman <rms@gnu.org>
parents:
6269
diff
changeset
|
5834 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
|
5835 #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
|
5836 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
|
5837 #endif |
265 | 5838 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5839 window = selected_window; |
265 | 5840 start = marker_position (w->start); |
5841 if (start < BEGV || start > ZV) | |
5842 { | |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5843 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
|
5844 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
|
5845 set_marker_both (w->start, w->buffer, PT, PT_BYTE); |
265 | 5846 w->start_at_line_beg = Fbolp (); |
5847 w->force_start = Qt; | |
5848 } | |
5849 else | |
20535
3094e3fd9764
(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20351
diff
changeset
|
5850 Fgoto_char (w->start); |
265 | 5851 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5852 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
|
5853 |
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
|
5854 #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
|
5855 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
|
5856 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
|
5857 #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
|
5858 |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5859 if (NILP (arg)) |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5860 XSETFASTINT (arg, lines / 2); |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5861 else |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5862 { |
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
|
5863 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
|
5864 |
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
|
5865 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
|
5866 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
|
5867 |
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
|
5868 #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
|
5869 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
|
5870 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
|
5871 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
|
5872 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
|
5873 |
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
|
5874 /* 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
|
5875 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
|
5876 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
|
5877 #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
|
5878 |
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
|
5879 arg = make_number (iarg); |
29485
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5880 } |
362c61b5411b
(displayed_window_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28918
diff
changeset
|
5881 |
36202
8d5b7f742286
(Fmove_to_window_line): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
36133
diff
changeset
|
5882 /* 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
|
5883 if (w->vscroll) |
9669bb49fca2
(Fmove_to_window_line): Skip past any partially visible first line.
Miles Bader <miles@gnu.org>
parents:
34381
diff
changeset
|
5884 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
|
5885 |
6326
5e662ad3f594
(Fdelete_other_windows): Pass new arg to Fvertical_motion.
Richard M. Stallman <rms@gnu.org>
parents:
6269
diff
changeset
|
5886 return Fvertical_motion (arg, window); |
265 | 5887 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5888 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5889 |
265 | 5890 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5891 /*********************************************************************** |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5892 Window Configuration |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5893 ***********************************************************************/ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
5894 |
265 | 5895 struct save_window_data |
5896 { | |
85022
96eb42c9e0e3
* window.h (struct window):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85013
diff
changeset
|
5897 EMACS_UINT size; |
265 | 5898 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
|
5899 Lisp_Object selected_frame; |
265 | 5900 Lisp_Object current_window; |
5901 Lisp_Object current_buffer; | |
5902 Lisp_Object minibuf_scroll_window; | |
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
5903 Lisp_Object minibuf_selected_window; |
265 | 5904 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
|
5905 Lisp_Object focus_frame; |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5906 /* 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
|
5907 for one window. */ |
265 | 5908 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
|
5909 |
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
5910 /* 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
|
5911 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
|
5912 |
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
5913 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
|
5914 int frame_tool_bar_lines; |
265 | 5915 }; |
1326
709532b86646
* window.c (SAVE_WINDOW_DATA_SIZE): Define this using sizeof,
Jim Blandy <jimb@redhat.com>
parents:
1325
diff
changeset
|
5916 |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5917 /* This is saved as a Lisp_Vector */ |
265 | 5918 struct saved_window |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5919 { |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5920 /* 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
|
5921 EMACS_UINT size; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5922 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
|
5923 |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5924 Lisp_Object window; |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5925 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
|
5926 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
|
5927 Lisp_Object hscroll, min_hscroll; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5928 Lisp_Object parent, prev; |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5929 Lisp_Object start_at_line_beg; |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5930 Lisp_Object display_table; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
5931 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
|
5932 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
|
5933 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
|
5934 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
|
5935 Lisp_Object dedicated, resize_proportionally; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5936 }; |
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
5937 |
265 | 5938 #define SAVED_WINDOW_N(swv,n) \ |
5939 ((struct saved_window *) (XVECTOR ((swv)->contents[(n)]))) | |
5940 | |
5941 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
|
5942 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
|
5943 (object) |
14089
415aa106fa17
(Fwindowp, Fwindow_live_p, Fother_window, Fenlarge_window, Fshrink_window,
Erik Naggum <erik@naggum.no>
parents:
14027
diff
changeset
|
5944 Lisp_Object object; |
265 | 5945 { |
71041
8aeb086972ae
(struct saved_window): Add `dedicated'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70736
diff
changeset
|
5946 return WINDOW_CONFIGURATIONP (object) ? Qt : Qnil; |
265 | 5947 } |
5948 | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5949 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
|
5950 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
|
5951 (config) |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5952 Lisp_Object config; |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5953 { |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5954 register struct save_window_data *data; |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5955 struct Lisp_Vector *saved_windows; |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5956 |
71844
632e73258d36
(Fwindow_configuration_frame, Fset_window_configuration):
Kim F. Storm <storm@cua.dk>
parents:
71717
diff
changeset
|
5957 CHECK_WINDOW_CONFIGURATION (config); |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5958 |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5959 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
|
5960 saved_windows = XVECTOR (data->saved_windows); |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5961 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
|
5962 } |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
5963 |
2297
bb88d48c290f
(Fselect_window): Use Fhandle_switch_frame.
Richard M. Stallman <rms@gnu.org>
parents:
2210
diff
changeset
|
5964 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
|
5965 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
|
5966 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
|
5967 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
|
5968 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
|
5969 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
|
5970 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
|
5971 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
|
5972 (configuration) |
1016
817b0ce337d7
* window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents:
983
diff
changeset
|
5973 Lisp_Object configuration; |
265 | 5974 { |
5975 register struct save_window_data *data; | |
5976 struct Lisp_Vector *saved_windows; | |
5977 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
|
5978 Lisp_Object frame; |
769 | 5979 FRAME_PTR f; |
45835
aab759361c24
(Fset_window_configuration): Explicitly preserve
Richard M. Stallman <rms@gnu.org>
parents:
45645
diff
changeset
|
5980 int old_point = -1; |
265 | 5981 |
71844
632e73258d36
(Fwindow_configuration_frame, Fset_window_configuration):
Kim F. Storm <storm@cua.dk>
parents:
71717
diff
changeset
|
5982 CHECK_WINDOW_CONFIGURATION (configuration); |
265 | 5983 |
1016
817b0ce337d7
* window.c (Fset_window_configuration): Removed #if 0'd code which
Jim Blandy <jimb@redhat.com>
parents:
983
diff
changeset
|
5984 data = (struct save_window_data *) XVECTOR (configuration); |
265 | 5985 saved_windows = XVECTOR (data->saved_windows); |
5986 | |
5987 new_current_buffer = data->current_buffer; | |
485 | 5988 if (NILP (XBUFFER (new_current_buffer)->name)) |
265 | 5989 new_current_buffer = Qnil; |
45835
aab759361c24
(Fset_window_configuration): Explicitly preserve
Richard M. Stallman <rms@gnu.org>
parents:
45645
diff
changeset
|
5990 else |
48898
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
5991 { |
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
5992 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
|
5993 /* 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
|
5994 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
|
5995 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
|
5996 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
|
5997 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
|
5998 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
|
5999 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
|
6000 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
|
6001 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
|
6002 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
|
6003 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
|
6004 && WINDOWP (selected_window) |
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
6005 && 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
|
6006 && !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
|
6007 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
|
6008 else |
f1564d57f6a1
(Fset_window_configuration): Don't accidentally copy the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67156
diff
changeset
|
6009 old_point = PT; |
48898
3b18ddd398f8
(Fset_window_configuration): Set old_point to correct
David Kastrup <dak@gnu.org>
parents:
47973
diff
changeset
|
6010 else |
61511
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
6011 /* 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
|
6012 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
|
6013 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
|
6014 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
|
6015 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
|
6016 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
|
6017 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
|
6018 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
|
6019 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
|
6020 /* 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
|
6021 && !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
|
6022 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
|
6023 else |
db63a29e7669
(Fset_window_configuration): Be careful when you choose
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61444
diff
changeset
|
6024 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
|
6025 } |
265 | 6026 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6027 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
|
6028 f = XFRAME (frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6029 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6030 /* 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
|
6031 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
|
6032 if (FRAME_LIVE_P (f)) |
265 | 6033 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6034 register struct window *w; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6035 register struct saved_window *p; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6036 struct window *root_window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6037 struct window **leaf_windows; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6038 int n_leaf_windows; |
33277
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
6039 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
|
6040 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6041 /* 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
|
6042 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
|
6043 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
|
6044 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
|
6045 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
|
6046 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
|
6047 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
|
6048 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
|
6049 |
18657 | 6050 /* The mouse highlighting code could get screwed up |
6051 if it runs during this. */ | |
6052 BLOCK_INPUT; | |
6053 | |
86162
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
6054 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
|
6055 || 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
|
6056 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
|
6057 data->frame_cols, 0, 0, 0); |
16051
ccf489f8596e
Removed support for !MULTI_FRAME.
Karl Heuer <kwzh@gnu.org>
parents:
16039
diff
changeset
|
6058 #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
|
6059 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
|
6060 != 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
|
6061 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
|
6062 make_number (0)); |
25115
2105537c5916
(Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25044
diff
changeset
|
6063 #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
|
6064 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
|
6065 != 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
|
6066 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
|
6067 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
|
6068 #endif |
25115
2105537c5916
(Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25044
diff
changeset
|
6069 #endif |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6070 |
61444 | 6071 /* "Swap out" point from the selected window's buffer |
6072 into the window itself. (Normally the pointm of the selected | |
6073 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
|
6074 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
|
6075 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
|
6076 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
|
6077 { |
0753fa7a67f3
(Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents:
20535
diff
changeset
|
6078 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
|
6079 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
|
6080 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
|
6081 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
|
6082 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
|
6083 } |
0753fa7a67f3
(Fselect_window): Don't set OW->pointm if OW->buffer is nil.
Richard M. Stallman <rms@gnu.org>
parents:
20535
diff
changeset
|
6084 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6085 windows_or_buffers_changed++; |
10666
e1dfb47b664e
(Fdelete_window, set_window_height, set_window_width)
Richard M. Stallman <rms@gnu.org>
parents:
10461
diff
changeset
|
6086 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
|
6087 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6088 /* Problem: Freeing all matrices and later allocating them again |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6089 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
|
6090 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
|
6091 below. */ |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6092 root_window = XWINDOW (FRAME_ROOT_WINDOW (f)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6093 leaf_windows |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6094 = (struct window **) alloca (count_windows (root_window) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6095 * sizeof (struct window *)); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6096 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
|
6097 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6098 /* Kludge Alert! |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6099 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
|
6100 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
|
6101 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6102 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
|
6103 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
|
6104 dead. */ |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6105 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
|
6106 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6107 for (k = 0; k < saved_windows->size; k++) |
265 | 6108 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6109 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
|
6110 w = XWINDOW (p->window); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6111 w->next = Qnil; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6112 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6113 if (!NILP (p->parent)) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6114 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
|
6115 XFASTINT (p->parent))->window; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6116 else |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6117 w->parent = Qnil; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6118 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6119 if (!NILP (p->prev)) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6120 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6121 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
|
6122 XFASTINT (p->prev))->window; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6123 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
|
6124 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6125 else |
265 | 6126 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6127 w->prev = Qnil; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6128 if (!NILP (w->parent)) |
265 | 6129 { |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6130 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
|
6131 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6132 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
|
6133 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
|
6134 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6135 else |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6136 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6137 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
|
6138 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
|
6139 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6140 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6141 } |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6142 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6143 /* 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
|
6144 restore it now. */ |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6145 if (BUFFERP (w->total_lines)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6146 w->buffer = w->total_lines; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6147 w->left_col = p->left_col; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6148 w->top_line = p->top_line; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6149 w->total_cols = p->total_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6150 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
|
6151 w->hscroll = p->hscroll; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
6152 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
|
6153 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
|
6154 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
|
6155 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
|
6156 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
|
6157 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
|
6158 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
|
6159 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
|
6160 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
|
6161 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
|
6162 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
|
6163 w->dedicated = p->dedicated; |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
6164 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
|
6165 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
|
6166 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
|
6167 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6168 /* 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
|
6169 if (NILP (p->buffer)) |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6170 w->buffer = p->buffer; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6171 else |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6172 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6173 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
|
6174 /* 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
|
6175 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6176 w->buffer = p->buffer; |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6177 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
|
6178 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
|
6179 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
|
6180 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
|
6181 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
|
6182 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6183 /* 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
|
6184 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
|
6185 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
|
6186 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
|
6187 && 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
|
6188 Fgoto_char (w->pointm); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6189 } |
3535
581c09f72dbd
(Fset_window_configuration): If a window is supposed
Richard M. Stallman <rms@gnu.org>
parents:
3354
diff
changeset
|
6190 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
|
6191 /* 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
|
6192 { |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6193 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
|
6194 /* 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
|
6195 range. */ |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6196 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
|
6197 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
|
6198 w->start_at_line_beg = Qt; |
265 | 6199 } |
6200 else | |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6201 /* 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
|
6202 are real. */ |
265 | 6203 { |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6204 /* 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
|
6205 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
|
6206 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
|
6207 w->buffer); |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6208 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
|
6209 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
|
6210 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
|
6211 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
|
6212 w->start_at_line_beg = Qt; |
265 | 6213 } |
6214 } | |
6215 } | |
1237
3929b2135e58
* window.c (delete_all_subwindows): Save the window's buffer in
Jim Blandy <jimb@redhat.com>
parents:
1123
diff
changeset
|
6216 |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6217 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
|
6218 /* 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
|
6219 using the buffer that has been restored into it. |
61444 | 6220 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
|
6221 selected_window = Qnil; |
61444 | 6222 |
6223 /* Arrange *not* to restore point in the buffer that was | |
6224 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
|
6225 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
|
6226 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
|
6227 make_number (old_point), |
45584
5fd12f9027a3
(Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents:
45562
diff
changeset
|
6228 XWINDOW (data->current_window)->buffer); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6229 |
51049
12bbef36ecf1
(Fselect_window): Add optional `norecord' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50367
diff
changeset
|
6230 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
|
6231 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
|
6232 = selected_window; |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6233 |
1716
95db936d47c0
* keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents:
1685
diff
changeset
|
6234 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
|
6235 || (FRAMEP (data->focus_frame) |
1716
95db936d47c0
* keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents:
1685
diff
changeset
|
6236 && FRAME_LIVE_P (XFRAME (data->focus_frame)))) |
95db936d47c0
* keyboard.c (Qscrollbar_movement, Qvertical_scrollbar,
Jim Blandy <jimb@redhat.com>
parents:
1685
diff
changeset
|
6237 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
|
6238 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6239 #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
|
6240 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
|
6241 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
|
6242 do_switch_frame (WINDOW_FRAME (XWINDOW (data->root_window)), |
99322
e03a3537f4a2
(select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
99277
diff
changeset
|
6243 0, 0, Qnil); |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6244 #endif |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6245 |
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6246 /* 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
|
6247 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
|
6248 || previous_frame_cols != FRAME_COLS (f)) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6249 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
|
6250 0, 0, 0); |
16051
ccf489f8596e
Removed support for !MULTI_FRAME.
Karl Heuer <kwzh@gnu.org>
parents:
16039
diff
changeset
|
6251 #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
|
6252 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
|
6253 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
|
6254 make_number (0)); |
25115
2105537c5916
(Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25044
diff
changeset
|
6255 #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
|
6256 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
|
6257 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
|
6258 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
|
6259 #endif |
25115
2105537c5916
(Fset_window_configuration) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25044
diff
changeset
|
6260 #endif |
18657 | 6261 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6262 /* 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
|
6263 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
|
6264 { |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
6265 if (NILP (leaf_windows[i]->buffer)) |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
6266 { |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
6267 /* Assert it's not reused as a combination. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6268 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
|
6269 && NILP (leaf_windows[i]->vchild)); |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
6270 free_window_matrices (leaf_windows[i]); |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
6271 } |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
6272 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
|
6273 ++n; |
8239087d52c5
(Fset_window_configuration): Don't try to preserve
Gerd Moellmann <gerd@gnu.org>
parents:
33255
diff
changeset
|
6274 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6275 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6276 adjust_glyphs (f); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6277 |
18657 | 6278 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
|
6279 |
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
6280 /* 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
|
6281 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
|
6282 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
|
6283 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
|
6284 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
|
6285 if (FRAME_LIVE_P (XFRAME (data->selected_frame))) |
99322
e03a3537f4a2
(select_frame_norecord): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
99277
diff
changeset
|
6286 do_switch_frame (data->selected_frame, 0, 0, Qnil); |
21198
10518dc95b25
(Frecenter): Operate on window's buffer even if some other was current.
Richard M. Stallman <rms@gnu.org>
parents:
21022
diff
changeset
|
6287 |
92192
30086ed69e69
(Fdelete_window, Fadjust_window_trailing_edge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
6288 run_window_configuration_change_hook (f); |
265 | 6289 } |
6290 | |
1325
f03e559aac3e
* window.c (struct save_window_data): Save the currently selected
Jim Blandy <jimb@redhat.com>
parents:
1280
diff
changeset
|
6291 if (!NILP (new_current_buffer)) |
45584
5fd12f9027a3
(Fset_window_configuration): Correct the handling
Richard M. Stallman <rms@gnu.org>
parents:
45562
diff
changeset
|
6292 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
|
6293 |
265 | 6294 Vminibuf_scroll_window = data->minibuf_scroll_window; |
43594
23cddac4d0b7
(minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents:
43571
diff
changeset
|
6295 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
|
6296 |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
6297 return (FRAME_LIVE_P (f) ? Qt : Qnil); |
265 | 6298 } |
6299 | |
769 | 6300 /* Mark all windows now on frame as deleted |
265 | 6301 by setting their buffers to nil. */ |
6302 | |
1685
8d7fc70d3103
* window.c (Fset_window_configuration): If we're restoring the
Jim Blandy <jimb@redhat.com>
parents:
1572
diff
changeset
|
6303 void |
265 | 6304 delete_all_subwindows (w) |
6305 register struct window *w; | |
6306 { | |
485 | 6307 if (!NILP (w->next)) |
265 | 6308 delete_all_subwindows (XWINDOW (w->next)); |
485 | 6309 if (!NILP (w->vchild)) |
265 | 6310 delete_all_subwindows (XWINDOW (w->vchild)); |
485 | 6311 if (!NILP (w->hchild)) |
265 | 6312 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
|
6313 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6314 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
|
6315 |
16068
b19129a8c644
(unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
6316 if (!NILP (w->buffer)) |
b19129a8c644
(unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
6317 unshow_buffer (w); |
b19129a8c644
(unshow_buffer): Clear last_selected_window slot, maybe.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
6318 |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
6319 /* 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
|
6320 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
|
6321 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
|
6322 vchild or hchild set. */ |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
6323 w->buffer = Qnil; |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
6324 w->vchild = Qnil; |
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
6325 w->hchild = Qnil; |
30045
ff2db81c11c1
(delete_all_subwindows): Reset Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents:
30039
diff
changeset
|
6326 |
ff2db81c11c1
(delete_all_subwindows): Reset Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents:
30039
diff
changeset
|
6327 Vwindow_list = Qnil; |
265 | 6328 } |
6329 | |
6330 static int | |
6331 count_windows (window) | |
6332 register struct window *window; | |
6333 { | |
6334 register int count = 1; | |
485 | 6335 if (!NILP (window->next)) |
265 | 6336 count += count_windows (XWINDOW (window->next)); |
485 | 6337 if (!NILP (window->vchild)) |
265 | 6338 count += count_windows (XWINDOW (window->vchild)); |
485 | 6339 if (!NILP (window->hchild)) |
265 | 6340 count += count_windows (XWINDOW (window->hchild)); |
6341 return count; | |
6342 } | |
6343 | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6344 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6345 /* 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
|
6346 Value is last index + 1. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6347 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6348 static int |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6349 get_leaf_windows (w, flat, i) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6350 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6351 struct window **flat; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6352 int i; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6353 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6354 while (w) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6355 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6356 if (!NILP (w->hchild)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6357 i = get_leaf_windows (XWINDOW (w->hchild), flat, i); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6358 else if (!NILP (w->vchild)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6359 i = get_leaf_windows (XWINDOW (w->vchild), flat, i); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6360 else |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6361 flat[i++] = w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6362 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6363 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6364 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6365 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6366 return i; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6367 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6368 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6369 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6370 /* 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
|
6371 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
|
6372 can be returned. */ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6373 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6374 struct glyph * |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6375 get_phys_cursor_glyph (w) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6376 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6377 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6378 struct glyph_row *row; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6379 struct glyph *glyph; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6380 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6381 if (w->phys_cursor.vpos >= 0 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6382 && w->phys_cursor.vpos < w->current_matrix->nrows |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6383 && (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
|
6384 row->enabled_p) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6385 && row->used[TEXT_AREA] > w->phys_cursor.hpos) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6386 glyph = row->glyphs[TEXT_AREA] + w->phys_cursor.hpos; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6387 else |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6388 glyph = NULL; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6389 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6390 return glyph; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6391 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6392 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6393 |
265 | 6394 static int |
6395 save_window_save (window, vector, i) | |
6396 Lisp_Object window; | |
6397 struct Lisp_Vector *vector; | |
6398 int i; | |
6399 { | |
6400 register struct saved_window *p; | |
6401 register struct window *w; | |
6402 register Lisp_Object tem; | |
6403 | |
485 | 6404 for (;!NILP (window); window = w->next) |
265 | 6405 { |
6406 p = SAVED_WINDOW_N (vector, i); | |
6407 w = XWINDOW (window); | |
6408 | |
58265
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58217
diff
changeset
|
6409 XSETFASTINT (w->temslot, i); i++; |
265 | 6410 p->window = window; |
6411 p->buffer = w->buffer; | |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6412 p->left_col = w->left_col; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6413 p->top_line = w->top_line; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6414 p->total_cols = w->total_cols; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6415 p->total_lines = w->total_lines; |
265 | 6416 p->hscroll = w->hscroll; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
6417 p->min_hscroll = w->min_hscroll; |
265 | 6418 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
|
6419 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
|
6420 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
|
6421 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
|
6422 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
|
6423 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
|
6424 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
|
6425 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
|
6426 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
|
6427 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
|
6428 p->dedicated = w->dedicated; |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
6429 p->resize_proportionally = w->resize_proportionally; |
485 | 6430 if (!NILP (w->buffer)) |
265 | 6431 { |
6432 /* Save w's value of point in the window configuration. | |
6433 If w is the selected window, then get the value of point | |
6434 from the buffer; pointm is garbage in the selected window. */ | |
6435 if (EQ (window, selected_window)) | |
6436 { | |
6437 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
|
6438 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
|
6439 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
|
6440 BUF_PT_BYTE (XBUFFER (w->buffer))); |
265 | 6441 } |
6442 else | |
12981
7a540e9cb21a
(save_window_save): Pass the new arg to Fcopy_marker.
Richard M. Stallman <rms@gnu.org>
parents:
12643
diff
changeset
|
6443 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
|
6444 |
7a540e9cb21a
(save_window_save): Pass the new arg to Fcopy_marker.
Richard M. Stallman <rms@gnu.org>
parents:
12643
diff
changeset
|
6445 p->start = Fcopy_marker (w->start, Qnil); |
265 | 6446 p->start_at_line_beg = w->start_at_line_beg; |
6447 | |
6448 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
|
6449 p->mark = Fcopy_marker (tem, Qnil); |
265 | 6450 } |
6451 else | |
6452 { | |
6453 p->pointm = Qnil; | |
6454 p->start = Qnil; | |
6455 p->mark = Qnil; | |
6456 p->start_at_line_beg = Qnil; | |
6457 } | |
6458 | |
485 | 6459 if (NILP (w->parent)) |
265 | 6460 p->parent = Qnil; |
6461 else | |
6462 p->parent = XWINDOW (w->parent)->temslot; | |
6463 | |
485 | 6464 if (NILP (w->prev)) |
265 | 6465 p->prev = Qnil; |
6466 else | |
6467 p->prev = XWINDOW (w->prev)->temslot; | |
6468 | |
485 | 6469 if (!NILP (w->vchild)) |
265 | 6470 i = save_window_save (w->vchild, vector, i); |
485 | 6471 if (!NILP (w->hchild)) |
265 | 6472 i = save_window_save (w->hchild, vector, i); |
6473 } | |
6474 | |
6475 return i; | |
6476 } | |
6477 | |
16485
9b919c5464a4
Reorganize function definitions so etags finds them.
Erik Naggum <erik@naggum.no>
parents:
16392
diff
changeset
|
6478 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
|
6479 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
|
6480 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
|
6481 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
|
6482 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
|
6483 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
|
6484 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
|
6485 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
|
6486 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
|
6487 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
|
6488 (frame) |
769 | 6489 Lisp_Object frame; |
265 | 6490 { |
6491 register Lisp_Object tem; | |
6492 register int n_windows; | |
6493 register struct save_window_data *data; | |
6494 register int i; | |
769 | 6495 FRAME_PTR f; |
265 | 6496 |
769 | 6497 if (NILP (frame)) |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6498 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
6499 CHECK_LIVE_FRAME (frame); |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
6500 f = XFRAME (frame); |
358 | 6501 |
769 | 6502 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
|
6503 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
|
6504 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
|
6505 |
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
6506 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
|
6507 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
|
6508 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
|
6509 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
|
6510 data->selected_frame = selected_frame; |
769 | 6511 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
|
6512 XSETBUFFER (data->current_buffer, current_buffer); |
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
6513 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
|
6514 data->minibuf_selected_window = minibuf_level > 0 ? minibuf_selected_window : Qnil; |
769 | 6515 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
|
6516 data->focus_frame = FRAME_FOCUS_FRAME (f); |
265 | 6517 tem = Fmake_vector (make_number (n_windows), Qnil); |
6518 data->saved_windows = tem; | |
6519 for (i = 0; i < n_windows; i++) | |
6520 XVECTOR (tem)->contents[i] | |
65004
bc5cf5fc0f9e
(SAVED_WINDOW_VECTOR_SIZE): Remove dangerous define.
Kim F. Storm <storm@cua.dk>
parents:
64770
diff
changeset
|
6521 = 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
|
6522 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
|
6523 XSETWINDOW_CONFIGURATION (tem, data); |
265 | 6524 return (tem); |
6525 } | |
6526 | |
6527 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
|
6528 0, UNEVALLED, 0, |
56487
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
6529 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
|
6530 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
|
6531 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
|
6532 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
|
6533 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
|
6534 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
|
6535 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
|
6536 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
|
6537 (args) |
265 | 6538 Lisp_Object args; |
6539 { | |
6540 register Lisp_Object val; | |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
6541 register int count = SPECPDL_INDEX (); |
265 | 6542 |
6543 record_unwind_protect (Fset_window_configuration, | |
358 | 6544 Fcurrent_window_configuration (Qnil)); |
265 | 6545 val = Fprogn (args); |
6546 return unbind_to (count, val); | |
6547 } | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6548 |
65826
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6549 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6550 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6551 /*********************************************************************** |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6552 Window Split Tree |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6553 ***********************************************************************/ |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6554 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6555 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
|
6556 window_tree (w) |
65826
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6557 struct window *w; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6558 { |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6559 Lisp_Object tail = Qnil; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6560 Lisp_Object result = Qnil; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6561 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6562 while (w) |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6563 { |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6564 Lisp_Object wn; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6565 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6566 XSETWINDOW (wn, w); |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6567 if (!NILP (w->hchild)) |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6568 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
|
6569 window_tree (XWINDOW (w->hchild)))); |
65826
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6570 else if (!NILP (w->vchild)) |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6571 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
|
6572 window_tree (XWINDOW (w->vchild)))); |
65826
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6573 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6574 if (NILP (result)) |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6575 { |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6576 result = tail = Fcons (wn, Qnil); |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6577 } |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6578 else |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6579 { |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6580 XSETCDR (tail, Fcons (wn, Qnil)); |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6581 tail = XCDR (tail); |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6582 } |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6583 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6584 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6585 } |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6586 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6587 return result; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6588 } |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6589 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6590 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6591 |
65908
454a4a463081
(window_tree, Fwindow_tree): Rename fns added 2005-10-04.
Kim F. Storm <storm@cua.dk>
parents:
65826
diff
changeset
|
6592 DEFUN ("window-tree", Fwindow_tree, Swindow_tree, |
65826
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6593 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
|
6594 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
|
6595 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6596 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
|
6597 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
|
6598 is the frame's minibuffer window. |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6599 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6600 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
|
6601 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
|
6602 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
|
6603 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
|
6604 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
|
6605 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
|
6606 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
|
6607 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6608 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
|
6609 selected frame. */) |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6610 (frame) |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6611 Lisp_Object frame; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6612 { |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6613 FRAME_PTR f; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6614 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6615 if (NILP (frame)) |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6616 frame = selected_frame; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6617 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6618 CHECK_FRAME (frame); |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6619 f = XFRAME (frame); |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6620 |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6621 if (!FRAME_LIVE_P (f)) |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6622 return Qnil; |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6623 |
65908
454a4a463081
(window_tree, Fwindow_tree): Rename fns added 2005-10-04.
Kim F. Storm <storm@cua.dk>
parents:
65826
diff
changeset
|
6624 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
|
6625 } |
d16139114c9c
(window_split_tree): New function.
Kim F. Storm <storm@cua.dk>
parents:
65602
diff
changeset
|
6626 |
265 | 6627 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6628 /*********************************************************************** |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6629 Marginal Areas |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6630 ***********************************************************************/ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6631 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6632 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
|
6633 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
|
6634 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
|
6635 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
|
6636 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
|
6637 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
|
6638 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
|
6639 means no margin. */) |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6640 (window, left_width, right_width) |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6641 Lisp_Object window, left_width, right_width; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6642 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6643 struct window *w = decode_window (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6644 |
52852
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6645 /* Translate negative or zero widths to nil. |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6646 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
|
6647 |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6648 if (!NILP (left_width)) |
52852
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6649 { |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6650 CHECK_NUMBER (left_width); |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6651 if (XINT (left_width) <= 0) |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6652 left_width = Qnil; |
52852
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6653 } |
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6654 |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6655 if (!NILP (right_width)) |
52852
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6656 { |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6657 CHECK_NUMBER (right_width); |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6658 if (XINT (right_width) <= 0) |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6659 right_width = Qnil; |
52852
ac400ff02a1c
(Fset_window_margins): Simplify arg checking.
Kim F. Storm <storm@cua.dk>
parents:
52836
diff
changeset
|
6660 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6661 |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6662 if (!EQ (w->left_margin_cols, left_width) |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6663 || !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
|
6664 { |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6665 w->left_margin_cols = left_width; |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6666 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
|
6667 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6668 adjust_window_margins (w); |
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 ++windows_or_buffers_changed; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6671 adjust_glyphs (XFRAME (WINDOW_FRAME (w))); |
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 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6674 return Qnil; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6675 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6676 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6677 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6678 DEFUN ("window-margins", Fwindow_margins, Swindow_margins, |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6679 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
|
6680 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
|
6681 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
|
6682 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
|
6683 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
|
6684 as nil. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
6685 (window) |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6686 Lisp_Object window; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6687 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6688 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
|
6689 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
|
6690 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6691 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6692 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6693 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6694 /*********************************************************************** |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6695 Fringes |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6696 ***********************************************************************/ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6697 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6698 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
|
6699 2, 4, 0, |
52853
91a9da753e30
(Fset_window_fringes): Clarify docstring.
Lute Kamstra <lute@gnu.org>
parents:
52852
diff
changeset
|
6700 doc: /* Set the fringe widths of window WINDOW. |
91a9da753e30
(Fset_window_fringes): Clarify docstring.
Lute Kamstra <lute@gnu.org>
parents:
52852
diff
changeset
|
6701 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
|
6702 window. |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
6703 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
|
6704 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
|
6705 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
|
6706 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
|
6707 the command `set-fringe-style'. |
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
6708 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
|
6709 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
|
6710 display marginal areas and the text area. */) |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6711 (window, left_width, right_width, outside_margins) |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6712 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
|
6713 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6714 struct window *w = decode_window (window); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6715 |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6716 if (!NILP (left_width)) |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6717 CHECK_NATNUM (left_width); |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6718 if (!NILP (right_width)) |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6719 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
|
6720 |
72438 | 6721 /* 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
|
6722 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
|
6723 && (!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
|
6724 || !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
|
6725 || !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
|
6726 { |
64577
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6727 w->left_fringe_width = left_width; |
cc42e18c8870
(Fset_window_margins, Fset_window_fringes):
Juanma Barranquero <lekktu@gmail.com>
parents:
64236
diff
changeset
|
6728 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
|
6729 w->fringes_outside_margins = outside_margins; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6730 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6731 adjust_window_margins (w); |
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 clear_glyph_matrix (w->current_matrix); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6734 w->window_end_valid = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6735 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6736 ++windows_or_buffers_changed; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6737 adjust_glyphs (XFRAME (WINDOW_FRAME (w))); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6738 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6739 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6740 return Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6741 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6742 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6743 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6744 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
|
6745 0, 1, 0, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6746 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
|
6747 If WINDOW is omitted or nil, use the currently selected window. |
53927 | 6748 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
|
6749 (window) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6750 Lisp_Object window; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6751 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6752 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
|
6753 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6754 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
|
6755 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
|
6756 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
|
6757 ? Qt : Qnil), Qnil))); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6758 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6759 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6760 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6761 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6762 /*********************************************************************** |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6763 Scroll bars |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6764 ***********************************************************************/ |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6765 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6766 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
|
6767 2, 4, 0, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6768 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
|
6769 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
|
6770 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
|
6771 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
|
6772 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
|
6773 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
|
6774 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
|
6775 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
|
6776 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
|
6777 (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
|
6778 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
|
6779 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6780 struct window *w = decode_window (window); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6781 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6782 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
|
6783 { |
f3a76c43ac80
(Fset_window_scroll_bars): Don't use XINT if it isn't int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58441
diff
changeset
|
6784 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
|
6785 |
f3a76c43ac80
(Fset_window_scroll_bars): Don't use XINT if it isn't int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58441
diff
changeset
|
6786 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
|
6787 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
|
6788 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6789 |
78415
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
6790 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
|
6791 || 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
|
6792 || EQ (vertical_type, Qright) |
26d1a4665f6c
(Fset_window_scroll_bars): Validate the value of `vertical_type'.
Masatake YAMATO <jet@gyve.org>
parents:
52560
diff
changeset
|
6793 || EQ (vertical_type, Qt))) |
26d1a4665f6c
(Fset_window_scroll_bars): Validate the value of `vertical_type'.
Masatake YAMATO <jet@gyve.org>
parents:
52560
diff
changeset
|
6794 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
|
6795 |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6796 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
|
6797 || !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
|
6798 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6799 w->scroll_bar_width = width; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6800 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
|
6801 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6802 adjust_window_margins (w); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6803 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6804 clear_glyph_matrix (w->current_matrix); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6805 w->window_end_valid = Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6806 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6807 ++windows_or_buffers_changed; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6808 adjust_glyphs (XFRAME (WINDOW_FRAME (w))); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6809 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6810 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6811 return Qnil; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6812 } |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6813 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6814 |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6815 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
|
6816 0, 1, 0, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6817 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
|
6818 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
|
6819 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
|
6820 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
|
6821 value. */) |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6822 (window) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6823 Lisp_Object window; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6824 { |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6825 struct window *w = decode_window (window); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6826 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
|
6827 ? WINDOW_CONFIG_SCROLL_BAR_WIDTH (w) |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6828 : WINDOW_SCROLL_BAR_AREA_WIDTH (w))), |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6829 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
|
6830 Fcons (w->vertical_scroll_bar_type, |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
6831 Fcons (Qnil, Qnil)))); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6832 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6833 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6834 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6835 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6836 /*********************************************************************** |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6837 Smooth scrolling |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6838 ***********************************************************************/ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6839 |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6840 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
|
6841 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
|
6842 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
|
6843 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
|
6844 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
|
6845 (window, pixels_p) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6846 Lisp_Object window, pixels_p; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6847 { |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6848 Lisp_Object result; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6849 struct frame *f; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6850 struct window *w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6851 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6852 if (NILP (window)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6853 window = selected_window; |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6854 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
6855 CHECK_WINDOW (window); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6856 w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6857 f = XFRAME (w->frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6858 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6859 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
|
6860 result = (NILP (pixels_p) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6861 ? 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
|
6862 : make_number (-w->vscroll)); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6863 else |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6864 result = make_number (0); |
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6865 return result; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6866 } |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6867 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6868 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6869 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
|
6870 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
|
6871 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
|
6872 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
|
6873 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
|
6874 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
|
6875 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
|
6876 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
|
6877 result of this rounding. |
338a1d04223d
(Fpos_visible_in_window_p, Fset_window_hscroll)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56456
diff
changeset
|
6878 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
|
6879 (window, vscroll, pixels_p) |
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6880 Lisp_Object window, vscroll, pixels_p; |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6881 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6882 struct window *w; |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6883 struct frame *f; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6884 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6885 if (NILP (window)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6886 window = selected_window; |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6887 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
6888 CHECK_WINDOW (window); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40619
diff
changeset
|
6889 CHECK_NUMBER_OR_FLOAT (vscroll); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6890 |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6891 w = XWINDOW (window); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6892 f = XFRAME (w->frame); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6893 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6894 if (FRAME_WINDOW_P (f)) |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6895 { |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6896 int old_dy = w->vscroll; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6897 |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6898 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
|
6899 ? 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
|
6900 : XFLOATINT (vscroll)); |
25549
63deb587dce1
(Fset_window_vscroll): Make window the first argument,
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6901 w->vscroll = min (w->vscroll, 0); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6902 |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6903 if (w->vscroll != old_dy) |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6904 { |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6905 /* 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
|
6906 area becomes larger than before. */ |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6907 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
|
6908 adjust_glyphs (f); |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6909 |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6910 /* Prevent redisplay shortcuts. */ |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
6911 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
|
6912 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6913 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6914 |
55027
91ab946dfd86
(Fpos_visible_in_window_p): Return pixel position if
Kim F. Storm <storm@cua.dk>
parents:
54883
diff
changeset
|
6915 return Fwindow_vscroll (window, pixels_p); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6916 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6917 |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6918 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6919 /* 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
|
6920 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
|
6921 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
|
6922 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6923 void |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6924 foreach_window (f, fn, user_data) |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6925 struct frame *f; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6926 int (* fn) P_ ((struct window *, void *)); |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6927 void *user_data; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6928 { |
100632
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
99745
diff
changeset
|
6929 /* delete_frame may set FRAME_ROOT_WINDOW (f) to Qnil. */ |
70736
6e5b403b5586
(foreach_window): Check WINDOWP (FRAME_ROOT_WINDOW (f)).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70155
diff
changeset
|
6930 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
|
6931 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
|
6932 } |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6933 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6934 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6935 /* 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
|
6936 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
|
6937 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
|
6938 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
|
6939 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6940 static int |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6941 foreach_window_1 (w, fn, user_data) |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6942 struct window *w; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6943 int (* fn) P_ ((struct window *, void *)); |
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6944 void *user_data; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6945 { |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6946 int cont; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6947 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6948 for (cont = 1; w && cont;) |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6949 { |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6950 if (!NILP (w->hchild)) |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6951 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
|
6952 else if (!NILP (w->vchild)) |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6953 cont = foreach_window_1 (XWINDOW (w->vchild), fn, user_data); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6954 else |
30366
8dd313fc287d
(foreach_window_1): Fix typo reversing an if-condition.
Gerd Moellmann <gerd@gnu.org>
parents:
30362
diff
changeset
|
6955 cont = fn (w, user_data); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6956 |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6957 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6958 } |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6959 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6960 return cont; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6961 } |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6962 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6963 |
39952 | 6964 /* 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
|
6965 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
|
6966 the window start. */ |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6967 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6968 static int |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6969 freeze_window_start (w, freeze_p) |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6970 struct window *w; |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6971 void *freeze_p; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6972 { |
84376
584ae8393da8
(freeze_window_start): Don't presume selected_window holds a window object.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84357
diff
changeset
|
6973 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
|
6974 || (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
|
6975 && (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
|
6976 || (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
|
6977 && ! 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
|
6978 && w == XWINDOW (Vminibuf_scroll_window))))) |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6979 freeze_p = NULL; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
6980 |
30362
fc017b1b2a7d
(foreach_window): Instead of a fake variable argument
Gerd Moellmann <gerd@gnu.org>
parents:
30265
diff
changeset
|
6981 w->frozen_window_start_p = freeze_p != NULL; |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
6982 return 1; |
25517
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6983 } |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6984 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6985 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6986 /* 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
|
6987 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
|
6988 means freeze the window start. */ |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6989 |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6990 void |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6991 freeze_window_starts (f, freeze_p) |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6992 struct frame *f; |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6993 int freeze_p; |
619897099dc4
(foreach_window, foreach_window_1): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25462
diff
changeset
|
6994 { |
31903
3e0a1f91c149
(freeze_window_starts): Construct last argument for
Gerd Moellmann <gerd@gnu.org>
parents:
31829
diff
changeset
|
6995 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
|
6996 } |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6997 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6998 |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
6999 /*********************************************************************** |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
7000 Initialization |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
7001 ***********************************************************************/ |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
7002 |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7003 /* Return 1 if window configurations C1 and C2 |
95550
e057f981a6b5
(Fset_window_parameter): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
95547
diff
changeset
|
7004 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
|
7005 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7006 int |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7007 compare_window_configurations (c1, c2, ignore_positions) |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7008 Lisp_Object c1, c2; |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7009 int ignore_positions; |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7010 { |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7011 register struct save_window_data *d1, *d2; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7012 struct Lisp_Vector *sw1, *sw2; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7013 int i; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7014 |
71844
632e73258d36
(Fwindow_configuration_frame, Fset_window_configuration):
Kim F. Storm <storm@cua.dk>
parents:
71717
diff
changeset
|
7015 CHECK_WINDOW_CONFIGURATION (c1); |
632e73258d36
(Fwindow_configuration_frame, Fset_window_configuration):
Kim F. Storm <storm@cua.dk>
parents:
71717
diff
changeset
|
7016 CHECK_WINDOW_CONFIGURATION (c2); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
7017 |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7018 d1 = (struct save_window_data *) XVECTOR (c1); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7019 d2 = (struct save_window_data *) XVECTOR (c2); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7020 sw1 = XVECTOR (d1->saved_windows); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7021 sw2 = XVECTOR (d2->saved_windows); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7022 |
86162
e7cf3055e000
(struct save_window_data): Move non-lisp data to the end
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85684
diff
changeset
|
7023 if (d1->frame_cols != d2->frame_cols) |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7024 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
|
7025 if (d1->frame_lines != d2->frame_lines) |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7026 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
|
7027 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
|
7028 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7029 if (! EQ (d1->selected_frame, d2->selected_frame)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7030 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7031 /* Don't compare the current_window field directly. |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7032 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
|
7033 if (! EQ (d1->current_buffer, d2->current_buffer)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7034 return 0; |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7035 if (! ignore_positions) |
43571
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
7036 { |
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
7037 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
|
7038 return 0; |
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
7039 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
|
7040 return 0; |
d3b03dea29d4
(Vminibuf_selected_window): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43281
diff
changeset
|
7041 } |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7042 /* Don't compare the root_window field. |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7043 We don't require the two configurations |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7044 to use the same window object, |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7045 and the two root windows must be equivalent |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7046 if everything else compares equal. */ |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7047 if (! EQ (d1->focus_frame, d2->focus_frame)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7048 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7049 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7050 /* 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
|
7051 if (sw1->size != sw2->size) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7052 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7053 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7054 for (i = 0; i < sw1->size; i++) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7055 { |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7056 struct saved_window *p1, *p2; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7057 int w1_is_current, w2_is_current; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7058 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7059 p1 = SAVED_WINDOW_N (sw1, i); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7060 p2 = SAVED_WINDOW_N (sw2, i); |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7061 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7062 /* Verify that the current windows in the two |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7063 configurations correspond to each other. */ |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7064 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
|
7065 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
|
7066 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7067 if (w1_is_current != w2_is_current) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7068 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7069 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7070 /* Verify that the corresponding windows do match. */ |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7071 if (! EQ (p1->buffer, p2->buffer)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7072 return 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7073 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
|
7074 return 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7075 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
|
7076 return 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7077 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
|
7078 return 0; |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7079 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
|
7080 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7081 if (! EQ (p1->display_table, p2->display_table)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7082 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7083 if (! EQ (p1->parent, p2->parent)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7084 return 0; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7085 if (! EQ (p1->prev, p2->prev)) |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7086 return 0; |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7087 if (! ignore_positions) |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7088 { |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7089 if (! EQ (p1->hscroll, p2->hscroll)) |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7090 return 0; |
34747
b17790c2efbf
(make_window): Initialize window's min_hscroll.
Gerd Moellmann <gerd@gnu.org>
parents:
34735
diff
changeset
|
7091 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
|
7092 return 0; |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7093 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
|
7094 return 0; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7095 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
|
7096 return 0; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7097 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
|
7098 return 0; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7099 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
|
7100 return 0; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7101 } |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7102 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
|
7103 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7104 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
|
7105 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7106 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
|
7107 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7108 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
|
7109 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7110 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
|
7111 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7112 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
|
7113 return 0; |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7114 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
|
7115 return 0; |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7116 } |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7117 |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7118 return 1; |
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7119 } |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7120 |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7121 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
|
7122 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
|
7123 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
|
7124 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
|
7125 and scrolling positions. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39958
diff
changeset
|
7126 (x, y) |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7127 Lisp_Object x, y; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7128 { |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7129 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
|
7130 return Qt; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7131 return Qnil; |
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7132 } |
20777
a9e1b9bf06e3
(compare_window_configurations): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
7133 |
21514 | 7134 void |
265 | 7135 init_window_once () |
7136 { | |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83005
diff
changeset
|
7137 struct frame *f = make_initial_frame (); |
25676
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
7138 XSETFRAME (selected_frame, f); |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
7139 Vterminal_frame = selected_frame; |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
7140 minibuf_window = f->minibuffer_window; |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
7141 selected_window = f->selected_window; |
70c6d3f2f3b9
(Fminibuffer_window): Change for Lisp_Object
Gerd Moellmann <gerd@gnu.org>
parents:
25591
diff
changeset
|
7142 last_nonminibuf_frame = f; |
14445
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
7143 |
e73b37519cdc
(Fset_window_buffer): Set buffer temporarily around running
Richard M. Stallman <rms@gnu.org>
parents:
14204
diff
changeset
|
7144 window_initialized = 1; |
265 | 7145 } |
7146 | |
21514 | 7147 void |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
7148 init_window () |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
7149 { |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
7150 Vwindow_list = Qnil; |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
7151 } |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
7152 |
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
7153 void |
265 | 7154 syms_of_window () |
7155 { | |
69209
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
7156 Qscroll_up = intern ("scroll-up"); |
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
7157 staticpro (&Qscroll_up); |
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
7158 |
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
7159 Qscroll_down = intern ("scroll-down"); |
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
7160 staticpro (&Qscroll_down); |
b9ad41f39bf6
* xselect.c (x_catch_errors_unwind): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
69104
diff
changeset
|
7161 |
25540
2b4bdd114899
(Qwindow_size_fixed): Replaces Qfixed_window_size.
Gerd Moellmann <gerd@gnu.org>
parents:
25517
diff
changeset
|
7162 Qwindow_size_fixed = intern ("window-size-fixed"); |
2b4bdd114899
(Qwindow_size_fixed): Replaces Qfixed_window_size.
Gerd Moellmann <gerd@gnu.org>
parents:
25517
diff
changeset
|
7163 staticpro (&Qwindow_size_fixed); |
61755
71259596d397
(window_size_fixed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
61635
diff
changeset
|
7164 Fset (Qwindow_size_fixed, Qnil); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49011
diff
changeset
|
7165 |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
7166 staticpro (&Qwindow_configuration_change_hook); |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
7167 Qwindow_configuration_change_hook |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
7168 = intern ("window-configuration-change-hook"); |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
7169 |
265 | 7170 Qwindowp = intern ("windowp"); |
7171 staticpro (&Qwindowp); | |
7172 | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
7173 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
|
7174 staticpro (&Qwindow_configuration_p); |
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
7175 |
2210
22d78dbb3cc7
Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents:
2190
diff
changeset
|
7176 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
|
7177 staticpro (&Qwindow_live_p); |
1444
559d2f2119aa
* window.c: Try to deal coherently with deleted windows:
Jim Blandy <jimb@redhat.com>
parents:
1345
diff
changeset
|
7178 |
95590
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95566
diff
changeset
|
7179 Qdisplay_buffer = intern ("display-buffer"); |
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95566
diff
changeset
|
7180 staticpro (&Qdisplay_buffer); |
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95566
diff
changeset
|
7181 |
11405
645e3883da72
(temp_output_buffer_show): Select the chosen window
Richard M. Stallman <rms@gnu.org>
parents:
11307
diff
changeset
|
7182 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
|
7183 staticpro (&Qtemp_buffer_show_hook); |
d3dee0c530d6
(Qtemp_buffer_show_hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
10373
diff
changeset
|
7184 |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
7185 staticpro (&Vwindow_list); |
43597
8097923cfe85
(syms_of_window): Initialize minibuf_selected_window.
Kim F. Storm <storm@cua.dk>
parents:
43594
diff
changeset
|
7186 |
8097923cfe85
(syms_of_window): Initialize minibuf_selected_window.
Kim F. Storm <storm@cua.dk>
parents:
43594
diff
changeset
|
7187 minibuf_selected_window = Qnil; |
43594
23cddac4d0b7
(minibuf_selected_window): Renamed from
Kim F. Storm <storm@cua.dk>
parents:
43571
diff
changeset
|
7188 staticpro (&minibuf_selected_window); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
7189 |
95566
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
7190 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
|
7191 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
|
7192 window_scroll_preserve_hpos = -1; |
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
7193 window_scroll_preserve_vpos = -1; |
69342
12e65aa88734
Declare preserve_y as a static global variable.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69209
diff
changeset
|
7194 |
265 | 7195 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
|
7196 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
|
7197 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
|
7198 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
|
7199 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
|
7200 the buffer; `temp-buffer-show-hook' is not run unless this function runs it. */); |
265 | 7201 Vtemp_buffer_show_function = Qnil; |
7202 | |
7203 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
|
7204 doc: /* Non-nil means it is the window that C-M-v in minibuffer should scroll. */); |
265 | 7205 Vminibuf_scroll_window = Qnil; |
7206 | |
43281
a4ea76de57c9
(Vmode_line_in_non_selected_windows): Removed.
Kim F. Storm <storm@cua.dk>
parents:
43241
diff
changeset
|
7207 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
|
7208 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
|
7209 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
|
7210 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
|
7211 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
|
7212 |
265 | 7213 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
|
7214 doc: /* If non-nil, this is a buffer and \\[scroll-other-window] should scroll its window. */); |
265 | 7215 Vother_window_scroll_buffer = Qnil; |
7216 | |
59677
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
7217 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
|
7218 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
|
7219 auto_window_vscroll_p = 1; |
d762442d2c8f
(auto_window_vscroll_p): New boolean.
Kim F. Storm <storm@cua.dk>
parents:
59342
diff
changeset
|
7220 |
265 | 7221 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
|
7222 doc: /* *Number of lines of continuity when scrolling by screenfuls. */); |
265 | 7223 next_screen_context_lines = 2; |
7224 | |
7225 DEFVAR_INT ("window-min-height", &window_min_height, | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
7226 doc: /* Allow deleting windows less than this tall. |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
7227 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
|
7228 is counted as one line. |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
7229 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
7230 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
|
7231 windows vertically. A value less than 1 is invalid. */); |
265 | 7232 window_min_height = 4; |
7233 | |
7234 DEFVAR_INT ("window-min-width", &window_min_width, | |
94515
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
7235 doc: /* Allow deleting windows less than this wide. |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
7236 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
|
7237 the scrollbar. |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
7238 |
b64e3d5c5852
(make_window): Initialize resize_proportionally.
Martin Rudalics <rudalics@gmx.at>
parents:
93547
diff
changeset
|
7239 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
|
7240 windows horizontally. A value less than 2 is invalid. */); |
265 | 7241 window_min_width = 10; |
7242 | |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
7243 DEFVAR_LISP ("scroll-preserve-screen-position", |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
7244 &Vscroll_preserve_screen_position, |
95566
b3c0438c570b
* window.c (window_scroll_pixel_based_preserve_x)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95564
diff
changeset
|
7245 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
|
7246 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
|
7247 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
|
7248 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
|
7249 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
|
7250 by full screens. |
a473419e315e
(window_scroll_pixel_based, window_scroll_line_based):
Richard M. Stallman <rms@gnu.org>
parents:
63611
diff
changeset
|
7251 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
|
7252 Vscroll_preserve_screen_position = Qnil; |
16980
3da3a2934be5
(scroll_preserve_screen_position): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16751
diff
changeset
|
7253 |
95777
edc51d72cb17
* window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
7254 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
|
7255 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
|
7256 Vwindow_point_insertion_type = Qnil; |
edc51d72cb17
* window.c (Vwindow_point_insertion_type): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
7257 |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
7258 DEFVAR_LISP ("window-configuration-change-hook", |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
7259 &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
|
7260 doc: /* Functions to call when window configuration changes. |
93068
3ca0c43ea37d
(run_funs): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92192
diff
changeset
|
7261 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
|
7262 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
|
7263 with the relevant frame selected. */); |
17281
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
7264 Vwindow_configuration_change_hook = Qnil; |
4f3c71b28278
(Qwindow_configuration_change_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17226
diff
changeset
|
7265 |
103557
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
7266 DEFVAR_LISP ("recenter-redisplay", &Vrecenter_redisplay, |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
7267 doc: /* If non-nil, then the `recenter' command with a nil argument |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
7268 the entire frame to be redrawn; the special value `tty' causes the |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
7269 frame to be redrawn only if it is a tty frame. */); |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
7270 Vrecenter_redisplay = Qtty; |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
7271 |
f52eb7cf1c20
Add the `recenter-redisplay' variable, and make `recenter' use it.
Miles Bader <miles@gnu.org>
parents:
100951
diff
changeset
|
7272 |
265 | 7273 defsubr (&Sselected_window); |
7274 defsubr (&Sminibuffer_window); | |
7275 defsubr (&Swindow_minibuffer_p); | |
7276 defsubr (&Swindowp); | |
2210
22d78dbb3cc7
Rename `live-window-p' to `window-live-p', for consistency with
Jim Blandy <jimb@redhat.com>
parents:
2190
diff
changeset
|
7277 defsubr (&Swindow_live_p); |
265 | 7278 defsubr (&Spos_visible_in_window_p); |
72955
e7401fd40071
(Fwindow_line_visibility): Remove.
Kim F. Storm <storm@cua.dk>
parents:
72907
diff
changeset
|
7279 defsubr (&Swindow_line_height); |
265 | 7280 defsubr (&Swindow_buffer); |
7281 defsubr (&Swindow_height); | |
7282 defsubr (&Swindow_width); | |
78415
73900ddc75ee
(window_min_size_2): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
7283 defsubr (&Swindow_full_width_p); |
265 | 7284 defsubr (&Swindow_hscroll); |
7285 defsubr (&Sset_window_hscroll); | |
13457
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
7286 defsubr (&Swindow_redisplay_end_trigger); |
8a1986b2cc76
(Fwindow_redisplay_end_trigger): New function.
Richard M. Stallman <rms@gnu.org>
parents:
13418
diff
changeset
|
7287 defsubr (&Sset_window_redisplay_end_trigger); |
265 | 7288 defsubr (&Swindow_edges); |
51427
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
7289 defsubr (&Swindow_pixel_edges); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
7290 defsubr (&Swindow_inside_edges); |
ac7f678c586d
(Fwindow_edges): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
51240
diff
changeset
|
7291 defsubr (&Swindow_inside_pixel_edges); |
432 | 7292 defsubr (&Scoordinates_in_window_p); |
7293 defsubr (&Swindow_at); | |
265 | 7294 defsubr (&Swindow_point); |
7295 defsubr (&Swindow_start); | |
7296 defsubr (&Swindow_end); | |
7297 defsubr (&Sset_window_point); | |
7298 defsubr (&Sset_window_start); | |
7299 defsubr (&Swindow_dedicated_p); | |
722
0a2391511b46
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
708
diff
changeset
|
7300 defsubr (&Sset_window_dedicated_p); |
265 | 7301 defsubr (&Swindow_display_table); |
7302 defsubr (&Sset_window_display_table); | |
7303 defsubr (&Snext_window); | |
7304 defsubr (&Sprevious_window); | |
7305 defsubr (&Sother_window); | |
7306 defsubr (&Sget_lru_window); | |
7307 defsubr (&Sget_largest_window); | |
7308 defsubr (&Sget_buffer_window); | |
7309 defsubr (&Sdelete_other_windows); | |
7310 defsubr (&Sdelete_windows_on); | |
7311 defsubr (&Sreplace_buffer_in_windows); | |
7312 defsubr (&Sdelete_window); | |
7313 defsubr (&Sset_window_buffer); | |
7314 defsubr (&Sselect_window); | |
53143
49489d2151bf
(enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
Kim F. Storm <storm@cua.dk>
parents:
53129
diff
changeset
|
7315 defsubr (&Sforce_window_update); |
265 | 7316 defsubr (&Ssplit_window); |
7317 defsubr (&Senlarge_window); | |
7318 defsubr (&Sshrink_window); | |
67156
33af3a25cca6
(adjust_window_trailing_edge): New function.
Richard M. Stallman <rms@gnu.org>
parents:
66711
diff
changeset
|
7319 defsubr (&Sadjust_window_trailing_edge); |
265 | 7320 defsubr (&Sscroll_up); |
7321 defsubr (&Sscroll_down); | |
7322 defsubr (&Sscroll_left); | |
7323 defsubr (&Sscroll_right); | |
8053
60792df5f81f
(Fother_window_for_scrolling): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7663
diff
changeset
|
7324 defsubr (&Sother_window_for_scrolling); |
265 | 7325 defsubr (&Sscroll_other_window); |
43624
a38ac87b3085
(Fminibuffer_selected_window): New function.
Kim F. Storm <storm@cua.dk>
parents:
43620
diff
changeset
|
7326 defsubr (&Sminibuffer_selected_window); |
265 | 7327 defsubr (&Srecenter); |
34416
0d16962724cb
(displayed_window_lines): Handle non-newline-terminated final lines properly.
Miles Bader <miles@gnu.org>
parents:
34409
diff
changeset
|
7328 defsubr (&Swindow_text_height); |
265 | 7329 defsubr (&Smove_to_window_line); |
7330 defsubr (&Swindow_configuration_p); | |
23410
02cc44ea2455
(window_loop): New alternative CHECK_ALL_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents:
22923
diff
changeset
|
7331 defsubr (&Swindow_configuration_frame); |
265 | 7332 defsubr (&Sset_window_configuration); |
7333 defsubr (&Scurrent_window_configuration); | |
7334 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
|
7335 defsubr (&Swindow_tree); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
7336 defsubr (&Sset_window_margins); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
7337 defsubr (&Swindow_margins); |
51207
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7338 defsubr (&Sset_window_fringes); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7339 defsubr (&Swindow_fringes); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7340 defsubr (&Sset_window_scroll_bars); |
7e176ef34c10
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51049
diff
changeset
|
7341 defsubr (&Swindow_scroll_bars); |
24997
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
7342 defsubr (&Swindow_vscroll); |
5e507b813c1d
(Fcoordinates_in_window_p): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24230
diff
changeset
|
7343 defsubr (&Sset_window_vscroll); |
21022
52bc6b672a50
(compare_window_configurations): New arg ignore_positions.
Richard M. Stallman <rms@gnu.org>
parents:
20867
diff
changeset
|
7344 defsubr (&Scompare_window_configurations); |
30037
79b4fa5288c3
(Vwindow_list): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29488
diff
changeset
|
7345 defsubr (&Swindow_list); |
95547
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
7346 defsubr (&Swindow_parameters); |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
7347 defsubr (&Swindow_parameter); |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
7348 defsubr (&Sset_window_parameter); |
f646247886e0
(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter): New defuns.
Juanma Barranquero <lekktu@gmail.com>
parents:
95481
diff
changeset
|
7349 |
265 | 7350 } |
7351 | |
21514 | 7352 void |
265 | 7353 keys_of_window () |
7354 { | |
7355 initial_define_key (control_x_map, '1', "delete-other-windows"); | |
7356 initial_define_key (control_x_map, '2', "split-window"); | |
7357 initial_define_key (control_x_map, '0', "delete-window"); | |
7358 initial_define_key (control_x_map, 'o', "other-window"); | |
7359 initial_define_key (control_x_map, '^', "enlarge-window"); | |
7360 initial_define_key (control_x_map, '<', "scroll-left"); | |
7361 initial_define_key (control_x_map, '>', "scroll-right"); | |
7362 | |
7363 initial_define_key (global_map, Ctl ('V'), "scroll-up"); | |
7364 initial_define_key (meta_map, Ctl ('V'), "scroll-other-window"); | |
7365 initial_define_key (meta_map, 'v', "scroll-down"); | |
7366 | |
7367 initial_define_key (global_map, Ctl('L'), "recenter"); | |
7368 initial_define_key (meta_map, 'r', "move-to-window-line"); | |
7369 } | |
52401 | 7370 |
7371 /* arch-tag: 90a9c576-0590-48f1-a5f1-6c96a0452d9f | |
7372 (do not change this comment) */ |